[geary/geary-0.10] Updated Norwegian bokmål translat ion from ProjectX.



commit d11232774e1574047c28b99fbb31e352db37ea2f
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Mon Sep 7 22:01:17 2015 +0200

    Updated Norwegian bokmål translation from ProjectX.

 po/nb.po |  665 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 362 insertions(+), 303 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index fd133de..972c585 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: geary-0.4.1\n"
+"Project-Id-Version: geary-0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-16 20:14+0100\n"
-"PO-Revision-Date: 2014-10-10 18:39+0100\n"
+"POT-Creation-Date: 2015-09-07 22:00+0200\n"
+"PO-Revision-Date: 2015-08-23 18:42+0200\n"
 "Last-Translator: ProsjektX <https://launchpad.net/~prosjektx>\n"
 "Language-Team: https://l10n.gnome.org/teams/no/\n";
 "Language: nb\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.8.4\n"
 
 #: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
 msgid "Geary"
@@ -50,26 +50,31 @@ msgid "Compose Message"
 msgstr "Skriv melding"
 
 #: ../desktop/geary-attach.contract.in.h:1
-#, fuzzy
 msgid "Send by email"
-msgstr "Send og motta e-post"
+msgstr "Send med e-post"
 
 #: ../desktop/geary-attach.contract.in.h:2
 msgid "Send files using Geary"
-msgstr ""
+msgstr "Send filer med Geary"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
 #: ../src/client/components/stock.vala:31
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
 #: ../src/client/components/stock.vala:22
 msgid "_Add"
 msgstr "_Legg til"
 
+#. reset/clear widgets
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+#, c-format
+msgid "Additional addresses for %s"
+msgstr "Ekstra adresser for %s"
+
 #. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:20
+#: ../src/client/accounts/account-dialog.vala:21
 msgid "Accounts"
 msgstr "Kontoer"
 
@@ -84,105 +89,103 @@ msgstr "Kontoer"
 msgid "First Last"
 msgstr "Først Sist"
 
-#: ../src/client/accounts/add-edit-page.vala:230
+#: ../src/client/accounts/add-edit-page.vala:233
 msgid "Welcome to Geary."
 msgstr "Velkommen til Geary."
 
-#: ../src/client/accounts/add-edit-page.vala:230
+#: ../src/client/accounts/add-edit-page.vala:233
 msgid "Enter your account information to get started."
 msgstr "Oppgi din kontoinformasjon for å komme igang."
 
-#: ../src/client/accounts/add-edit-page.vala:249
+#: ../src/client/accounts/add-edit-page.vala:253
 msgid "2 weeks back"
 msgstr "2 uker tilbake"
 
 #. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:250
+#: ../src/client/accounts/add-edit-page.vala:254
 msgid "1 month back"
 msgstr "1 måned tilbake"
 
-#: ../src/client/accounts/add-edit-page.vala:251
+#: ../src/client/accounts/add-edit-page.vala:255
 msgid "3 months back"
 msgstr "3 måneder tilbake"
 
-#: ../src/client/accounts/add-edit-page.vala:252
+#: ../src/client/accounts/add-edit-page.vala:256
 msgid "6 months back"
 msgstr "6 måneder tilbake"
 
-#: ../src/client/accounts/add-edit-page.vala:253
+#: ../src/client/accounts/add-edit-page.vala:257
 msgid "1 year back"
 msgstr "1 år tilbake"
 
-#: ../src/client/accounts/add-edit-page.vala:254
+#: ../src/client/accounts/add-edit-page.vala:258
 msgid "2 years back"
 msgstr "2 år tilbake"
 
-#: ../src/client/accounts/add-edit-page.vala:255
+#: ../src/client/accounts/add-edit-page.vala:259
 msgid "4 years back"
 msgstr "4 år tilbake"
 
 #. Separator
-#: ../src/client/accounts/add-edit-page.vala:257
+#: ../src/client/accounts/add-edit-page.vala:261
 msgid "Everything"
 msgstr "Alt"
 
-#: ../src/client/accounts/add-edit-page.vala:276
+#: ../src/client/accounts/add-edit-page.vala:280
 msgid "Edit"
-msgstr ""
+msgstr "Rediger"
 
-#: ../src/client/accounts/add-edit-page.vala:278
-#, fuzzy
+#: ../src/client/accounts/add-edit-page.vala:282
 msgid "Preview"
-msgstr "_Forrige"
+msgstr "_Forhåndsvisning"
 
-#: ../src/client/accounts/add-edit-page.vala:712
+#: ../src/client/accounts/add-edit-page.vala:723
 msgid "Remem_ber passwords"
 msgstr "_Husk passord"
 
-#: ../src/client/accounts/add-edit-page.vala:719 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
 msgid "Remem_ber password"
 msgstr "_Husk passord"
 
-#: ../src/client/accounts/add-edit-page.vala:753
+#: ../src/client/accounts/add-edit-page.vala:764
 msgid "Unable to validate:\n"
 msgstr "Kan ikke validere:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:755
+#: ../src/client/accounts/add-edit-page.vala:766
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr "        &#8226; Ugyldig konto kallenavn.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:758
+#: ../src/client/accounts/add-edit-page.vala:769
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr "        &#8226; E-post adresse allerede lagt til Geary.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:762
+#: ../src/client/accounts/add-edit-page.vala:773
 msgid "        &#8226; IMAP connection error.\n"
 msgstr "        &#8226; IMAP tilkoblingsfeil.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:765
+#: ../src/client/accounts/add-edit-page.vala:776
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr "        &#8226; IMAP brukernavn eller passord er feil.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:768
+#: ../src/client/accounts/add-edit-page.vala:779
 msgid "        &#8226; SMTP connection error.\n"
 msgstr "        &#8226; SMTP tilkoblingsfeil.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:771
+#: ../src/client/accounts/add-edit-page.vala:782
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr "        &#8226; SMTP brukernavn eller passord er feil.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:775
+#: ../src/client/accounts/add-edit-page.vala:786
 msgid "        &#8226; Connection error.\n"
 msgstr "        &#8226; Tilkoblingsfeil.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:779
+#: ../src/client/accounts/add-edit-page.vala:790
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Brukernavn eller passord er feil.\n"
 
 #: ../src/client/application/geary-application.vala:19
-#, fuzzy
 msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Opphavsrett 2011-2014 Yorba Foundation"
+msgstr "Opphavsrett 2011-2015 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
@@ -266,189 +269,198 @@ msgstr "Klarte ikke å tolke kommandolinjens valg: %s\n"
 msgid "Unrecognized command line option \"%s\"\n"
 msgstr "Ugjenkjennelig kommandolinjevalg \"%s\"\n"
 
-#: ../src/client/application/geary-controller.vala:60
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation"
+msgstr "Slett samtale"
+
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Slett samtalen (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:64
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Slett samtaler (Shift+Delete)"
 
 #. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:65
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Flytt samtalen til papirkurven (Delete, Rettetast)"
 
-#: ../src/client/application/geary-controller.vala:66
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:69
 msgid "Move conversations to Trash (Delete, Backspace)"
-msgstr "Flytt samtaler til papirkurven (Delete, Rettetast)"
+msgstr "Flytt samtalene til papirkurven (Delete, Rettetast)"
 
 #. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:70
+#: ../src/client/application/geary-controller.vala:73
 msgid "_Archive"
 msgstr "_Arkiv"
 
-#: ../src/client/application/geary-controller.vala:71
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversation (A)"
 msgstr "Arkiver samtalen (A)"
 
-#: ../src/client/application/geary-controller.vala:72
+#: ../src/client/application/geary-controller.vala:75
 msgid "Archive conversations (A)"
 msgstr "Arkiver samtaler (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as S_pam"
 msgstr "Marker som sø_ppelpost"
 
-#: ../src/client/application/geary-controller.vala:76
+#: ../src/client/application/geary-controller.vala:79
 msgid "Mark as not S_pam"
 msgstr "Marker som ikke sø_ppelpost"
 
-#: ../src/client/application/geary-controller.vala:78
-#: ../src/client/application/geary-controller.vala:348
+#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:397
 msgid "Mark conversation"
 msgstr "Marker samtalen"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:82
 msgid "Mark conversations"
 msgstr "Marker samtaler"
 
-#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversation"
 msgstr "Sett merkelapp på samtalen"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:84
 msgid "Add label to conversations"
 msgstr "Sett merkelapp på samtaler"
 
-#: ../src/client/application/geary-controller.vala:82
-#: ../src/client/application/geary-controller.vala:387
+#: ../src/client/application/geary-controller.vala:85
+#: ../src/client/application/geary-controller.vala:436
 msgid "Move conversation"
 msgstr "Flytt samtalen"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:86
 msgid "Move conversations"
 msgstr "Flytt samtaler"
 
-#: ../src/client/application/geary-controller.vala:324
+#: ../src/client/application/geary-controller.vala:373
+#: ../ui/app_menu.interface.h:1
 msgid "A_ccounts"
 msgstr "K_ontoer"
 
-#: ../src/client/application/geary-controller.vala:329
-#: ../src/client/components/stock.vala:27
+#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/components/stock.vala:27 ../ui/app_menu.interface.h:2
 msgid "_Preferences"
 msgstr "_Innstillinger"
 
-#: ../src/client/application/geary-controller.vala:333
-#: ../src/client/components/stock.vala:25
+#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/components/stock.vala:25 ../ui/app_menu.interface.h:4
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/client/application/geary-controller.vala:337
-#: ../src/client/components/stock.vala:21
+#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/components/stock.vala:21 ../ui/app_menu.interface.h:5
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/client/application/geary-controller.vala:341
+#: ../src/client/application/geary-controller.vala:390
+#: ../ui/app_menu.interface.h:3
 msgid "_Donate"
 msgstr "_Doner"
 
-#: ../src/client/application/geary-controller.vala:345
-#: ../src/client/components/stock.vala:29
+#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/components/stock.vala:29 ../ui/app_menu.interface.h:6
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../src/client/application/geary-controller.vala:350
+#: ../src/client/application/geary-controller.vala:399
 msgid "_Mark as..."
 msgstr "_Merk som..."
 
-#: ../src/client/application/geary-controller.vala:356
+#: ../src/client/application/geary-controller.vala:405
 msgid "Mark as _Read"
 msgstr "Marker som _lest"
 
-#: ../src/client/application/geary-controller.vala:362
+#: ../src/client/application/geary-controller.vala:411
 msgid "Mark as _Unread"
 msgstr "Marker som _ulest"
 
-#: ../src/client/application/geary-controller.vala:368
+#: ../src/client/application/geary-controller.vala:417
 msgid "_Star"
 msgstr "_Stjerne"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:422
 msgid "U_nstar"
 msgstr "F_jern stjerne"
 
-#: ../src/client/application/geary-controller.vala:383
+#: ../src/client/application/geary-controller.vala:432
 msgid "Add label"
 msgstr "Legg til merkelapp"
 
-#: ../src/client/application/geary-controller.vala:384
+#: ../src/client/application/geary-controller.vala:433
 msgid "_Label"
 msgstr "_Merkelapp"
 
-#: ../src/client/application/geary-controller.vala:388
+#: ../src/client/application/geary-controller.vala:437
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../src/client/application/geary-controller.vala:392
+#: ../src/client/application/geary-controller.vala:441
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Skriv ny melding (Ctrl+N, N)"
 
 #. Reply to a message.
-#: ../src/client/application/geary-controller.vala:396
+#: ../src/client/application/geary-controller.vala:445
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Svar"
 
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply (Ctrl+R, R)"
 msgstr "Svar (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:401
+#: ../src/client/application/geary-controller.vala:450
 msgid "R_eply All"
 msgstr "Sv_ar alle"
 
-#: ../src/client/application/geary-controller.vala:402
+#: ../src/client/application/geary-controller.vala:451
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Svar alle (Ctrl+Shift+R, Shift+R)"
 
 #. Forward a message.
-#: ../src/client/application/geary-controller.vala:407
+#: ../src/client/application/geary-controller.vala:456
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../src/client/application/geary-controller.vala:408
+#: ../src/client/application/geary-controller.vala:457
 msgid "Forward (Ctrl+L, F)"
 msgstr "Videresend (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty"
-msgstr ""
+msgstr "Tøm"
 
-#: ../src/client/application/geary-controller.vala:447
+#: ../src/client/application/geary-controller.vala:497
 msgid "Empty Spam or Trash folders"
-msgstr ""
+msgstr "Tøm søppelpost eller papirkurv"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:501
 msgid "Empty _Spam…"
-msgstr ""
+msgstr "Tøm _søppelpost..."
 
-#: ../src/client/application/geary-controller.vala:455
+#: ../src/client/application/geary-controller.vala:505
 msgid "Empty _Trash…"
-msgstr ""
+msgstr "Tøm _papirkurv..."
+
+#. No callback is connected, since we bind the toggle button to the search bar visibility
+#: ../src/client/application/geary-controller.vala:538
+msgid "Toggle search bar"
+msgstr "Toggle søkelinjen"
 
-#: ../src/client/application/geary-controller.vala:693
+#: ../src/client/application/geary-controller.vala:752
 msgid "Unable to store server trust exception"
 msgstr "Kunne ikke lagre klareringsavvik for tjener"
 
-#: ../src/client/application/geary-controller.vala:930
+#: ../src/client/application/geary-controller.vala:989
 msgid "Your settings are insecure"
 msgstr "Dine innstillinger er utrygge"
 
-#: ../src/client/application/geary-controller.vala:931
+#: ../src/client/application/geary-controller.vala:990
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -459,17 +471,17 @@ msgstr ""
 "klartekst, som gjør det mulig for andre å plukke det opp. Er du sikker på at "
 "du ønsker å fortsette?"
 
-#: ../src/client/application/geary-controller.vala:932
+#: ../src/client/application/geary-controller.vala:991
 msgid "Co_ntinue"
 msgstr "Fo_rtsett"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1010
+#: ../src/client/application/geary-controller.vala:1069
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Feil under sending av e-post"
 
-#: ../src/client/application/geary-controller.vala:1011
+#: ../src/client/application/geary-controller.vala:1070
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -479,12 +491,12 @@ msgstr ""
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1015
+#: ../src/client/application/geary-controller.vala:1074
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Feil ved lagring av sent e-post"
 
-#: ../src/client/application/geary-controller.vala:1016
+#: ../src/client/application/geary-controller.vala:1075
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -492,19 +504,19 @@ msgstr ""
 "Geary fikk et problem med å lagre en sent melding til Sendt e-post. "
 "Meldingen vil forbli i din Utboks mappe til du sletter den."
 
-#: ../src/client/application/geary-controller.vala:1085
+#: ../src/client/application/geary-controller.vala:1144
 msgid "Labels"
 msgstr "Merkelapper"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:1097
+#: ../src/client/application/geary-controller.vala:1156
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Kunne ikke åpne databasen for %s"
 
-#: ../src/client/application/geary-controller.vala:1098
+#: ../src/client/application/geary-controller.vala:1157
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -528,20 +540,20 @@ msgstr ""
 "Gjenoppbygge databasen vil slette all lokal e-post og dens vedlegg. <b>E-"
 "posten på serveren vil ikke bli påvirket.</b>"
 
-#: ../src/client/application/geary-controller.vala:1100
+#: ../src/client/application/geary-controller.vala:1159
 msgid "_Rebuild"
 msgstr "_Gjenoppbygg"
 
-#: ../src/client/application/geary-controller.vala:1100
+#: ../src/client/application/geary-controller.vala:1159
 msgid "E_xit"
 msgstr "Av_slutt"
 
-#: ../src/client/application/geary-controller.vala:1109
+#: ../src/client/application/geary-controller.vala:1168
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Kunne ikke gjenoppbygge database for \"%s\""
 
-#: ../src/client/application/geary-controller.vala:1110
+#: ../src/client/application/geary-controller.vala:1169
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -554,14 +566,14 @@ msgstr ""
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1132
-#: ../src/client/application/geary-controller.vala:1142
-#: ../src/client/application/geary-controller.vala:1153
+#: ../src/client/application/geary-controller.vala:1191
+#: ../src/client/application/geary-controller.vala:1201
+#: ../src/client/application/geary-controller.vala:1212
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Kunne ikke åpne lokal e-postboks for %s"
 
-#: ../src/client/application/geary-controller.vala:1133
+#: ../src/client/application/geary-controller.vala:1192
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -580,7 +592,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1143
+#: ../src/client/application/geary-controller.vala:1202
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
@@ -594,7 +606,7 @@ msgstr ""
 "\n"
 "Vennligst innstaller den siste versjonen av Geary og førsøk igjen."
 
-#: ../src/client/application/geary-controller.vala:1154
+#: ../src/client/application/geary-controller.vala:1213
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -606,28 +618,27 @@ msgstr ""
 "\n"
 "Vennligst verifiser din nettverksforbindelse og start Geary på nytt."
 
-#: ../src/client/application/geary-controller.vala:1662
+#: ../src/client/application/geary-controller.vala:1721
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1665
+#: ../src/client/application/geary-controller.vala:1724
 msgid "translator-credits"
 msgstr "ProsjektX <https://launchpad.net/~prosjektx>"
 
-#: ../src/client/application/geary-controller.vala:1931
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:1990
 msgid "Undo move (Ctrl+Z)"
-msgstr "Understrek (Ctrl+U)"
+msgstr "Angre flytting (Ctrl+U)"
 
-#: ../src/client/application/geary-controller.vala:1941
+#: ../src/client/application/geary-controller.vala:2000
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Er du sikker på at du vil åpne \"%s\"?"
 
-#: ../src/client/application/geary-controller.vala:1942
+#: ../src/client/application/geary-controller.vala:2001
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -635,16 +646,16 @@ msgstr ""
 "Vedlegg kan forårsake skade på ditt system om åpnet. Åpne filer bare fra "
 "klarerte avsendere."
 
-#: ../src/client/application/geary-controller.vala:1943
+#: ../src/client/application/geary-controller.vala:2002
 msgid "Don't _ask me again"
 msgstr "Ikke _spør meg igjen"
 
-#: ../src/client/application/geary-controller.vala:1961
+#: ../src/client/application/geary-controller.vala:2020
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "En fil med navnet \"%s\" finnes fra før. Vil du erstatte den?"
 
-#: ../src/client/application/geary-controller.vala:1963
+#: ../src/client/application/geary-controller.vala:2022
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
@@ -652,64 +663,60 @@ msgstr ""
 "Filen finnes allerede i \"%s\". Innholdet vil overskrives hvis du erstatter "
 "filen."
 
-#: ../src/client/application/geary-controller.vala:1966
+#: ../src/client/application/geary-controller.vala:2025
 msgid "_Replace"
 msgstr "_Erstatt"
 
 #. Find out what to do with the inline composers.
 #. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2264
+#: ../src/client/application/geary-controller.vala:2323
 msgid "Close open draft messages?"
 msgstr "Lukke åpnet meldingsutkast?"
 
-#: ../src/client/application/geary-controller.vala:2394
+#: ../src/client/application/geary-controller.vala:2453
 #, c-format
 msgid "Empty all email from your %s folder?"
-msgstr ""
+msgstr "Tømme all e-post fra %s mappen?"
 
-#: ../src/client/application/geary-controller.vala:2395
+#: ../src/client/application/geary-controller.vala:2454
 msgid "This removes the email from Geary and your email server."
-msgstr ""
+msgstr "Dette fjerner e-post fra Geary og e-postserveren."
 
-#: ../src/client/application/geary-controller.vala:2396
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:2455
 msgid "This cannot be undone."
-msgstr "\"%s\" kunne ikke bli funnet."
+msgstr "Dette kan ikke gjøres om."
 
-#: ../src/client/application/geary-controller.vala:2397
+#: ../src/client/application/geary-controller.vala:2456
 #, c-format
 msgid "Empty %s"
-msgstr ""
+msgstr "Tøm %s"
 
-#: ../src/client/application/geary-controller.vala:2414
-#, fuzzy, c-format
+#: ../src/client/application/geary-controller.vala:2473
+#, c-format
 msgid "Error emptying %s"
-msgstr "Feil under lagring"
+msgstr "Feil under sletting av %s"
 
-#: ../src/client/application/geary-controller.vala:2444
+#: ../src/client/application/geary-controller.vala:2503
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Ønsker du å slette denne meldingen permanent?"
 msgstr[1] "Ønsker du å slette disse meldingene permanent?"
 
-#: ../src/client/application/geary-controller.vala:2446
+#: ../src/client/application/geary-controller.vala:2505
 msgid "Delete"
 msgstr "Slett"
 
-#: ../src/client/application/geary-controller.vala:2477
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:2536
 msgid "Undo archive (Ctrl+Z)"
-msgstr "Understrek (Ctrl+U)"
+msgstr "Angre arkivering (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2492
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:2551
 msgid "Undo trash (Ctrl+Z)"
-msgstr "Fjern sitering av tekst (Ctrl+[)"
+msgstr "Angre flytting til papirkurv (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2545
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:2604
 msgid "Undo (Ctrl+Z)"
-msgstr "Understrek (Ctrl+U)"
+msgstr "Angre (Ctrl+Z)"
 
 #: ../src/client/components/conversation-find-bar.vala:214
 #, c-format
@@ -729,45 +736,44 @@ msgstr[1] "%i treff (sideskift)"
 msgid "not found"
 msgstr "ikke funnet"
 
-#: ../src/client/components/main-toolbar.vala:11
+#: ../src/client/components/main-window.vala:430
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: ../src/client/components/search-bar.vala:10
 #: ../src/client/folder-list/folder-list-search-branch.vala:38
 #: ../src/engine/api/geary-special-folder-type.vala:51
 msgid "Search"
 msgstr "Søk"
 
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:81
+#. Search entry.
+#: ../src/client/components/search-bar.vala:25
 msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr "Søk i all e-post på kontoen for nøkkelord (Ctrl+S)"
 
-#: ../src/client/components/main-toolbar.vala:200
+#: ../src/client/components/search-bar.vala:118
 #, c-format
 msgid "Indexing %s account"
 msgstr "Indekserer %s konto"
 
-#: ../src/client/components/main-toolbar.vala:211
+#: ../src/client/components/search-bar.vala:129
 #: ../src/client/folder-list/folder-list-search-branch.vala:39
 #, c-format
 msgid "Search %s account"
 msgstr "Søk %s konto"
 
-#: ../src/client/components/main-window.vala:349
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
 msgstr "Sender..."
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
+#: ../src/client/components/stock.vala:18 ../ui/account_cannot_remove.glade.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/client/components/stock.vala:19 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
+#: ../src/client/components/stock.vala:19 ../ui/edit_alternate_emails.glade.h:3
+#: ../ui/password-dialog.glade.h:5 ../ui/remove_confirm.glade.h:5
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -801,131 +807,126 @@ msgstr "Velg _alt"
 msgid "_Keep"
 msgstr "_Behold"
 
-#: ../src/client/composer/composer-widget.vala:59
+#: ../src/client/composer/composer-widget.vala:73
 msgid "Saved"
 msgstr "Lagret"
 
-#: ../src/client/composer/composer-widget.vala:60
+#: ../src/client/composer/composer-widget.vala:74
 msgid "Saving"
 msgstr "Lagrer"
 
-#: ../src/client/composer/composer-widget.vala:61
+#: ../src/client/composer/composer-widget.vala:75
 msgid "Error saving"
 msgstr "Feil under lagring"
 
-#: ../src/client/composer/composer-widget.vala:62
+#: ../src/client/composer/composer-widget.vala:76
 msgid "Press Backspace to delete quote"
-msgstr ""
+msgstr "Trykk rettetast for å slette samtale"
+
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Ny melding"
 
 #. A list of keywords, separated by pipe ("|") characters, that suggest an attachment; since
 #. this is full-word checking, include all variants of each word.  No spaces are allowed.
-#: ../src/client/composer/composer-widget.vala:123
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
 msgstr ""
+"vedlegg|attach|attaching|attaches|attachment|attachments|attached|enclose|"
+"enclosed|enclosing|encloses|enclosure|enclosures"
 
-#: ../src/client/composer/composer-widget.vala:1048
-#: ../src/client/composer/composer-widget.vala:1052
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
 msgid "Do you want to discard this message?"
 msgstr "Ønsker du å forkaste denne meldingen?"
 
-#: ../src/client/composer/composer-widget.vala:1185
+#: ../src/client/composer/composer-widget.vala:1262
 msgid "Send message with an empty subject and body?"
 msgstr "Sende melding med tom tittel og innhold?"
 
-#: ../src/client/composer/composer-widget.vala:1187
+#: ../src/client/composer/composer-widget.vala:1264
 msgid "Send message with an empty subject?"
 msgstr "Sende melding med tom tittel?"
 
-#: ../src/client/composer/composer-widget.vala:1189
+#: ../src/client/composer/composer-widget.vala:1266
 msgid "Send message with an empty body?"
 msgstr "Sende melding med tomt innhold?"
 
-#: ../src/client/composer/composer-widget.vala:1191
+#: ../src/client/composer/composer-widget.vala:1268
 msgid "Send message without an attachment?"
 msgstr "Sende melding uten et vedlegg?"
 
-#: ../src/client/composer/composer-widget.vala:1453
+#: ../src/client/composer/composer-widget.vala:1530
 msgid "Cannot add attachment"
 msgstr "Kan ikke legge til vedlegg"
 
-#: ../src/client/composer/composer-widget.vala:1464
+#: ../src/client/composer/composer-widget.vala:1541
 #, c-format
 msgid "\"%s\" could not be found."
 msgstr "\"%s\" kunne ikke bli funnet."
 
-#: ../src/client/composer/composer-widget.vala:1471
+#: ../src/client/composer/composer-widget.vala:1548
 #, c-format
 msgid "\"%s\" is a folder."
 msgstr "\"%s\" er en mappe."
 
-#: ../src/client/composer/composer-widget.vala:1478
+#: ../src/client/composer/composer-widget.vala:1555
 #, c-format
 msgid "\"%s\" is an empty file."
 msgstr "\"%s\" er en tom fil."
 
-#: ../src/client/composer/composer-widget.vala:1492
+#: ../src/client/composer/composer-widget.vala:1569
 #, c-format
 msgid "\"%s\" could not be opened for reading."
 msgstr "\"%s\" kunne ikke åpnes for lesing."
 
-#: ../src/client/composer/composer-widget.vala:1499
+#: ../src/client/composer/composer-widget.vala:1576
 #, c-format
 msgid "\"%s\" already attached for delivery."
 msgstr "\"%s\" er allerede lagt ved for levering."
 
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1508
+#: ../src/client/composer/composer-widget.vala:1585
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-widget.vala:1568
+#: ../src/client/composer/composer-widget.vala:1645
 msgid "To: "
 msgstr "Til: "
 
-#: ../src/client/composer/composer-widget.vala:1571
+#: ../src/client/composer/composer-widget.vala:1648
 msgid "Cc: "
 msgstr "Kopi:"
 
-#: ../src/client/composer/composer-widget.vala:1574
+#: ../src/client/composer/composer-widget.vala:1651
 msgid "Bcc: "
 msgstr "Blindkopi:"
 
-#: ../src/client/composer/composer-widget.vala:1577
-#, fuzzy
+#: ../src/client/composer/composer-widget.vala:1654
 msgid "Reply-To: "
-msgstr "_Svar"
+msgstr "Svar til:"
 
-#: ../src/client/composer/composer-widget.vala:1810
+#: ../src/client/composer/composer-widget.vala:1887
 msgid "Select Color"
 msgstr "Velg farge"
 
+#. Displayed in the From dropdown to indicate an "alternate email address"
+#. for an account.  The first printf argument will be the alternate email
+#. address, and the second will be the account's primary email address.
+#: ../src/client/composer/composer-widget.vala:2322
+#, c-format
+msgid "%1$s via %2$s"
+msgstr "%1$s via %2$s"
+
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2256
+#: ../src/client/composer/composer-widget.vala:2364
 msgid "_From:"
 msgstr "_Fra:"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2272
-#: ../src/client/conversation-viewer/conversation-viewer.vala:809
-msgid "From:"
-msgstr "Fra:"
-
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Window for sending messages.
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Ny melding"
-
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Meg"
@@ -965,6 +966,10 @@ msgstr "Vis alltid fra avsender"
 msgid "Edit Draft"
 msgstr "Rediger utkast"
 
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Fra:"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:812
 msgid "To:"
 msgstr "Til:"
@@ -1082,7 +1087,7 @@ msgstr "Vis meldings_data"
 #. Generate the attachment table.
 #. / Placeholder filename for attachments with no filename.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:384
+#: ../src/engine/rfc822/rfc822-utils.vala:378
 msgid "none"
 msgstr "ingen"
 
@@ -1186,7 +1191,7 @@ msgstr "En feil oppstod under behandling av tjenerens sertifikat"
 #. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
 #: ../src/client/dialogs/password-dialog.vala:16
 msgid "Geary requires your email password to continue"
-msgstr ""
+msgstr "Geary trenger ditt e-post passord for å fortsette"
 
 #. Label displaying total number of email messages in a folder
 #: ../src/client/folder-list/folder-list-folder-entry.vala:32
@@ -1434,7 +1439,7 @@ msgstr "Utboks"
 msgid "Archive"
 msgstr "Arkiv"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
+#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
 msgid "None"
 msgstr "Ingen"
 
@@ -1534,57 +1539,57 @@ msgstr "Papirkurv | Søppelkurv | Trash | Rubbish | Rubbish Bin"
 
 #. / Format for the datetime that a message being replied to was received
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/engine/rfc822/rfc822-utils.vala:221
+#: ../src/engine/rfc822/rfc822-utils.vala:215
 msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgstr "%a. %e. %b, %Y, kl %-k:%M"
 
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:227
+#: ../src/engine/rfc822/rfc822-utils.vala:221
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "Den %1$s, %2$s skreiv:"
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:234
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 #, c-format
 msgid "%s wrote:"
 msgstr "%s skreiv:"
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: ../src/engine/rfc822/rfc822-utils.vala:240
+#: ../src/engine/rfc822/rfc822-utils.vala:234
 #, c-format
 msgid "On %s:"
 msgstr "På %s:"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
+#: ../src/engine/rfc822/rfc822-utils.vala:263
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Videresendt melding ----------"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:273
+#: ../src/engine/rfc822/rfc822-utils.vala:267
 #, c-format
 msgid "From: %s\n"
 msgstr "Fra: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:274
+#: ../src/engine/rfc822/rfc822-utils.vala:268
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Emne: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
+#: ../src/engine/rfc822/rfc822-utils.vala:269
 #, c-format
 msgid "Date: %s\n"
 msgstr "Dato: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:278
+#: ../src/engine/rfc822/rfc822-utils.vala:272
 #, c-format
 msgid "To: %s\n"
 msgstr "Til: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:281
+#: ../src/engine/rfc822/rfc822-utils.vala:275
 #, c-format
 msgid "Cc: %s\n"
 msgstr "Kopier: %s\n"
@@ -1716,129 +1721,176 @@ msgstr "_Rik tekst"
 
 #: ../ui/composer.glade.h:23
 msgid "Show Extended Fields"
-msgstr ""
+msgstr "Vis utvidede felter"
 
 #: ../ui/composer.glade.h:24
+msgctxt "Label"
+msgid "Close and Save"
+msgstr "Lukk og Lagre"
+
+#: ../ui/composer.glade.h:25
+msgctxt "Short Label"
+msgid "Close and Save"
+msgstr "Lukk og Lagre"
+
+#: ../ui/composer.glade.h:26
+msgctxt "Tooltip"
+msgid "Close and Save"
+msgstr "Lukk og Lagre"
+
+#: ../ui/composer.glade.h:27
+msgctxt "Label"
+msgid "Close and Discard"
+msgstr "Lukk og Forkast"
+
+#: ../ui/composer.glade.h:28
+msgctxt "Short Label"
+msgid "Close and Discard"
+msgstr "Lukk og Forkast"
+
+#: ../ui/composer.glade.h:29
+msgctxt "Tooltip"
+msgid "Close and Discard"
+msgstr "Lukk og Forkast"
+
+#: ../ui/composer.glade.h:30
 msgid "Lar_ge"
 msgstr "St_or"
 
-#: ../ui/composer.glade.h:25
+#: ../ui/composer.glade.h:31
 msgid "Large"
 msgstr "Stor"
 
-#: ../ui/composer.glade.h:26
+#: ../ui/composer.glade.h:32
 msgid "_Medium"
 msgstr "_Medium"
 
-#: ../ui/composer.glade.h:27
+#: ../ui/composer.glade.h:33
 msgid "Medium"
 msgstr "Medium"
 
-#: ../ui/composer.glade.h:28
+#: ../ui/composer.glade.h:34
 msgid "_Small"
 msgstr "_Liten"
 
-#: ../ui/composer.glade.h:29
+#: ../ui/composer.glade.h:35
 msgid "Small"
 msgstr "Liten"
 
-#: ../ui/composer.glade.h:30
+#: ../ui/composer.glade.h:36
 msgid "S_ans Serif"
 msgstr "S_ans Serif"
 
-#: ../ui/composer.glade.h:31
+#: ../ui/composer.glade.h:37
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ../ui/composer.glade.h:32
+#: ../ui/composer.glade.h:38
 msgid "S_erif"
 msgstr "S_erif"
 
-#: ../ui/composer.glade.h:33
+#: ../ui/composer.glade.h:39
 msgid "Serif"
 msgstr "Serif"
 
-#: ../ui/composer.glade.h:34
+#: ../ui/composer.glade.h:40
 msgid "_Fixed Width"
 msgstr "_Fast bredde"
 
-#: ../ui/composer.glade.h:35
+#: ../ui/composer.glade.h:41
 msgid "Fixed Width"
 msgstr "Fast bredde"
 
-#: ../ui/composer.glade.h:36
+#: ../ui/composer.glade.h:42
 msgid "Detach"
 msgstr "Koble fra vinduet"
 
-#: ../ui/composer.glade.h:37
-#, fuzzy
+#: ../ui/composer.glade.h:43
 msgid "Detach (Ctrl+D)"
-msgstr "Kursiv (Ctrl+I)"
+msgstr "Koble fra vinduet (Ctrl+D)"
 
-#: ../ui/composer.glade.h:38
+#: ../ui/composer.glade.h:44
 msgid "_Send"
 msgstr "_Send"
 
-#: ../ui/composer.glade.h:39
+#: ../ui/composer.glade.h:45
 msgid "Send"
 msgstr "Send"
 
-#: ../ui/composer.glade.h:40
-#, fuzzy
+#: ../ui/composer.glade.h:46
 msgid "Send (Ctrl+Enter)"
-msgstr "Fet (Ctrl+B)"
+msgstr "Send (Ctrl+Enter)"
 
-#: ../ui/composer.glade.h:41
+#: ../ui/composer.glade.h:47
 msgid "_Attach File"
 msgstr "_Legg ved fil"
 
-#: ../ui/composer.glade.h:42
+#: ../ui/composer.glade.h:48
 msgid "Attach File"
 msgstr "Legg ved fil"
 
-#: ../ui/composer.glade.h:43
+#: ../ui/composer.glade.h:49
 msgid "_Include Original Attachments"
 msgstr "_Inkluder opprinnelige vedlegg"
 
-#: ../ui/composer.glade.h:44
+#: ../ui/composer.glade.h:50
 msgid "Include Original Attachments"
 msgstr "Inkluder opprinnelige vedlegg"
 
+#: ../ui/composer.glade.h:51
+msgid "Application Menu"
+msgstr "Applikasjonsmeny"
+
 #. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:46
+#: ../ui/composer.glade.h:53
 msgid "_To"
 msgstr "_Til"
 
-#: ../ui/composer.glade.h:47
+#: ../ui/composer.glade.h:54
 msgid "_Cc"
 msgstr "_Kopi"
 
-#: ../ui/composer.glade.h:48
+#: ../ui/composer.glade.h:55
 msgid "_Subject"
 msgstr "_Emne"
 
-#: ../ui/composer.glade.h:49
+#: ../ui/composer.glade.h:56
 msgid "_Bcc"
 msgstr "_Blindkopi"
 
-#: ../ui/composer.glade.h:50
-#, fuzzy
+#: ../ui/composer.glade.h:57
 msgid "_Reply-To"
-msgstr "_Svar"
+msgstr "_Svar til"
 
 #. Geary account mail will be sent from
-#: ../ui/composer.glade.h:52
+#: ../ui/composer.glade.h:59
 msgid "From"
 msgstr "Fra"
 
-#: ../ui/composer.glade.h:53
+#: ../ui/composer.glade.h:60
 msgid "Drop files here"
 msgstr "Slipp filer her"
 
-#: ../ui/composer.glade.h:54
+#: ../ui/composer.glade.h:61
 msgid "To add them as attachments"
 msgstr "For å legge dem til som vedlegg"
 
+#: ../ui/edit_alternate_emails.glade.h:1
+msgid "Remove email address"
+msgstr "Fjern e-postadresse"
+
+#: ../ui/edit_alternate_emails.glade.h:2
+msgid ""
+"Some email services require additional addresses be configured on the "
+"server.  Contact your email provider for more information."
+msgstr ""
+"Noen e-posttjenester krever at flere adresser konfigureres på tjeneren. "
+"Kontakt e-postleverandøren for mer informasjon."
+
+#: ../ui/edit_alternate_emails.glade.h:4
+msgid "_Update"
+msgstr "_Oppdater"
+
 #: ../ui/find_bar.glade.h:1
 msgid "Find:"
 msgstr "Finn:"
@@ -1892,110 +1944,112 @@ msgid "_Save sent mail"
 msgstr "_Lagre sendt e-post"
 
 #: ../ui/login.glade.h:10
+msgid "Addi_tional email addresses…"
+msgstr "_Flere e-postadresser..."
+
+#: ../ui/login.glade.h:11
 msgid "IMAP settings"
 msgstr "IMAP innstillinger"
 
-#: ../ui/login.glade.h:11
+#: ../ui/login.glade.h:12
 msgid "Se_rver"
 msgstr "Tj_ener"
 
-#: ../ui/login.glade.h:12
+#: ../ui/login.glade.h:13
 msgid "P_ort"
 msgstr "P_ort"
 
-#: ../ui/login.glade.h:13
+#: ../ui/login.glade.h:14
 msgid "Ser_ver"
 msgstr "Tje_ner"
 
-#: ../ui/login.glade.h:14
+#: ../ui/login.glade.h:15
 msgid "Por_t"
 msgstr "Por_t"
 
-#: ../ui/login.glade.h:15
+#: ../ui/login.glade.h:16
 msgid "SMTP settings"
 msgstr "SMTP innstillinger"
 
-#: ../ui/login.glade.h:16
+#: ../ui/login.glade.h:17
 msgid "User_name"
 msgstr "Bruker_navn"
 
-#: ../ui/login.glade.h:17
+#: ../ui/login.glade.h:18
 msgid "Pass_word"
 msgstr "Pass_ord"
 
-#: ../ui/login.glade.h:18
+#: ../ui/login.glade.h:19
 msgid "SMTP username"
 msgstr "SMTP brukernavn"
 
-#: ../ui/login.glade.h:19
+#: ../ui/login.glade.h:20
 msgid "SMTP password"
 msgstr "SMTP passord"
 
-#: ../ui/login.glade.h:20
+#: ../ui/login.glade.h:21
 msgid "_Username"
 msgstr "_Brukernavn"
 
-#: ../ui/login.glade.h:21
+#: ../ui/login.glade.h:22
 msgid "IMAP username"
 msgstr "IMAP brukernavn"
 
-#: ../ui/login.glade.h:22
+#: ../ui/login.glade.h:23
 msgid "IMAP password"
 msgstr "IMAP passord"
 
-#: ../ui/login.glade.h:23
+#: ../ui/login.glade.h:24
 msgid "Encr_yption"
 msgstr "Kryp_tering"
 
-#: ../ui/login.glade.h:24
+#: ../ui/login.glade.h:25
 msgid "Encrypt_ion"
 msgstr "Krypter_ing"
 
-#: ../ui/login.glade.h:26
+#: ../ui/login.glade.h:27
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: ../ui/login.glade.h:27
+#: ../ui/login.glade.h:28
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../ui/login.glade.h:28
+#: ../ui/login.glade.h:29
 msgid "No authentication re_quired"
 msgstr "Ingen autentisering på_krevd"
 
-#: ../ui/login.glade.h:29
+#: ../ui/login.glade.h:30
 msgid "Use IMAP cre_dentials"
 msgstr "Bruk IMAP påloggings_informasjon"
 
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Lagring"
-
-#: ../ui/login.glade.h:31
-msgid "_Download mail"
-msgstr "_Last ned e-post"
-
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:4
+#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
 msgid "Composer"
 msgstr "Skrive meldinger"
 
-#: ../ui/login.glade.h:33
+#: ../ui/login.glade.h:32
 msgid "Save dra_fts on server"
 msgstr "Lagre _utkast på tjener"
 
-#: ../ui/login.glade.h:34
-#, fuzzy
+#: ../ui/login.glade.h:33
 msgid "Si_gn emails (HTML allowed):"
-msgstr "Si_gner e-poster:"
+msgstr "Si_gner e-poster (HTML tillatt):"
+
+#: ../ui/login.glade.h:34
+msgid "Storage"
+msgstr "Lagring"
+
+#: ../ui/login.glade.h:35
+msgid "_Download mail"
+msgstr "_Last ned e-post"
 
 #: ../ui/password-dialog.glade.h:1
 msgid "SMTP Credentials"
 msgstr "SMTP påloggingsinformasjon"
 
 #: ../ui/password-dialog.glade.h:2
-#, fuzzy
 msgid "Username"
-msgstr "_Brukernavn"
+msgstr "Brukernavn"
 
 #: ../ui/password-dialog.glade.h:4
 msgid "_Remember password"
@@ -2003,7 +2057,7 @@ msgstr "_Husk passord"
 
 #: ../ui/password-dialog.glade.h:6
 msgid "_Authenticate"
-msgstr ""
+msgstr "_Autentiser"
 
 #: ../ui/preferences.glade.h:1
 msgid "Reading"
@@ -2017,30 +2071,37 @@ msgstr "Velg neste melding _automatisk"
 msgid "_Display conversation preview"
 msgstr "_Forhåndsvisning av samtale"
 
-#: ../ui/preferences.glade.h:5
+#: ../ui/preferences.glade.h:4
+msgid "Use _three pane view"
+msgstr "Bruk tre-panels visning"
+
+#: ../ui/preferences.glade.h:6
 msgid "Enable _spell checking"
 msgstr "Aktiver _stavekontroll"
 
-#: ../ui/preferences.glade.h:6
+#: ../ui/preferences.glade.h:7
 msgid "Notifications"
 msgstr "Varslinger"
 
-#: ../ui/preferences.glade.h:7
+#: ../ui/preferences.glade.h:8
 msgid "_Play notification sounds"
 msgstr "_Spill varslingslyder"
 
-#: ../ui/preferences.glade.h:8
+#: ../ui/preferences.glade.h:9
 msgid "Show _notifications for new mail"
 msgstr "Vis _varslinger for ny e-post"
 
-#: ../ui/preferences.glade.h:9
-#, fuzzy
+#: ../ui/preferences.glade.h:10
 msgid "Always _watch for new mail"
-msgstr "Vis _varslinger for ny e-post"
+msgstr "Alltid s_jekk for ny e-post"
 
-#: ../ui/preferences.glade.h:10
+#: ../ui/preferences.glade.h:11
 msgid "Geary will run in the background and notify of new mail"
-msgstr ""
+msgstr "Geary vil kjøre i bakgrunnen og melde i fra om ny e-post"
+
+#: ../ui/preferences.glade.h:12
+msgid "Preferences"
+msgstr "Innstillinger"
 
 #: ../ui/remove_confirm.glade.h:1
 msgid ""
@@ -2067,9 +2128,11 @@ msgid "Email address:"
 msgstr "E-postadresse:"
 
 #: ../ui/upgrade_dialog.glade.h:1
-#, fuzzy
 msgid "Geary update in progress…"
-msgstr "Geary-oppdatering pågår."
+msgstr "Geary-oppdatering pågår..."
+
+#~ msgid "Archive | Archives"
+#~ msgstr "Arkiv | Arkiver | Archive | Archives"
 
 #~ msgid "_Delete"
 #~ msgstr "_Slett"
@@ -2094,10 +2157,6 @@ msgstr "Geary-oppdatering pågår."
 #~ msgid "Password:"
 #~ msgstr "Passord:"
 
-#~| msgid "_Preferences"
-#~ msgid "Preferences"
-#~ msgstr "Innstillinger"
-
 #~ msgid "Notify of new mail at start_up"
 #~ msgstr "Varsle om ny e-post under _oppstart"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]