Updated Norwegian bokmål translation.

author: Kjartan Maraas <kmaraas@gnome.org> 2009-07-20 17:59:36 +0800
committer: Kjartan Maraas <kmaraas@gnome.org> 2009-08-03 17:15:31 +0800
commit: 329452e040dfa546b9427588a2411eb71db6ad38 (patch)
tree: 9796087ecf1c811cac23b3f1e36fdb5aa134a914 /po/nb.po
parent: faab01f3e359896d4786041c106678a120830504 (diff)
download: gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar
gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar.gz
gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar.bz2
gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar.lz
gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar.xz
gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar.zst
gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.zip
1 files changed, 2150 insertions, 2130 deletions
diff --git a/po/nb.po b/po/nb.po
index a434b97cc0..8858139a60 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@
 # Terance Edward Sola <terance@lyse.net>, 2005.
 #
 #
-#: ../shell/main.c:605
+#: ../shell/main.c:631
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.25.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-10 09:10+0200\n"
-"PO-Revision-Date: 2009-06-10 09:29+0200\n"
+"POT-Creation-Date: 2009-07-19 20:18+0200\n"
+"PO-Revision-Date: 2009-07-19 20:33+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
 msgstr "evolution adressebok"
 
@@ -34,7 +34,7 @@ msgstr "Ny kontakt"
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -57,32 +57,32 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "evolution minikort"
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "Har alarmer."
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "Har gjeninntreffelse"
 
-#: ../a11y/calendar/ea-cal-view-event.c:274
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "Er et møte."
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenderhendelse: Sammendraget er %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:282
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenderhendlelse: Har ikke sammendrag."
 
-#: ../a11y/calendar/ea-cal-view-event.c:302
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "vis kalenderhendelse"
 
-#: ../a11y/calendar/ea-cal-view-event.c:530
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "Ta fokus"
 
@@ -106,8 +106,8 @@ msgstr "Gå til i dag"
 msgid "Go to Date"
 msgstr "Gå til dato"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "en tabell som viser og velger aktivt tidsområde"
 
@@ -151,7 +151,7 @@ msgid "calendar view for one or more days"
 msgstr "kalendervisning for en eller flere dager"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:772
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -162,18 +162,18 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:775
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1598
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1587
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:777
-#: ../calendar/gui/calendar-component.c:782
-#: ../calendar/gui/calendar-component.c:784
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -181,10 +181,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:796
-#: ../calendar/gui/calendar-component.c:803
-#: ../calendar/gui/calendar-component.c:809
-#: ../calendar/gui/calendar-component.c:811
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -194,9 +194,9 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:801
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1614
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1603
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -214,11 +214,11 @@ msgstr "søkefelt"
 msgid "evolution calendar search bar"
 msgstr "søkefelt for Evolution kalender"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "Hoppeknapp"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "Klikk her for å finne flere hendelser."
 
@@ -249,20 +249,20 @@ msgstr "oppsprett"
 msgid "popup a child"
 msgstr "vis et avkom"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "rediger"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "start redigering av denne cellen"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "vend"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "vend cellen"
 
@@ -282,17 +282,17 @@ msgstr "slå sammen"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "slår sammen raden i ETree som inneholder denne cellen"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "Celle i tabell"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:579
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "klikk for å legge til"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "klikk"
 
@@ -405,7 +405,7 @@ msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1743
 msgid "Failed to delete contact"
 msgstr "Klarte ikke å slette kontakt"
 
@@ -555,17 +555,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:591
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "Forvalgt synkroniseringsadresse:"
 
+#: ../addressbook/conduit/address-conduit.c:1613
 #: ../addressbook/conduit/address-conduit.c:1614
-#: ../addressbook/conduit/address-conduit.c:1615
 msgid "Could not load address book"
 msgstr "Kunne ikke laste adressebok"
 
-#: ../addressbook/conduit/address-conduit.c:1692
-#: ../addressbook/conduit/address-conduit.c:1695
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
@@ -589,9 +589,9 @@ msgstr "Konfigurer automatisk fullføring her"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:583
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -630,20 +630,20 @@ msgstr "Håndter dine S/MIME-sertifikater her"
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:97
-#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:192
-#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:192
-#: ../mail/em-folder-tree-model.c:194 ../mail/em-migrate.c:2891
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
 #: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
-#: ../mail/message-list.c:1517
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
 #. Create the LDAP source group
 #: ../addressbook/gui/component/addressbook-component.c:98
-#: ../addressbook/gui/component/addressbook-migrate.c:518
+#: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "På LDAP-tjenere"
 
@@ -660,15 +660,15 @@ msgstr "På LDAP-tjenere"
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:135
 #: ../addressbook/gui/component/addressbook-component.c:138
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 #: ../calendar/gui/calendar-component.c:232
 #: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:190 ../calendar/gui/memos-component.c:194
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:187
-#: ../calendar/gui/tasks-component.c:191 ../mail/em-migrate.c:960
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "Personlig"
 
@@ -691,7 +691,7 @@ msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
 #: ../addressbook/gui/component/addressbook-component.c:224
-#: ../addressbook/gui/component/addressbook-config.c:1247
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
@@ -743,11 +743,11 @@ msgstr "Basis"
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../addressbook/gui/component/addressbook-config.c:649
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopier innholdet i adresse_boken lokalt for frakoblet operasjon"
 
-#: ../addressbook/gui/component/addressbook-config.c:761
+#: ../addressbook/gui/component/addressbook-config.c:759
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -757,7 +757,7 @@ msgstr ""
 "liste med standardporter er gitt. Spør din systemadministrator hvilken port "
 "du skal bruke."
 
-#: ../addressbook/gui/component/addressbook-config.c:839
+#: ../addressbook/gui/component/addressbook-config.c:837
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -766,7 +766,7 @@ msgstr ""
 "Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
 "setter denne til «E-post-adresse» kreves anonym tilgang til din LDAP-tjener."
 
-#: ../addressbook/gui/component/addressbook-config.c:918
+#: ../addressbook/gui/component/addressbook-config.c:916
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -778,72 +778,72 @@ msgstr ""
 "søkebase. Et søkeområde som «one» vil kun ta med oppføringer ett nivå under "
 "basen."
 
-#: ../addressbook/gui/component/addressbook-config.c:1022
+#: ../addressbook/gui/component/addressbook-config.c:1020
 #: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
-#: ../plugins/itip-formatter/itip-formatter.c:2545
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Generelt"
 
-#: ../addressbook/gui/component/addressbook-config.c:1023
+#: ../addressbook/gui/component/addressbook-config.c:1021
 #: ../addressbook/gui/widgets/e-addressbook-view.c:553
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../addressbook/gui/component/addressbook-config.c:1027
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "Tjenerinformasjon"
 
-#: ../addressbook/gui/component/addressbook-config.c:1029
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../addressbook/gui/component/addressbook-config.c:1032
+#: ../addressbook/gui/component/addressbook-config.c:1030
 #: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../addressbook/gui/component/addressbook-config.c:1033
-#: ../mail/em-folder-browser.c:1024
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1022
 msgid "Searching"
 msgstr "Søker"
 
-#: ../addressbook/gui/component/addressbook-config.c:1035
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../addressbook/gui/component/addressbook-config.c:1245
+#: ../addressbook/gui/component/addressbook-config.c:1243
 #: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1110
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "Flytter..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1169
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Flytter «%s»:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP-tjenere"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "Innstillinger for autofullføring"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -855,7 +855,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -865,7 +865,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -875,7 +875,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -910,19 +910,19 @@ msgid "Save As vCard..."
 msgstr "Lagre som vCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:629
-#: ../calendar/gui/memos-component.c:481 ../calendar/gui/tasks-component.c:473
-#: ../mail/em-folder-tree.c:2105 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "End_re navn..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/calendar-component.c:632
-#: ../calendar/gui/e-calendar-table.c:1614
-#: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:952
-#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:476
-#: ../mail/em-folder-tree.c:2102 ../mail/em-folder-view.c:1341
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1608
+#: ../calendar/gui/e-calendar-view.c:1826 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1342
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -930,9 +930,9 @@ msgid "_Delete"
 msgstr "_Slett"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:637
-#: ../calendar/gui/memos-component.c:489 ../calendar/gui/tasks-component.c:481
-#: ../mail/em-folder-tree.c:2111 ../ui/evolution-addressbook.xml.h:59
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "Egenska_per..."
@@ -946,20 +946,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Aksesserer LDAP-tjener anonymt"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Oppgi passord for %s (bruker %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:423
-#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/publish-calendar/publish-calendar.c:218
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Oppgi passord"
@@ -1173,7 +1173,7 @@ msgstr "Metode for på_logging:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 #: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1188,7 +1188,7 @@ msgid "_Search scope:"
 msgstr "_Søkeområde:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "Tj_ener:"
@@ -1211,7 +1211,7 @@ msgstr "kort"
 #: ../plugins/caldav/caldav-source.c:448
 #: ../plugins/calendar-http/calendar-http.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:653
+#: ../plugins/google-account-setup/google-source.c:720
 #: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "minutter"
@@ -1237,174 +1237,182 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Forskjellig</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>Notater</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Annet</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefon</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Nettadresser</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Arbeid</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Kate_gorier..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2443
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Bilde"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Mailing Address"
 msgstr "Postadresse"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Nic_kname:"
 msgstr "_Kallenavn:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "Notater"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "_Bryllupsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "_Fødselsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../calendar/gui/dialogs/event-page.c:805
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "_By:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "F_irma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "Av_deling:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "_Lagre under:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "_Ledig/opptatt:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "_Hjemmeside:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "_Leder:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Notes:"
-msgstr "_Notater:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "K_ontor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "_Yrke:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "_Ektefelle:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 #: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "_Videoprat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "_Ønsker å motta HTML-formatert e-post"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "_Weblogg:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:475
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
+#: ../mail/em-mailer-prefs.c:474
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
 #: ../plugins/plugin-manager/plugin-manager.c:57
 #: ../widgets/menus/gal-define-views-dialog.c:344
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
@@ -1413,119 +1421,119 @@ msgid "Name"
 msgstr "Navn"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1828 ../widgets/text/e-text.c:3689
-#: ../widgets/text/e-text.c:3690
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:613
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "Skype"
 
 #. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
 #: ../mail/em-migrate.c:959
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Hjemme"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2287
 msgid "Other"
 msgstr "Andre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "Kildebok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "Målbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "Obligatoriske felt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "Endret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2438
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1533,43 +1541,43 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3161
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "_Fullt navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "_Velg adressebok"
 
@@ -1672,9 +1680,9 @@ msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:213
-#: ../calendar/gui/e-day-view-time-item.c:816
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:211
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "Velg..."
 
@@ -1700,11 +1708,11 @@ msgid "_Members"
 msgstr "_Medlemmer"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
 #: ../addressbook/gui/widgets/e-addressbook-view.c:210
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Bok"
 
@@ -1750,27 +1758,27 @@ msgstr ""
 "i denne mappen. Vil du legge den til likevel?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "_Flett"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "Flett kontakt"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
 #: ../addressbook/gui/widgets/eab-contact-display.c:589
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:872
-#: ../plugins/groupwise-features/junk-settings.c:421 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "E-post"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:159
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Et felt inneholder"
@@ -1784,35 +1792,35 @@ msgstr "E-post begynner med"
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Ingen kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
 #: ../addressbook/gui/widgets/e-addressbook-view.c:224
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Spør"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:508
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3553
-#: ../widgets/text/e-text.c:3554
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Modell"
 
@@ -1830,7 +1838,7 @@ msgstr "Kilde"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:231
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:567
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
 #: ../widgets/misc/e-attachment-tree-view.c:554
@@ -1838,94 +1846,94 @@ msgid "Type"
 msgstr "Type"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:811
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1962
 msgid "Save as vCard..."
 msgstr "Lagre som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-#: ../calendar/gui/e-calendar-table.c:1592
-#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:931
+#: ../calendar/gui/e-calendar-table.c:1586
+#: ../calendar/gui/e-calendar-view.c:1804 ../calendar/gui/e-memo-table.c:927
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Åpne"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
 msgid "_New Contact..."
 msgstr "_Ny kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "New Contact _List..."
 msgstr "Ny kontakt_liste..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "_Save as vCard..."
 msgstr "Lagre _som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Forward Contact"
 msgstr "_Videresend kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contacts"
 msgstr "_Videresend kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "Send _Message to Contact"
 msgstr "Send _melding til kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to List"
 msgstr "Send _melding til liste"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contacts"
 msgstr "Send _melding til kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "_Print"
 msgstr "_Skriv ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "Cop_y to Address Book..."
 msgstr "_Kopier til adressebok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Mo_ve to Address Book..."
 msgstr "_Flytt til adressebok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:943
-#: ../mail/em-folder-tree.c:972 ../mail/em-folder-view.c:1326
-#: ../mail/message-list.c:2105 ../ui/evolution-addressbook.xml.h:46
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:935
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1327
+#: ../mail/message-list.c:2103 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "P_aste"
 msgstr "_Lim inn"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1525
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "Ingen treff"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -1955,7 +1963,7 @@ msgstr "Biltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1963,7 +1971,7 @@ msgid "Categories"
 msgstr "Kategorier"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "Firma"
 
@@ -2012,22 +2020,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "Leder"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "Kommentar"
 
@@ -2056,14 +2064,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:579
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Rolle"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "Ektefelle"
 
@@ -2096,29 +2104,29 @@ msgstr "Nettside"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/misc/e-reflow.c:1423 ../widgets/misc/e-reflow.c:1424
-#: ../widgets/table/e-table-click-to-add.c:522
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-container.c:997
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3731 ../widgets/text/e-text.c:3732
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Bredde"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/misc/e-reflow.c:1431 ../widgets/misc/e-reflow.c:1432
-#: ../widgets/table/e-table-click-to-add.c:529
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-container.c:990
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3739 ../widgets/text/e-text.c:3740
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Høyde"
 
@@ -2147,7 +2155,7 @@ msgstr "Maksimal lengde på feltnavn"
 msgid "Column Width"
 msgstr "Kolonnebredde"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -2157,7 +2165,7 @@ msgstr ""
 "\n"
 "Søker etter kontakter..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -2171,7 +2179,7 @@ msgstr ""
 "\n"
 "eller dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -2185,7 +2193,7 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -2195,7 +2203,7 @@ msgstr ""
 "\n"
 "Søk etter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -2205,7 +2213,7 @@ msgstr ""
 "\n"
 "Ingen oppføringer i denne visningen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adapter"
 
@@ -2218,7 +2226,7 @@ msgid "Home Email"
 msgstr "E-post hjemme"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "Annen e-post"
 
@@ -2235,7 +2243,7 @@ msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2698
+#: ../mail/em-folder-view.c:2696
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
@@ -2248,101 +2256,101 @@ msgstr "_Send ny melding til..."
 msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(kart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "kart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:839
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/calendar-commands.c:90
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2523
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../calendar/gui/gnome-cal.c:2545
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:644
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "Nettdagbok"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2587
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2578
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
-#: ../calendar/gui/e-calendar-view.c:2588
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2579
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:857
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:893
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:901
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Weblogg"
 
@@ -2397,11 +2405,11 @@ msgstr "Protokollen er ikke støttet"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
 #: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2571
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "Avbrutt"
 
@@ -2412,13 +2420,13 @@ msgstr "Kunne ikke avbryte"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
@@ -2534,7 +2542,7 @@ msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
@@ -2551,7 +2559,7 @@ msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
@@ -2579,7 +2587,7 @@ msgid "Display _All Contacts"
 msgstr "Vis _alle kontakter"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2588,70 +2596,70 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "Overskriv"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
 msgstr[1] "kontakter"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "Velg adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:903
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "Flere vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:910
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard for %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:922
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformasjon"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:950
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformasjon for %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:292
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
 msgstr "Kjører spørring i adressebok..."
 
@@ -2659,56 +2667,56 @@ msgstr "Kjører spørring i adressebok..."
 msgid "Card View"
 msgstr "Kortvisning"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
 #: ../calendar/importers/icalendar-importer.c:310
 #: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importerer..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "LDIF-import for Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard-import"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Kan ikke åpne fil"
@@ -3205,56 +3213,56 @@ msgstr "_Send melding"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:249
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendelser som går over flere dager:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1515
-#: ../calendar/conduits/calendar/calendar-conduit.c:1516
-#: ../calendar/conduits/memo/memo-conduit.c:810
-#: ../calendar/conduits/memo/memo-conduit.c:811
-#: ../calendar/conduits/todo/todo-conduit.c:1009
-#: ../calendar/conduits/todo/todo-conduit.c:1010
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "Kunne ikke starte evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1623
-#: ../calendar/conduits/calendar/calendar-conduit.c:1626
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
+#: ../calendar/conduits/memo/memo-conduit.c:901
 #: ../calendar/conduits/memo/memo-conduit.c:904
-#: ../calendar/conduits/memo/memo-conduit.c:907
 msgid "Could not read pilot's Memo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for notatliste"
 
+#: ../calendar/conduits/memo/memo-conduit.c:948
 #: ../calendar/conduits/memo/memo-conduit.c:951
-#: ../calendar/conduits/memo/memo-conduit.c:954
 msgid "Could not write pilot's Memo application block"
 msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for notatliste"
 
-#: ../calendar/conduits/todo/todo-conduit.c:229
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "Forvalgt prioritet:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1093
-#: ../calendar/conduits/todo/todo-conduit.c:1096
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1138
-#: ../calendar/conduits/todo/todo-conduit.c:1141
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for oppgaveliste"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2536
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:820
-#: ../calendar/gui/calendar-component.c:1242
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "Kalendere"
 
@@ -3295,24 +3303,24 @@ msgid "Memo_s"
 msgstr "_Notater"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:291 ../calendar/gui/e-memos.c:1132
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:566
-#: ../calendar/gui/memos-component.c:884 ../calendar/gui/memos-control.c:389
-#: ../calendar/gui/memos-control.c:405
+#: ../calendar/gui/e-memo-table.c:288 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1843 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "Notater"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:723 ../calendar/gui/e-tasks.c:1436
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1991
-#: ../calendar/gui/tasks-component.c:558 ../calendar/gui/tasks-component.c:880
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
+#: ../calendar/gui/e-calendar-table.c:720 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1711 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:751
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:590
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Oppgaver"
@@ -3323,7 +3331,7 @@ msgstr "_Kalendere"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:329 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
@@ -3331,26 +3339,26 @@ msgstr "_Oppgaver"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:22
 #: ../plugins/caldav/caldav-source.c:449
 #: ../plugins/calendar-http/calendar-http.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:654
+#: ../plugins/google-account-setup/google-source.c:721
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "timer"
 msgstr[1] "timer"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:295
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "Starttid:"
 
@@ -3365,10 +3373,10 @@ msgstr "Se bort fra _alle"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/e-itip-control.c:1165
-#: ../plugins/itip-formatter/itip-view.c:1024
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "Plassering:"
 
@@ -3381,9 +3389,9 @@ msgid "_Dismiss"
 msgstr "_Se bort fra"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../calendar/gui/dialogs/comp-editor.c:1028
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
@@ -3401,32 +3409,32 @@ msgstr "Ut_sett"
 msgid "location of appointment"
 msgstr "lokasjon for avtalen"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1587
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1458
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1471
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1467
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1469
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No location information available."
 msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "Du har %d alarmer"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1710
 #: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1686
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3438,7 +3446,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3455,7 +3463,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1736
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1730
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
@@ -3990,61 +3998,61 @@ msgstr "Hvilken time arbeidsdagen starter"
 msgid "Workday start minute"
 msgstr "Hvilket minutt arbeidsdagen starter"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "Kategorien er"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "Lokasjon inneholder"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
 msgstr "Oppgaver for de neste 7 dagene"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
 msgstr "Aktive oppgaver"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
 msgstr "Utgåtte oppgaver"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "Fullførte oppgaver"
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
 msgstr "Oppgaver med vedlegg"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
 msgstr "Aktive avtaler"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "Avtaler for de neste 7 dagene"
 
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../calendar/gui/calendar-commands.c:315
+#: ../calendar/gui/calendar-commands.c:312
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4053,15 +4061,15 @@ msgstr ""
 "Denne operasjonen vil fjerne alle hendelser innen valgt tidsrom permanent. "
 "Hvis du fortsetter vil du ikke kunne gjenopprette disse hendelsene."
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:318
 msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
-#: ../calendar/gui/calendar-commands.c:326
+#: ../calendar/gui/calendar-commands.c:323
 #: ../plugins/caldav/caldav-source.c:450
 #: ../plugins/calendar-http/calendar-http.c:325
 #: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/google-account-setup/google-source.c:722
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
@@ -4069,9 +4077,9 @@ msgstr "dager"
 
 #. Create the Webcal source group
 #: ../calendar/gui/calendar-component.c:194
-#: ../calendar/gui/memos-component.c:153 ../calendar/gui/migration.c:505
-#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:150
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "På nettet"
 
@@ -4082,96 +4090,96 @@ msgstr "Vær"
 
 #. ensure the source name is in current locale, not read from configuration
 #: ../calendar/gui/calendar-component.c:289
-#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdager og jubileum"
 
-#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:628
-#: ../calendar/gui/memos-component.c:480 ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2097
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ../calendar/gui/calendar-component.c:633
-#: ../calendar/gui/memos-component.c:485 ../calendar/gui/tasks-component.c:477
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "_Gjør tilgjengelig for bruk i frakoblet modus"
 
-#: ../calendar/gui/calendar-component.c:634
-#: ../calendar/gui/memos-component.c:486 ../calendar/gui/tasks-component.c:478
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "_Ikke gjør denne tilgjengelig i frakoblet modus"
 
-#: ../calendar/gui/calendar-component.c:964
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "Feil under oppgradering av kalendere."
 
-#: ../calendar/gui/calendar-component.c:1093
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan ikke åpne kalender «%s» for oppretting av hendelser og møter"
 
-#: ../calendar/gui/calendar-component.c:1109
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ingen kalender er tilgjengelig for oppretting av hendelser og møter"
 
-#: ../calendar/gui/calendar-component.c:1222
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "Valg av kalenderkilde"
 
-#: ../calendar/gui/calendar-component.c:1438
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1439
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Avtale"
 
-#: ../calendar/gui/calendar-component.c:1440
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: ../calendar/gui/calendar-component.c:1446
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: ../calendar/gui/calendar-component.c:1447
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: ../calendar/gui/calendar-component.c:1448
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: ../calendar/gui/calendar-component.c:1454
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: ../calendar/gui/calendar-component.c:1455
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Avtale for hele _dagen"
 
-#: ../calendar/gui/calendar-component.c:1456
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:1463
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1464
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
@@ -4217,9 +4225,9 @@ msgid "Classification"
 msgstr "Klassifisering"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:566
+#: ../calendar/gui/e-cal-model.c:351 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "Konfidensiell"
 
@@ -4248,8 +4256,8 @@ msgstr "Eksisterer"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:710
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/publish-calendar/publish-calendar.c:720
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Location"
 msgstr "Lokasjon"
 
@@ -4259,14 +4267,14 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/e-cal-model.c:349 ../calendar/gui/e-calendar-table.c:563
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:246
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:564 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:340 ../calendar/gui/e-cal-model.c:347
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Offentlig"
 
@@ -4280,7 +4288,7 @@ msgstr "Gjeninntreffelse"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -4309,20 +4317,20 @@ msgstr "er"
 msgid "is not"
 msgstr "er ikke"
 
-#: ../calendar/gui/comp-editor-factory.c:409
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Feil under åpning av kalenderen"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "Metoden er ikke støttet under åpning av kalender"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "Tilgang nektet ved åpning av kalender"
 
-#: ../calendar/gui/comp-editor-factory.c:439
-#: ../plugins/mail-to-task/mail-to-task.c:455 ../shell/e-shell.c:1270
+#: ../calendar/gui/comp-editor-factory.c:438
+#: ../plugins/mail-to-task/mail-to-task.c:455 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -4451,43 +4459,43 @@ msgid "A_dd"
 msgstr "Le_gg til"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Varsel"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
 #: ../widgets/misc/e-attachment-dialog.c:371
 #: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "Fore_slå automatisk visning av vedlegg"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:137
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:186
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/event-page.c:2968
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:789
-#: ../calendar/gui/e-itip-control.c:1151 ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:705 ../mail/em-account-editor.c:1434
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:135
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/event-page.c:2959
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:708 ../mail/em-account-editor.c:1437
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:181
-#: ../plugins/itip-formatter/itip-formatter.c:2192
-#: ../widgets/misc/e-cell-date-edit.c:316 ../widgets/misc/e-dateedit.c:1510
-#: ../widgets/misc/e-dateedit.c:1726
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:637
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:647
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendere valgt for varsel"
 
@@ -4517,47 +4525,55 @@ msgstr ""
 "<i>%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">Alarmer</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Varsel</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Forvalgt ledig/opptatt-tjener</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Generelt</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Oppgaveliste</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Tid</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Arbeidsuke</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "Dag_en slutter:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Display"
 msgstr "Vis"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Display alarms in _notification area only"
+msgstr "Vis alarmer kun i varsli_ngsområdet"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/recurrence-page.c:1107
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -4567,13 +4583,13 @@ msgstr ""
 "Timer\n"
 "Dager"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #: ../calendar/gui/dialogs/recurrence-page.c:1103
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -4591,179 +4607,179 @@ msgstr ""
 "Lørdag\n"
 "Søndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../mail/mail-config.glade.h:117
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "Velg en farge"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "S_un"
 msgstr "S_ø."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1108
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Sc_roll Month View by a week"
 msgstr "_Rull månedsvisning en uke om gangen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Se_cond zone:"
-msgstr "Sekundær sone:"
+msgstr "Se_kundær sone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Select the calendars for alarm notification"
 msgstr "Velg kalendere for varsling"
 
 #. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Sh_ow a reminder"
 msgstr "_Vis en påminnelse"
 
 #. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show a _reminder"
 msgstr "Vis en _påminnelse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Vis uken_ummer i dag- og arbeidsukevisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #: ../calendar/gui/dialogs/recurrence-page.c:1109
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Søndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "T_asks due today:"
 msgstr "Oppg_aver som går ut i dag:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "T_hu"
 msgstr "T_o."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "Template:"
 msgstr "Mal:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 #: ../calendar/gui/dialogs/recurrence-page.c:1106
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 #: ../calendar/gui/dialogs/recurrence-page.c:1104
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "Use s_ystem time zone"
 msgstr "Bruk s_ystemets tidssone"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 #: ../calendar/gui/dialogs/recurrence-page.c:1105
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "Wee_k starts on:"
 msgstr "Uk_en starter på:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Fri"
 msgstr "_Fr."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utførte oppgaver etter"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Mon"
 msgstr "_Ma."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Overdue tasks:"
 msgstr "Utgåtte _oppgaver:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "_Sat"
 msgstr "L_ø."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Show appointment end times in week and month view"
 msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Time divisions:"
 msgstr "Oppdeling av _tid:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
 msgid "_Tue"
 msgstr "_Ti."
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80
 msgid "_Wed"
 msgstr "_On."
 
 #. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
 msgid "before every anniversary/birthday"
 msgstr "før hvert jubileum/bursdag"
 
 #. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:84
 msgid "before every appointment"
 msgstr "før hver avtale"
 
@@ -4870,23 +4886,23 @@ msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2372
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " til "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "Fullført "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2383
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2385
+#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "Ferdig "
 
@@ -4894,211 +4910,211 @@ msgstr "Ferdig "
 msgid "Could not save attachments"
 msgstr "Kunne ikke lagre vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:484
+#: ../calendar/gui/dialogs/comp-editor.c:483
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:573
+#: ../calendar/gui/dialogs/comp-editor.c:572
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:580
+#: ../calendar/gui/dialogs/comp-editor.c:579
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:582
+#: ../calendar/gui/dialogs/comp-editor.c:581
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:588
+#: ../calendar/gui/dialogs/comp-editor.c:587
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:590
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:595
+#: ../calendar/gui/dialogs/comp-editor.c:594
 #, c-format
 msgid "Memo - %s"
 msgstr "Notat - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:611
+#: ../calendar/gui/dialogs/comp-editor.c:610
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:753
+#: ../calendar/gui/dialogs/comp-editor.c:752
 msgid "Keep original item?"
 msgstr "Behold opprinnelig oppføring?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../calendar/gui/dialogs/comp-editor.c:958
 msgid "Click here to close the current window"
 msgstr "Klikk her for å lukke dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:966
+#: ../calendar/gui/dialogs/comp-editor.c:965
 msgid "Copy selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:972
 msgid "Cut selected text to the clipboard"
 msgstr "Klipp ut valgt tekst til utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:979
 msgid "Click here to view help available"
 msgstr "klikk her for å vise tilgjengelig hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:987
+#: ../calendar/gui/dialogs/comp-editor.c:986
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst fra utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
+#: ../calendar/gui/dialogs/comp-editor.c:1007
 msgid "Click here to save the current window"
 msgstr "Klikk her for å lagre dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/comp-editor.c:1014
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1022
+#: ../calendar/gui/dialogs/comp-editor.c:1021
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1036
+#: ../calendar/gui/dialogs/comp-editor.c:1035
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:1042
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1050
+#: ../calendar/gui/dialogs/comp-editor.c:1049
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1057
+#: ../calendar/gui/dialogs/comp-editor.c:1056
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1064 ../mail/em-folder-tree.c:2089
+#: ../calendar/gui/dialogs/comp-editor.c:1063 ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1073
 #: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../calendar/gui/dialogs/comp-editor.c:1075
 msgid "Click here to attach a file"
 msgstr "klikk her for å legge ved en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1084
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Toggles whether to display categories"
 msgstr "Slår av/på visning av kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1094
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "Toggles whether the time zone is displayed"
 msgstr "Slår av/på visning av tidssone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1102
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1104
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1111
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1116
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1118
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "R_ole Field"
 msgstr "R_olle-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Toggles whether the Role field is displayed"
 msgstr "Slår av/på visning av rolle-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Slår av/på visning av RSVP-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1142
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "Toggles whether the Status field is displayed"
 msgstr "Slår av/på visning av status-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1151
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "_Type Field"
 msgstr "_Type felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Slår av/på visning av deltakertype-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1177
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 #: ../composer/e-composer-private.c:66
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1603
+#: ../calendar/gui/dialogs/comp-editor.c:1602
 #: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1866
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2765
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1913
+#: ../calendar/gui/dialogs/comp-editor.c:2760
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2734 ../mail/em-utils.c:373
+#: ../calendar/gui/dialogs/comp-editor.c:2729 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:91
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2794
+#: ../calendar/gui/dialogs/comp-editor.c:2789
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -5171,7 +5187,7 @@ msgid "Contacts..."
 msgstr "Kontakter..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "Deleger til:"
 
@@ -5197,7 +5213,7 @@ msgstr "Gjør denne hendelsen til repeterende"
 
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "Alternativer for sending"
@@ -5236,7 +5252,7 @@ msgid "Appoint_ment"
 msgstr "Av_tale"
 
 #: ../calendar/gui/dialogs/event-page.c:749
-#: ../calendar/gui/dialogs/event-page.c:2743
+#: ../calendar/gui/dialogs/event-page.c:2735
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
@@ -5263,7 +5279,7 @@ msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
 #: ../calendar/gui/dialogs/event-page.c:1218
-#: ../calendar/gui/dialogs/memo-page.c:640
+#: ../calendar/gui/dialogs/memo-page.c:639
 #: ../calendar/gui/dialogs/task-page.c:814
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
@@ -5280,70 +5296,70 @@ msgstr "Tid for start er feil"
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1421
-#: ../calendar/gui/dialogs/memo-page.c:681
+#: ../calendar/gui/dialogs/event-page.c:1420
+#: ../calendar/gui/dialogs/memo-page.c:680
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1427
-#: ../calendar/gui/dialogs/memo-page.c:687
+#: ../calendar/gui/dialogs/event-page.c:1426
+#: ../calendar/gui/dialogs/memo-page.c:686
 #: ../calendar/gui/dialogs/task-page.c:880
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/event-page.c:1451
 #: ../calendar/gui/dialogs/task-page.c:904
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1892
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1890
+#: ../calendar/gui/dialogs/task-page.c:1200
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../calendar/gui/dialogs/event-page.c:1893
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/event-page.c:1891
+#: ../calendar/gui/dialogs/task-page.c:1201
 msgid "_Add "
 msgstr "_Legg til"
 
-#: ../calendar/gui/dialogs/event-page.c:2619
+#: ../calendar/gui/dialogs/event-page.c:2611
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2663
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1810
+#: ../calendar/gui/dialogs/event-page.c:2655
+#: ../calendar/gui/dialogs/memo-page.c:895
+#: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer på vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:2933
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag før avtalen"
 msgstr[1] "%d dager før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2948
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time før avtalen"
 msgstr[1] "%d timer før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt før avtalen"
 msgstr[1] "%d minutter før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/event-page.c:2958
 msgid "Customize"
 msgstr "Tilpass"
 
@@ -5389,7 +5405,7 @@ msgstr "_Beskrivelse:"
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:372
 #: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:240
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_Lokasjon:"
 
@@ -5400,7 +5416,7 @@ msgstr "_Tid:"
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/memo-page.glade.h:8
 #: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
 #: ../smime/gui/smime-ui.glade.h:49
 msgid ""
@@ -5418,19 +5434,19 @@ msgstr ""
 "i\n"
 "til"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2492
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:856
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åpne notater i «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
+#: ../calendar/gui/dialogs/memo-page.c:1011 ../mail/em-format-html.c:1565
+#: ../mail/em-format-html.c:1623 ../mail/em-format-html.c:1648
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../mail/em-mailer-prefs.c:79 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Til"
 
@@ -5469,19 +5485,19 @@ msgstr "Du endrer en repeterende oppgave. Hva ønsker du å endre?"
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Du endrer et repeterende notat. Hva ønsker du å endre?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Kun denne instansen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Denne og tidligere instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Denne og fremtidige instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Alle instanser"
 
@@ -5666,12 +5682,12 @@ msgstr ""
 msgid "Send my alarms with this event"
 msgstr "Send mine alarmer med denne hendelsen"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "Nettside"
 
@@ -5758,7 +5774,7 @@ msgstr "Organi_sator:"
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1767
+#: ../calendar/gui/dialogs/task-page.c:1763
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
@@ -5875,111 +5891,111 @@ msgstr "I_mporter til kalenderen"
 msgid "I_mport to Tasks"
 msgstr "I_mporter til oppgaver"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3214
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3212
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:859
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "Startdato:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
-#: ../calendar/gui/e-cal-component-preview.c:287
-#: ../calendar/gui/e-itip-control.c:1211
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1210
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1179
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1055
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
 #: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/print.c:2565
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2542
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
 #: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/e-itip-control.c:939
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2568 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "Completed"
 msgstr "Fullført"
 
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-calendar-table.c:231
-#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2562
+#: ../calendar/gui/e-calendar-table.c:657 ../calendar/gui/print.c:2539
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:586 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:584 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Høy"
 
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1058 ../calendar/gui/e-calendar-table.c:587
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1057 ../calendar/gui/e-calendar-table.c:585
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:586 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Lav"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Created"
 msgstr "Opprettet"
 
@@ -5999,17 +6015,17 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-calendar-table.c:636
 msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:639
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6019,41 +6035,41 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1063
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1063
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nei"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-itip-control.c:1196
-#: ../calendar/gui/e-itip-control.c:1336
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:448
-#: ../plugins/itip-formatter/itip-formatter.c:2217
+#: ../calendar/gui/e-cal-model.c:353 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../calendar/gui/e-cal-model.c:1060
+#: ../calendar/gui/e-cal-model.c:1059
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../calendar/gui/e-cal-model.c:1062
+#: ../calendar/gui/e-cal-model.c:1061
 msgid "Assigned"
 msgstr "Tildelt"
 
@@ -6063,7 +6079,7 @@ msgstr "* Ingen sammendrag *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:370
-#: ../calendar/gui/e-calendar-view.c:2436
+#: ../calendar/gui/e-calendar-view.c:2427
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -6071,7 +6087,7 @@ msgstr "Organisator: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2440
+#: ../calendar/gui/e-calendar-view.c:2431
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
@@ -6084,135 +6100,135 @@ msgstr "Start: "
 msgid "Due: "
 msgstr "Ferdig: "
 
-#: ../calendar/gui/e-calendar-table.c:589 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:24
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: ../calendar/gui/e-calendar-table.c:608
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:609
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:898
-#: ../calendar/gui/e-calendar-view.c:658 ../calendar/gui/e-memo-table.c:450
+#: ../calendar/gui/e-calendar-table.c:892
+#: ../calendar/gui/e-calendar-view.c:657 ../calendar/gui/e-memo-table.c:444
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: ../calendar/gui/e-calendar-table.c:1177
-#: ../calendar/gui/e-calendar-view.c:872 ../calendar/gui/e-memo-table.c:655
+#: ../calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-view.c:871 ../calendar/gui/e-memo-table.c:649
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1334 ../calendar/gui/e-memo-table.c:831
+#: ../calendar/gui/e-calendar-table.c:1359
+#: ../calendar/gui/e-calendar-view.c:1331 ../calendar/gui/e-memo-table.c:823
 #: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: ../calendar/gui/e-calendar-table.c:1589
-#: ../calendar/gui/e-calendar-view.c:1794
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New _Task"
 msgstr "Ny _oppgave"
 
-#: ../calendar/gui/e-calendar-table.c:1593 ../calendar/gui/e-memo-table.c:936
+#: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:928
 msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:937
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:494
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1805 ../calendar/gui/e-memo-table.c:929
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-view.c:1790 ../calendar/gui/e-memo-table.c:930
 msgid "P_rint..."
 msgstr "Sk_riv ut..."
 
-#: ../calendar/gui/e-calendar-table.c:1599
-#: ../calendar/gui/e-calendar-view.c:1817 ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1810 ../calendar/gui/e-memo-table.c:934
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1800
-#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../calendar/gui/e-calendar-table.c:1605 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1599 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: ../calendar/gui/e-calendar-table.c:1606 ../calendar/gui/e-memo-table.c:948
+#: ../calendar/gui/e-calendar-table.c:1600 ../calendar/gui/e-memo-table.c:940
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1607
+#: ../calendar/gui/e-calendar-table.c:1601
 msgid "_Mark as Complete"
 msgstr "_Merk som fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1608
+#: ../calendar/gui/e-calendar-table.c:1602
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valgte oppgaver som fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1609
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Incomplete"
 msgstr "_Merk som ikke-fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Merk valgte oppgaver som ikke-fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1615
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: ../calendar/gui/e-calendar-table.c:1852
+#: ../calendar/gui/e-calendar-table.c:1844
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klikk for å legge til en oppgave"
@@ -6236,7 +6252,7 @@ msgstr "Ferdigdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -6247,150 +6263,150 @@ msgstr "Startdato"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:2344
-#: ../calendar/gui/e-meeting-list-view.c:604
+#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Status"
 
-#: ../calendar/gui/e-calendar-view.c:1480
+#: ../calendar/gui/e-calendar-view.c:1476
 msgid "Moving items"
 msgstr "Flytter oppføringer"
 
-#: ../calendar/gui/e-calendar-view.c:1482
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Copying items"
 msgstr "Kopierer oppføringer"
 
-#: ../calendar/gui/e-calendar-view.c:1791
+#: ../calendar/gui/e-calendar-view.c:1784
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-calendar-view.c:1785
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Meeting"
 msgstr "Nytt _møte"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1804
+#: ../calendar/gui/e-calendar-view.c:1797
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
-#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "Select T_oday"
 msgstr "Velg i_dag"
 
-#: ../calendar/gui/e-calendar-view.c:1807
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "_Select Date..."
 msgstr "_Velg dato..."
 
-#: ../calendar/gui/e-calendar-view.c:1813
+#: ../calendar/gui/e-calendar-view.c:1806
 msgid "Pri_nt..."
 msgstr "S_kriv ut..."
 
-#: ../calendar/gui/e-calendar-view.c:1823
+#: ../calendar/gui/e-calendar-view.c:1816
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1824
+#: ../calendar/gui/e-calendar-view.c:1817
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1825
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "_Delegate Meeting..."
 msgstr "_Deleger møte..."
 
-#: ../calendar/gui/e-calendar-view.c:1826
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: ../calendar/gui/e-calendar-view.c:1827
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../calendar/gui/e-calendar-view.c:1829
-#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1331
+#: ../calendar/gui/e-calendar-view.c:1822
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1332
 #: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../calendar/gui/e-calendar-view.c:1834
+#: ../calendar/gui/e-calendar-view.c:1827
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1835 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1828 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: ../calendar/gui/e-calendar-view.c:1836
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: ../calendar/gui/e-calendar-view.c:2291
-#: ../calendar/gui/e-itip-control.c:1184
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2205
+#: ../calendar/gui/e-calendar-view.c:2282
+#: ../calendar/gui/e-itip-control.c:1183
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-calendar-view.c:2292
-#: ../calendar/gui/e-itip-control.c:1192
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2211
+#: ../calendar/gui/e-calendar-view.c:2283
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../calendar/gui/e-calendar-view.c:2293
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:396
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-calendar-view.c:2294
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2214
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../calendar/gui/e-calendar-view.c:2295
+#: ../calendar/gui/e-calendar-view.c:2286
 msgid "Needs action"
 msgstr "Krever handling"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2456 ../calendar/gui/print.c:2524
+#: ../calendar/gui/e-calendar-view.c:2447 ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "Plassering: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2487
+#: ../calendar/gui/e-calendar-view.c:2478
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:108
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:116
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6403,12 +6419,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:751
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
-#: ../calendar/gui/e-day-view-time-item.c:772
+#: ../calendar/gui/e-day-view-time-item.c:768
 msgid "Show the second time zone"
 msgstr "Vis den andre tidssonen"
 
@@ -6418,25 +6434,25 @@ msgstr "Vis den andre tidssonen"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1581
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1681
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1570
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:804 ../calendar/gui/e-week-view.c:542
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:799 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:807 ../calendar/gui/e-week-view.c:545
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:802 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2320
+#: ../calendar/gui/e-day-view.c:2301
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
@@ -6518,21 +6534,21 @@ msgid "Ends"
 msgstr "Slutter"
 
 #: ../calendar/gui/e-itip-control.c:954
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "Ferdig"
 
-#: ../calendar/gui/e-itip-control.c:996 ../calendar/gui/e-itip-control.c:1053
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1013
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "iCalendar-feil"
 
-#: ../calendar/gui/e-itip-control.c:1085 ../calendar/gui/e-itip-control.c:1101
-#: ../calendar/gui/e-itip-control.c:1112 ../calendar/gui/e-itip-control.c:1129
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -6543,7 +6559,7 @@ msgid "An unknown person"
 msgstr "En ukjent person"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6551,279 +6567,279 @@ msgstr ""
 "<br>Vennligst sjekk følgende informasjon og velg så en handling fra menyen "
 "under."
 
-#: ../calendar/gui/e-itip-control.c:1188
-#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../calendar/gui/e-itip-control.c:1276
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "Møtet er avlyst, men det ble ikke funnet i dine kalendere."
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1276
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "Oppgaven er avlyst men den ble ikke funnet i dine oppgavelister"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publisert møteinformasjon."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1360
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> forespør at %s er tilstede i et møte."
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "Møteforslag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> ønsker å være med på et eksisterende møte."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ønsker å motta seneste møteinformasjon."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "Forespørsel om møteoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart på en møteforespørsel."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> har avlyst et møte."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "Møteavlysing"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforståelig melding."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "Ugyldig møtemelding"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1437
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> forespør at %s utfører en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> forespør at du utfører en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "Forslag til oppgave"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> ønsker å være med på en eksisterende oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "Forespørsel om oppgaveoppdatering"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart på en oppgavetildeling."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "Svar på oppgave"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> har avlyst en oppgave."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
 msgstr "Avlysning av oppgave"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> forespør din ledig/opptatt-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt forespørsel"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svart på en forespørsel etter ledig/opptatt-informasjon."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "Meldingen ser ikke ut til å være riktig utformet"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder forespørsler som ikke er støttet."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: ../calendar/gui/e-itip-control.c:1973
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "Oppdatering fullført\n"
 
-#: ../calendar/gui/e-itip-control.c:2007
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikke oppdateres\n"
 
-#: ../calendar/gui/e-itip-control.c:2024
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
 
-#: ../calendar/gui/e-itip-control.c:2042
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
 
-#: ../calendar/gui/e-itip-control.c:2066
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
+#: ../calendar/gui/e-itip-control.c:2067
 #: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
 
-#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2161
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2110 ../calendar/gui/e-itip-control.c:2169
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kunne ikke sendes!\n"
 
-#: ../calendar/gui/e-itip-control.c:2287
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "Velg en handling:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2316
-#: ../calendar/gui/e-meeting-list-view.c:592
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2356
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../calendar/gui/e-itip-control.c:2380
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Godta"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
-#: ../calendar/gui/e-itip-control.c:2382
-#: ../plugins/groupwise-features/process-meeting.c:55
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../calendar/gui/e-itip-control.c:2407
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/opptatt-informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2431
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "Oppdater status for respondent"
 
-#: ../calendar/gui/e-itip-control.c:2455
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2479 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -6871,77 +6887,77 @@ msgstr "Valgfrie deltakere"
 msgid "Resources"
 msgstr "Ressurser"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-list-view.c:151
 msgid "Attendees"
 msgstr "Deltakere"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Ressurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Rom"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "Styremedlem"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "Trenger handling"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:547
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "Deltaker                          "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 msgstr "Under arbeid"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2125
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -6949,78 +6965,78 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2156
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Borte fra kontoret"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "Del_takere..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:435
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:452
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: ../calendar/gui/e-meeting-time-sel.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:492
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:510
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: ../calendar/gui/e-meeting-time-sel.c:525
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:605
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
@@ -7048,15 +7064,15 @@ msgstr "Språk"
 msgid "Member"
 msgstr "Medlem"
 
-#: ../calendar/gui/e-memo-table.c:953
+#: ../calendar/gui/e-memo-table.c:945
 msgid "_Delete Selected Memos"
 msgstr "Sle_tt valgte notater"
 
-#: ../calendar/gui/e-memo-table.c:1104 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1094 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klikk for å legge til et notat"
 
-#: ../calendar/gui/e-memos.c:759 ../calendar/gui/e-tasks.c:909
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7065,80 +7081,80 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:811
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "Laster notater"
 
-#: ../calendar/gui/e-memos.c:902
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Åpner notat på %s"
 
-#: ../calendar/gui/e-memos.c:1074 ../calendar/gui/e-tasks.c:1328
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: ../calendar/gui/e-tasks.c:962
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: ../calendar/gui/e-tasks.c:1060
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: ../calendar/gui/e-tasks.c:1305
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: ../calendar/gui/e-tasks.c:1355
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 msgstr "Velg tidssone"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1662
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2648
+#: ../calendar/gui/gnome-cal.c:2670
 msgid "_Custom View"
 msgstr "_Egendefinert visning"
 
-#: ../calendar/gui/gnome-cal.c:2649
+#: ../calendar/gui/gnome-cal.c:2671
 msgid "_Save Custom View"
 msgstr "_Lagre egendefinert visning"
 
-#: ../calendar/gui/gnome-cal.c:2654
+#: ../calendar/gui/gnome-cal.c:2676
 msgid "_Define Views..."
 msgstr "_Definer visninger..."
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/gnome-cal.c:2913
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Laster avtaler på %s"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/gnome-cal.c:2928
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Laster oppgaver på %s"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#: ../calendar/gui/gnome-cal.c:2937
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Laster notat på %s"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#: ../calendar/gui/gnome-cal.c:3049
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../calendar/gui/gnome-cal.c:4009
 msgid "Purging"
 msgstr "Sletter"
 
@@ -7178,32 +7194,32 @@ msgstr "Velg dato"
 msgid "_Select Today"
 msgstr "_Velg i dag"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:548
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:776
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:779
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:782
 msgid "Memo information"
 msgstr "Informasjon om notat"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:800
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:638
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
@@ -7211,7 +7227,7 @@ msgstr "Kalenderinformasjon"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:672
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Godtatt"
@@ -7220,7 +7236,7 @@ msgstr "Godtatt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:679
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
@@ -7232,7 +7248,7 @@ msgstr "Akseptert tentativt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:686 ../calendar/gui/itip-utils.c:734
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Avslått"
@@ -7241,7 +7257,7 @@ msgstr "Avslått"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:693
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegert"
@@ -7249,7 +7265,7 @@ msgstr "Delegert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:706
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Oppdatert"
@@ -7257,7 +7273,7 @@ msgstr "Oppdatert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:713
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -7265,7 +7281,7 @@ msgstr "Avbryt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:720
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Oppdater"
@@ -7273,99 +7289,99 @@ msgstr "Oppdater"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:727
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:797
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:805
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:976
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: ../calendar/gui/memos-component.c:479
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "_Ny notatliste"
 
-#: ../calendar/gui/memos-component.c:562
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d notat"
 msgstr[1] "%d notater"
 
-#: ../calendar/gui/memos-component.c:564 ../calendar/gui/tasks-component.c:556
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valgt"
 msgstr[1] ", %d valgt"
 
-#: ../calendar/gui/memos-component.c:611
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "Feil under oppgradering av notater."
 
-#: ../calendar/gui/memos-component.c:741
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne notatliste «%s» for oppretting av hendelser og møter"
 
-#: ../calendar/gui/memos-component.c:754
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "Ingen kalender tilgjengelig for opppretting av notater"
 
-#: ../calendar/gui/memos-component.c:864
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "Valgt av notatkilde"
 
-#: ../calendar/gui/memos-component.c:1043
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "Nytt notat"
 
-#: ../calendar/gui/memos-component.c:1044
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_otat"
 
-#: ../calendar/gui/memos-component.c:1045
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "Lag et nytt notat"
 
-#: ../calendar/gui/memos-component.c:1051
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "Nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1052
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Delt notat"
 
-#: ../calendar/gui/memos-component.c:1053
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "Lag et nytt delt notat"
 
-#: ../calendar/gui/memos-component.c:1059
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "Ny notatliste"
 
-#: ../calendar/gui/memos-component.c:1060
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Notatli_ste"
 
-#: ../calendar/gui/memos-component.c:1061
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "Lag en ny notatliste"
 
-#: ../calendar/gui/memos-control.c:389 ../calendar/gui/memos-control.c:405
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "Skriv ut notater"
 
@@ -7394,296 +7410,289 @@ msgstr ""
 "Vennligst vent mens Evolution migrere dine mapper..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Kan ikke migrere gamle innstillinger fra evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kan ikke migrere kalender «%s»"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan ikke migrere oppgaver «%s»"
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "Notater"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Sø."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Ma."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Ti."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "On."
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "To."
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Fr."
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "Lø."
 
-#: ../calendar/gui/print.c:2488
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "Avtale"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammendrag: %s"
 
-#: ../calendar/gui/print.c:2538
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "Deltakere: "
 
-#: ../calendar/gui/print.c:2578
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2592
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2607
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: ../calendar/gui/print.c:2619
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2632
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:2643
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: ../calendar/gui/tasks-component.c:471
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "_Ny oppgaveliste"
 
-#: ../calendar/gui/tasks-component.c:554
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../calendar/gui/tasks-component.c:603
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "Feil under oppgradering av oppgaver."
 
-#: ../calendar/gui/tasks-component.c:736
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne oppgaveliste «%s» for oppretting av hendelser og møter"
 
-#: ../calendar/gui/tasks-component.c:749
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
-#: ../calendar/gui/tasks-component.c:860
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr "Valgt av oppgavekilde"
 
-#: ../calendar/gui/tasks-component.c:1114
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1115
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../calendar/gui/tasks-component.c:1116
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1122
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "Ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1123
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1124
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1130
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/gui/tasks-component.c:1131
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Oppgave_liste"
 
-#: ../calendar/gui/tasks-component.c:1132
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
-#: ../calendar/gui/tasks-control.c:488
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7695,11 +7704,11 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1127
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1128
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
@@ -7730,7 +7739,7 @@ msgstr "Avtaler og møter"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1729
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "Åpner kalender"
 
@@ -9337,7 +9346,7 @@ msgstr "L_ukk"
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1338
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1339
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
 #: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
@@ -9370,7 +9379,7 @@ msgstr "Lagre som ut_kast"
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:152
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:186
 msgid "S_end"
 msgstr "S_end"
 
@@ -9482,6 +9491,14 @@ msgstr "Slå av/på visning av Svar-til feltet"
 msgid "Save Draft"
 msgstr "Lagre utkast"
 
+#: ../composer/e-composer-header.c:114
+msgid "Show"
+msgstr "Vis"
+
+#: ../composer/e-composer-header.c:117
+msgid "Hide"
+msgstr "Skjul"
+
 #: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
@@ -9538,7 +9555,7 @@ msgstr "Em_ne:"
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
@@ -9554,7 +9571,7 @@ msgstr "Velg mapper meldingen skal postes til."
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: ../composer/e-composer-private.c:169
+#: ../composer/e-composer-private.c:203
 msgid "Save draft"
 msgstr "Lagre utkast"
 
@@ -9577,7 +9594,7 @@ msgstr ""
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:3329
+#: ../composer/e-msg-composer.c:3328
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -9742,7 +9759,7 @@ msgstr "L_agre skisse"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution e-post og kalender"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:948
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "Gruppevareløsning"
 
@@ -9811,11 +9828,11 @@ msgid "Log Level"
 msgstr "Loggnivå"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "Tid"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2521
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
@@ -9845,10 +9862,10 @@ msgstr "Feilsøk"
 msgid "Error, Warnings and Debug messages"
 msgstr "Feil, advarsler og feilsøkingsmeldinger"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:943
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:945
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:706
+#: ../plugins/publish-calendar/publish-calendar.c:716
 msgid "Enabled"
 msgstr "Aktivert"
 
@@ -9929,23 +9946,23 @@ msgstr "_Oppgaver"
 msgid "_Later"
 msgstr "_Senere"
 
-#: ../e-util/e-util-labels.c:321
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "Etikett_navn:"
 
-#: ../e-util/e-util-labels.c:344
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "Rediger etikett"
 
-#: ../e-util/e-util-labels.c:344
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "Legg til etikett"
 
-#: ../e-util/e-util-labels.c:363
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "Etikettnavnet kan ikke være tomt."
 
-#: ../e-util/e-util-labels.c:368
+#: ../e-util/e-util-labels.c:367
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -10074,15 +10091,15 @@ msgstr "nå"
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: ../filter/filter-datespec.c:448
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "Velg en fil"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
@@ -10132,11 +10149,11 @@ msgid "I_nclude threads"
 msgstr "Ta _med tråder"
 
 #: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -10256,15 +10273,15 @@ msgstr ""
 "klokkeslett du oppgir\n"
 "et klokkeslett relativt til klokkeslettet nå"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Regelnavn"
 
@@ -10318,21 +10335,21 @@ msgstr "Brukervalg-kontroll for Evolution e-post"
 msgid "Evolution Network configuration control"
 msgstr "Konfigurasjonskontroll for nettverk i Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:603
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:601 ../mail/mail-component.c:602
-#: ../mail/mail-component.c:771
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:790
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
@@ -10341,16 +10358,16 @@ msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:298
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1332
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1333
 #: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1330
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1331
 #: ../ui/evolution-mail-message.xml.h:123
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
@@ -10361,20 +10378,20 @@ msgstr "Sva_r til avsender"
 msgid "%d attached messages"
 msgstr "%d vedlagte meldinger"
 
-#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1654
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:140
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1653
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:141
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Vedlegg"
 msgstr[1] "Vedlegg"
 
 #: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:599
+#: ../widgets/misc/e-attachment-paned.c:601
 msgid "Icon View"
 msgstr "Ikonvisning"
 
 #: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../widgets/misc/e-attachment-paned.c:602
 msgid "List View"
 msgstr "Listevisning"
 
@@ -10425,30 +10442,30 @@ msgstr "Nådde toppen av siden. Fortsatte fra bunnen"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:308
+#: ../mail/em-account-editor.c:311
 msgid "No encryption"
 msgstr "Ingen kryptering"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:312
+#: ../mail/em-account-editor.c:315
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:316
+#: ../mail/em-account-editor.c:319
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
-#: ../mail/em-account-editor.c:407
+#: ../mail/em-account-editor.c:410
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisensavtale for %s"
 
-#: ../mail/em-account-editor.c:414
+#: ../mail/em-account-editor.c:417
 #, c-format
 msgid ""
 "\n"
@@ -10461,127 +10478,127 @@ msgstr ""
 "under nøye\n"
 "og kryss av i ruten for å akseptere den\n"
 
-#: ../mail/em-account-editor.c:486 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:489 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: ../mail/em-account-editor.c:610 ../mail/em-account-editor.c:655
-#: ../mail/em-account-editor.c:722 ../widgets/misc/e-signature-combo-box.c:102
+#: ../mail/em-account-editor.c:613 ../mail/em-account-editor.c:658
+#: ../mail/em-account-editor.c:725 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: ../mail/em-account-editor.c:780
+#: ../mail/em-account-editor.c:783
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/em-account-editor.c:781
+#: ../mail/em-account-editor.c:784
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:782
+#: ../mail/em-account-editor.c:785
 msgid "Ask for each message"
 msgstr "Spør for hver melding"
 
-#: ../mail/em-account-editor.c:1854 ../mail/mail-config.glade.h:100
+#: ../mail/em-account-editor.c:1863 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1905 ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:1914 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:2177
+#: ../mail/em-account-editor.c:2186
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/em-account-editor.c:2185
+#: ../mail/em-account-editor.c:2194
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2375 ../mail/mail-config.glade.h:138
+#: ../mail/em-account-editor.c:2384 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: ../mail/em-account-editor.c:2434 ../mail/mail-config.glade.h:73
+#: ../mail/em-account-editor.c:2443 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "Forvalg"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2500 ../mail/mail-config.glade.h:133
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2509 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "Sikkerhet"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2537 ../mail/em-account-editor.c:2632
+#: ../mail/em-account-editor.c:2546 ../mail/em-account-editor.c:2641
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:2538 ../mail/em-account-editor.c:2633
+#: ../mail/em-account-editor.c:2547 ../mail/em-account-editor.c:2642
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/em-account-editor.c:3098 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3108 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../mail/em-account-editor.c:3098 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3108 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[Forvalg]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1162 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:305 ../mail/em-composer-prefs.c:440
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: ../mail/em-composer-prefs.c:947
+#: ../mail/em-composer-prefs.c:949
 msgid "Language(s)"
 msgstr "Språk"
 
-#: ../mail/em-composer-prefs.c:980
+#: ../mail/em-composer-prefs.c:982
 msgid "Add signature script"
 msgstr "Legg til signaturskript"
 
-#: ../mail/em-composer-prefs.c:1022
+#: ../mail/em-composer-prefs.c:1024
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: ../mail/em-composer-utils.c:1108 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1113 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../mail/em-composer-utils.c:1560
+#: ../mail/em-composer-utils.c:1564
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "Ingen måladresse oppgitt. Videresending av meldingen ble avbrutt."
 
-#: ../mail/em-composer-utils.c:1566
+#: ../mail/em-composer-utils.c:1570
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Fant ingen konto å bruke. Videresending av meldingen ble avbrutt."
 
-#: ../mail/em-composer-utils.c:2034
+#: ../mail/em-composer-utils.c:2037
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2081
+#: ../mail/em-composer-utils.c:2084
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10589,11 +10606,11 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2224
+#: ../mail/em-composer-utils.c:2227
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-filter-editor.c:174
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
@@ -10631,7 +10648,7 @@ msgid "Date sent"
 msgstr "Dato sendt"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:770
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -10714,7 +10731,7 @@ msgstr "er ikke satt"
 msgid "is set"
 msgstr "er satt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:101
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Uønsket e-post"
@@ -10768,7 +10785,7 @@ msgid "Play Sound"
 msgstr "Spill lyd"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "Les"
 
@@ -10845,10 +10862,10 @@ msgid "Stop Processing"
 msgstr "Stopp behandling"
 
 #: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:305
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "Emne"
 
@@ -10905,11 +10922,11 @@ msgstr "Viktige meldinger"
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../mail/em-folder-browser.c:1201
+#: ../mail/em-folder-browser.c:1199
 msgid "Account Search"
 msgstr "Søk i konto"
 
-#: ../mail/em-folder-browser.c:1254
+#: ../mail/em-folder-browser.c:1252
 msgid "All Account Search"
 msgstr "Søk i alle kontoer"
 
@@ -10939,11 +10956,11 @@ msgid "Quota usage"
 msgstr "Bruk av kvote"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:522
-#: ../mail/em-folder-tree.c:2586 ../mail/mail-component.c:168
-#: ../mail/mail-component.c:589
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Innboks"
 
@@ -10956,143 +10973,143 @@ msgstr "Egenskaper for mappe"
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "Opp_rett"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:196 ../mail/em-folder-tree-model.c:198
-#: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1029
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "Søkemapper"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:515 ../mail/mail-component.c:169
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "Skisser"
 
-#: ../mail/em-folder-tree-model.c:518 ../mail/mail-component.c:172
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Maler"
 
-#: ../mail/em-folder-tree-model.c:525 ../mail/mail-component.c:170
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/em-folder-tree-model.c:527 ../mail/mail-component.c:171
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "Sendt"
 
-#: ../mail/em-folder-tree-model.c:585 ../mail/em-folder-tree-model.c:895
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "Laster..."
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:300
+#: ../mail/em-folder-tree.c:318
 #, c-format
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:708
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:867
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:869
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:876 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2012
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:878 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2014
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: ../mail/em-folder-tree.c:970 ../ui/evolution-mail-message.xml.h:100
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ../mail/em-folder-tree.c:971 ../ui/evolution-mail-message.xml.h:113
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ../mail/em-folder-tree.c:973 ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1187 ../mail/message-list.c:2106
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2104
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../mail/em-folder-tree.c:975 ../mail/message-list.c:2108
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2106
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
-#: ../mail/em-folder-tree.c:1685 ../mail/mail-ops.c:1065
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:2090
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: ../mail/em-folder-tree.c:2098
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "_Flytt..."
 
-#: ../mail/em-folder-tree.c:2106 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "T_øm utboks"
 
-#: ../mail/em-folder-tree.c:2113 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurven"
 
-#: ../mail/em-folder-tree.c:2216
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
 msgstr "Søkemappe for _uleste meldinger"
 
@@ -11101,14 +11118,14 @@ msgstr "Søkemappe for _uleste meldinger"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierer «%s» til «%s»"
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1187
-#: ../mail/em-folder-view.c:1202
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1188
+#: ../mail/em-folder-view.c:1203
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1202
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1203
 msgid "C_opy"
 msgstr "K_opier"
 
@@ -11118,176 +11135,176 @@ msgstr "K_opier"
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: ../mail/em-folder-utils.c:696
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:386
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: ../mail/em-folder-utils.c:696
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:386
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til å slette denne meldingen."
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:102
+#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1343
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1344
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1345
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as Un_important"
 msgstr "Merk som uv_iktig"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1352
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging..."
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "_Label"
 msgstr "_Etikett"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1356 ../widgets/misc/e-dateedit.c:477
+#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "I_ngen"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1360
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1364
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: ../mail/em-folder-view.c:1367
+#: ../mail/em-folder-view.c:1368
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Subject"
 msgstr "Søkemappe ba_sert på emne"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Se_nder"
 msgstr "Søkemappe basert på se_nder"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1372
 msgid "Search Folder based on _Recipients"
 msgstr "Søkemappe basert på mottake_re"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Search Folder based on Mailing _List"
 msgstr "Søkemappe basert på e-post_liste"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Sub_ject"
 msgstr "Filter basert på em_ne"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on Sen_der"
 msgstr "Filter basert på sen_der"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1380
 msgid "Filter based on Re_cipients"
 msgstr "Filter basert på motta_kere"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1381
 msgid "Filter based on _Mailing List"
 msgstr "Filter basert på e-_postliste"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2235 ../mail/em-folder-view.c:2278
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:511
-#: ../plugins/google-account-setup/google-source.c:699
+#: ../mail/em-folder-view.c:2234 ../mail/em-folder-view.c:2277
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:593
+#: ../plugins/google-account-setup/google-source.c:764
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/em-folder-view.c:2496
+#: ../mail/em-folder-view.c:2495
 msgid "Unable to retrieve message"
 msgstr "Kunne ikke hente ut melding"
 
-#: ../mail/em-folder-view.c:2700
+#: ../mail/em-folder-view.c:2698
 msgid "Create _Search Folder"
 msgstr "Opprett _søkemappe"
 
-#: ../mail/em-folder-view.c:2701
+#: ../mail/em-folder-view.c:2699
 msgid "_From this Address"
 msgstr "_Fra denne adressen"
 
-#: ../mail/em-folder-view.c:2702
+#: ../mail/em-folder-view.c:2700
 msgid "_To this Address"
 msgstr "_Til denne adressen"
 
-#: ../mail/em-folder-view.c:3195
+#: ../mail/em-folder-view.c:3193
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: ../mail/em-folder-view.c:3207
+#: ../mail/em-folder-view.c:3205
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for å ringe %s"
 
-#: ../mail/em-folder-view.c:3212
+#: ../mail/em-folder-view.c:3210
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å skjule/vise adresser"
 
-#: ../mail/em-format-html-display.c:570 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:569 ../mail/em-format-html.c:653
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: ../mail/em-format-html-display.c:570
+#: ../mail/em-format-html-display.c:569
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11295,11 +11312,11 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:570 ../mail/em-format-html.c:654
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html-display.c:570
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11307,11 +11324,11 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:655
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11319,11 +11336,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:656
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
-#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html-display.c:572
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11331,11 +11348,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:657
 msgid "Signature exists, but need public key"
 msgstr "Signatur eksisterer, men trenger offentlig nøkkel"
 
-#: ../mail/em-format-html-display.c:574
+#: ../mail/em-format-html-display.c:573
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11343,11 +11360,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men det finnes ingen "
 "tilhørende offentlig nøkkel."
 
-#: ../mail/em-format-html-display.c:581 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:580 ../mail/em-format-html.c:663
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html-display.c:581
+#: ../mail/em-format-html-display.c:580
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11355,11 +11372,11 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:582 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:581 ../mail/em-format-html.c:664
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html-display.c:582
+#: ../mail/em-format-html-display.c:581
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11369,11 +11386,11 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:583 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:582 ../mail/em-format-html.c:665
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html-display.c:583
+#: ../mail/em-format-html-display.c:582
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11381,11 +11398,11 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
-#: ../mail/em-format-html-display.c:584 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:583 ../mail/em-format-html.c:666
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: ../mail/em-format-html-display.c:584
+#: ../mail/em-format-html-display.c:583
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11394,57 +11411,57 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil være meget "
 "vanskelig for en utenforstående å se innholdet i denne meldingen på kort tid."
 
-#: ../mail/em-format-html-display.c:685 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:684 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:700
+#: ../mail/em-format-html-display.c:699
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:991
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ferdigstilt på %d %B, %Y, %H.%M"
 
-#: ../mail/em-format-html-display.c:1000
+#: ../mail/em-format-html-display.c:999
 msgid "Overdue:"
 msgstr "Utgått:"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:1002
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "til %d %B %Y %H.%M"
 
-#: ../mail/em-format-html-display.c:1083
+#: ../mail/em-format-html-display.c:1082
 #: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: ../mail/em-format-html-display.c:1084
+#: ../mail/em-format-html-display.c:1083
 #: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: ../mail/em-format-html-display.c:1085
+#: ../mail/em-format-html-display.c:1084
 msgid "_Fit to Width"
 msgstr "_Tilpass bredde"
 
-#: ../mail/em-format-html-display.c:1086
+#: ../mail/em-format-html-display.c:1085
 msgid "Show _Original Size"
 msgstr "Vis _opprinnelig størrelse"
 
-#: ../mail/em-format-html-display.c:1587 ../mail/em-format-html-display.c:1626
+#: ../mail/em-format-html-display.c:1586 ../mail/em-format-html-display.c:1625
 msgid "View _Unformatted"
 msgstr "Vis uformattert"
 
-#: ../mail/em-format-html-display.c:1589
+#: ../mail/em-format-html-display.c:1588
 msgid "Hide _Unformatted"
 msgstr "Skjul _uformatterte"
 
-#: ../mail/em-format-html-display.c:1646
+#: ../mail/em-format-html-display.c:1645
 msgid "O_pen With"
 msgstr "Å_pne med"
 
-#: ../mail/em-format-html-display.c:1723
+#: ../mail/em-format-html-display.c:1722
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11457,110 +11474,110 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter «%s»"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:928
 msgid "Unknown external-body part."
 msgstr "Ukjent del av ekstern kropp."
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:936
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:966
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:977
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:979
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1000
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1011
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1239
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1413
 msgid "Formatting Message..."
 msgstr "Formatterer melding..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1566 ../mail/em-format-html.c:1630
+#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1636
+#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1439
+#: ../mail/em-format-html.c:1746 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1436
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
+#: ../mail/em-format-html.c:1773
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1781
+#: ../mail/em-format-html.c:1778
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1917
+#: ../mail/em-format-html.c:1914
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Denne meldingen ble sendt av <b>%s</b> på vegne av <b>%s</b>"
 
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:923
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:301
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:296
 msgid "From"
 msgstr "Fra"
 
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
-#: ../mail/em-mailer-prefs.c:76
+#: ../mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:324
-#: ../widgets/misc/e-dateedit.c:346
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:83
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "Dato"
 
-#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:83
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:85
 #: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "Ansikt"
@@ -11594,35 +11611,35 @@ msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1631
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1622 ../mail/em-format.c:1631
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: ../mail/em-format.c:1705
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "Kunne ikke lese PGP-melding"
 
-#: ../mail/em-format.c:1705
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Kunne ikke lese PGP-melding: Ukjent feil"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:96
 msgid "Every time"
 msgstr "Hver gang"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per day"
 msgstr "En gang om dagen"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per week"
 msgstr "En gang i uken"
 
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:99
 msgid "Once per month"
 msgstr "En gang i måneden"
 
@@ -11638,38 +11655,38 @@ msgstr "Navn på meldingshode:"
 msgid "Header Value Contains:"
 msgstr "Verdi i meldingshode inneholder:"
 
-#: ../mail/em-mailer-prefs.c:440 ../widgets/table/e-table-click-to-add.c:501
+#: ../mail/em-mailer-prefs.c:439 ../widgets/table/e-table-click-to-add.c:500
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Topptekst"
 
-#: ../mail/em-mailer-prefs.c:444
+#: ../mail/em-mailer-prefs.c:443
 msgid "Contains Value"
 msgstr "Inneholder verdi"
 
-#: ../mail/em-mailer-prefs.c:467
+#: ../mail/em-mailer-prefs.c:466
 msgid "Color"
 msgstr "Farge"
 
-#: ../mail/em-mailer-prefs.c:470
+#: ../mail/em-mailer-prefs.c:469
 msgid "Tag"
 msgstr "Tagg"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1067 ../mail/em-mailer-prefs.c:1121
+#: ../mail/em-mailer-prefs.c:1064 ../mail/em-mailer-prefs.c:1118
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Tillegg %s er tilgjengelig og filen er installert."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1075 ../mail/em-mailer-prefs.c:1130
+#: ../mail/em-mailer-prefs.c:1072 ../mail/em-mailer-prefs.c:1127
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s-tillegg er ikke tilgjengelig. Vennligst sjekk om pakken er installert."
 
-#: ../mail/em-mailer-prefs.c:1096
+#: ../mail/em-mailer-prefs.c:1093
 msgid "No Junk plugin available"
 msgstr "Ingen tillegg for uønsket e-post tilgjengelig"
 
@@ -11683,26 +11700,26 @@ msgstr "Oppgaver"
 msgid "Later"
 msgstr "Senere"
 
-#: ../mail/em-migrate.c:1129
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
 msgstr "Flytting"
 
-#: ../mail/em-migrate.c:1574
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kan ikke opprette ny mappe «%s»: %s"
 
-#: ../mail/em-migrate.c:1600
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
 
-#: ../mail/em-migrate.c:1785
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan ikke søke etter eksisterende postbokser på «%s»: %s"
 
-#: ../mail/em-migrate.c:1790
+#: ../mail/em-migrate.c:1789
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11714,34 +11731,34 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: ../mail/em-migrate.c:1991
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 "Kunne ikke åpne gamle data om meldinger som er beholdt på tjeneren for POP-"
 "tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2005
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Klarte ikke å opprette katalog for bevaring av data på POP3-tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2034
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kan ikke kopiere data for bevaring på POP3-tjener: «%s»: %s"
 
-#: ../mail/em-migrate.c:2505 ../mail/em-migrate.c:2517
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
 
-#: ../mail/em-migrate.c:2875
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
 msgstr "Flytter mapper"
 
-#: ../mail/em-migrate.c:2875
+#: ../mail/em-migrate.c:2874
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -11753,12 +11770,12 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: ../mail/em-migrate.c:2957
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
 
-#: ../mail/em-migrate.c:2976
+#: ../mail/em-migrate.c:2974
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11788,11 +11805,11 @@ msgid "Reply to _List"
 msgstr "Svar til _listen"
 
 #. make it first item
-#: ../mail/em-popup.c:547 ../mail/em-popup.c:747
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "Legg til i _adressebok"
 
-#: ../mail/em-popup.c:726
+#: ../mail/em-popup.c:725
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
@@ -11811,47 +11828,47 @@ msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:859
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
-#: ../mail/em-subscribe-editor.c:895
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:130
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "melding"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "Lagre melding..."
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "Legg til adresse"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "Søke_mapper"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "Kilde for søke_mappe"
 
@@ -12760,12 +12777,12 @@ msgid "Import mail from Elm."
 msgstr "Importer e-post fra Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:310
 msgid "Destination folder:"
 msgstr "Målmappe:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
@@ -12783,8 +12800,8 @@ msgstr "Importerer postboks"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:537
+#: ../plugins/pst-import/pst-importer.c:455
+#: ../plugins/pst-import/pst-importer.c:561 ../shell/e-shell-importer.c:536
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer «%s»"
@@ -12811,108 +12828,108 @@ msgstr "Importer e-post fra Pine."
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valgt, "
 msgstr[1] "%d valgt, "
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d uønsket e-post"
 msgstr[1] "%d uønsket e-poster"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../mail/mail-component.c:578
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
-#: ../mail/mail-component.c:579
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../mail/mail-component.c:930
+#: ../mail/mail-component.c:949
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:950
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "E-post_melding"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:951
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../mail/mail-component.c:938
+#: ../mail/mail-component.c:957
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: ../mail/mail-component.c:939
+#: ../mail/mail-component.c:958
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-post_mappe"
 
-#: ../mail/mail-component.c:940
+#: ../mail/mail-component.c:959
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../mail/mail-component.c:1087
+#: ../mail/mail-component.c:1106
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
@@ -13263,76 +13280,80 @@ msgstr "Meldingshoder"
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr "Hvis tjeneren bruker en annen port enn det som er forvalg så må adressen oppgis som «tjenernavn:port-nummer»"
+
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:103 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "Tabell med meldingshoder"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "Ingen _proxy for:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Merk: Understrek i etikettnavnet brukes som hurtigtastidentifikator i menyen."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Alternativet vil ignoreres hvis det finnes treff for egendefinerte "
 "meldingshoder for uønsket e-post."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
-"Dette navnet vil kun bli brukt som et visningsnavn."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
+msgstr "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under. Dette navnet vil kun bli brukt som et visningsnavn."
 
 #: ../mail/mail-config.glade.h:120
 msgid ""
@@ -13463,14 +13484,12 @@ msgstr ""
 #: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "Utdata fra dette skriptet vil brukes som din\n"
-"signatur. Navnet du oppgir vil kun brukes for\n"
-"visning på skjermen."
+"signatur. Navnet du oppgir vil kun brukes for visning på skjermen."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13478,26 +13497,26 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "Bruk_ernavn:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
-#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:613
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:681
 #: ../plugins/google-account-setup/google-contacts-source.c:280
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:308
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:159
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13507,124 +13526,124 @@ msgstr ""
 "\n"
 "Klikk «Framover» for å begynne. "
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Forvalgt tillegg for uønsket e-post:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte tilkobling til internett"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Behold signaturen over opprinnelig melding ved svar"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Last bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "S_lå kun opp i lokale adressebokmapper"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell konfigurasjon av proxy:"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_pør ved sending av meldinger med tomt emnefelt"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "_Velg..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "Vi_s animasjoner"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Vi_s bilde av avsender i forhåndsvisning av meldingen"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Slå sammen Til/Cc/Bcc-hoder til "
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "Br_uk systemets forvalg"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "beskrivelse"
 
-#: ../mail/mail-config.glade.h:198
+#: ../mail/mail-config.glade.h:197
 msgid "seconds"
 msgstr " sekunder"
 
@@ -13660,7 +13679,7 @@ msgstr "Alle lokale mapper"
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:275
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
@@ -13708,7 +13727,7 @@ msgstr "_Flagg:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-folder-cache.c:835
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -13727,7 +13746,7 @@ msgstr "Henter e-post"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:603
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13736,116 +13755,116 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: ../mail/mail-ops.c:620
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../mail/mail-ops.c:726 ../mail/mail-ops.c:807
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:763
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:767 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../mail/mail-ops.c:879
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: ../mail/mail-ops.c:956
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: ../mail/mail-ops.c:956
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: ../mail/mail-ops.c:1173
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../mail/mail-ops.c:1214
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: ../mail/mail-ops.c:1279
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Henter kvoteinformasjon for mappe %s"
 
-#: ../mail/mail-ops.c:1348
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: ../mail/mail-ops.c:1419
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: ../mail/mail-ops.c:1537
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../mail/mail-ops.c:1600
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1601
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1655
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: ../mail/mail-ops.c:1695 ../mail/mail-ops.c:1745
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: ../mail/mail-ops.c:1742
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1824
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: ../mail/mail-ops.c:1933
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../mail/mail-ops.c:2018
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -13879,22 +13898,22 @@ msgstr ""
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: ../mail/mail-ops.c:2355
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: ../mail/mail-ops.c:2355
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: ../mail/mail-ops.c:2451
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto «%s» for frakoblet bruk"
 
-#: ../mail/mail-ops.c:2537
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
@@ -13918,31 +13937,31 @@ msgstr "Oppdaterer..."
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:813
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/mail-session.c:211
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:213
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:216
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:218
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:260
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
@@ -13997,11 +14016,11 @@ msgstr "Oppdaterer søkemapper for «%s:%s»"
 msgid "Updating Search Folders for '%s'"
 msgstr "Oppdaterer søkemapper for «%s»"
 
-#: ../mail/mail-vfolder.c:1068
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "Rediger søkemappe"
 
-#: ../mail/mail-vfolder.c:1157
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Ny søkemappe"
 
@@ -14615,79 +14634,79 @@ msgstr "T_øm"
 msgid "_Open Messages"
 msgstr "_Åpne meldinger"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 #: ../widgets/table/e-cell-date.c:71
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:81
+#: ../mail/message-list.c:1670 ../widgets/table/e-cell-date.c:81
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:93
+#: ../mail/message-list.c:1682 ../widgets/table/e-cell-date.c:93
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:101
+#: ../mail/message-list.c:1690 ../widgets/table/e-cell-date.c:101
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:103
+#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:103
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3986 ../mail/message-list.c:4460
+#: ../mail/message-list.c:3981 ../mail/message-list.c:4454
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4299
+#: ../mail/message-list.c:4293
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14695,7 +14714,7 @@ msgstr ""
 "Ingen meldinger passer dine søkekriterier. Du kan enten tømme søket med "
 "menyoppføringen Søk->Tøm eller endre det."
 
-#: ../mail/message-list.c:4301
+#: ../mail/message-list.c:4295
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -14733,39 +14752,39 @@ msgstr "Størrelse"
 msgid "Subject - Trimmed"
 msgstr "Forkortet emne"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Ring"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Videresend"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:76
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:77
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "Gjennomgå"
 
@@ -14825,8 +14844,8 @@ msgstr ""
 "Liste med hint om ting å se etter i meldingskroppen for tillegg for "
 "påminnelse om vedlegg."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:478
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "Nøkkelord"
 
@@ -14837,7 +14856,7 @@ msgstr "Påminnelse om vedlegg"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr ""
+msgstr "Viser påminnelse hvis du glemmer å legge ved et vedlegg i en melding."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -14871,41 +14890,38 @@ msgstr "Spill av lyd-vedlegg direkte i Evolution."
 msgid "Select name of the Evolution backup file"
 msgstr "Velg navn på sikkerhetskopi for Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:168
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:191
+#: ../plugins/backup-restore/backup-restore.c:190
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Velg navn på sikkerhetskopi for Evolution som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup-restore.c:215
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr "Sta_rt Evolution på nytt etter gjenoppretting"
 
-#: ../plugins/backup-restore/backup-restore.c:288
+#: ../plugins/backup-restore/backup-restore.c:287
 msgid "Restore from backup"
 msgstr "Gjenopprett fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:289
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
-msgstr ""
-"Du kan gjenopprette Evolution fra din sikkerhetskopi. Alle meldinger, "
-"kalendere, oppgaver, notater og adressebøker kan gjenopprettes.\n"
-"Du kan også gjenopprette alle dine personlige innstillinger, filtre etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
+msgstr "Du kan gjenopprette Evolution fra din sikkerhetskopi. Alle meldinger, kalendere, oppgaver, notater og adressebøker kan gjenopprettes. Du kan også gjenopprette alle dine personlige innstillinger, filtre etc."
 
-#: ../plugins/backup-restore/backup-restore.c:296
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "Gjenopp_rett Evolution fra sikkerhetskopi"
 
-#: ../plugins/backup-restore/backup-restore.c:303
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Velg Evolution-arkiv som skal gjenopprettes:"
 
-#: ../plugins/backup-restore/backup-restore.c:306
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Velg en fil som skal gjenopprettes"
 
@@ -14929,85 +14945,86 @@ msgstr "Start Evolution på nytt"
 msgid "With Graphical User Interface"
 msgstr "Med grafisk brukergrensesnitt"
 
-#: ../plugins/backup-restore/backup.c:187
-#: ../plugins/backup-restore/backup.c:235
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "Avslutter Evolution"
 
-#: ../plugins/backup-restore/backup.c:194
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "Sikkerhetskopiering av kontoer og innstillinger for Evolution"
 
-#: ../plugins/backup-restore/backup.c:200
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sikkerhetskopiering av data (e-post, kontakter, kalendere, oppgaver, notater)"
 
-#: ../plugins/backup-restore/backup.c:211
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "Sikkerhetskopiering fullført"
 
-#: ../plugins/backup-restore/backup.c:216
-#: ../plugins/backup-restore/backup.c:269
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "Starter Evolution på nytt"
 
-#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:244
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "Henter ut filer fra sikkerhetskopien"
 
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "Laster innstillinger for Evolution"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "Fjerner midlertidige sikkerhetskopier"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "Sikrer lokale kilder"
 
-#: ../plugins/backup-restore/backup.c:386
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sikkerhetskopierer til mappe %s"
 
-#: ../plugins/backup-restore/backup.c:391
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Gjenoppretter fra mappe %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:411
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Evolution sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup.c:411
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Evolution gjenoppretting"
 
-#: ../plugins/backup-restore/backup.c:446
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:447
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Vennligst vent mens Evolution tar sikkerhetskopi av dine data."
 
-#: ../plugins/backup-restore/backup.c:449
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "Gjenoppretter data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:450
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Vennligst vent mens Evolution gjenoppretter dine data."
 
-#: ../plugins/backup-restore/backup.c:468
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dette kan ta en stund avhengig av hvor mye data du har i din konto."
 
@@ -15018,7 +15035,8 @@ msgstr "Sikkerhetskopiering og gjenoppretting"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore your Evolution data and settings."
-msgstr "Sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution."
+msgstr ""
+"Sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -15085,35 +15103,35 @@ msgstr "Gj_enopprett innstillinger..."
 msgid "_Backup Settings..."
 msgstr "_Innstillinger for sikkerhetskopiering..."
 
-#: ../plugins/bbdb/bbdb.c:624 ../plugins/bbdb/bbdb.c:633
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:648
+#: ../plugins/bbdb/bbdb.c:646
 msgid "Create _address book entries when sending mails"
 msgstr "Opprett oppføringer i adresseboken _automatisk når du sender e-post"
 
-#: ../plugins/bbdb/bbdb.c:654
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "Velg adressebok for automatiske kontakter"
 
-#: ../plugins/bbdb/bbdb.c:669
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "Kontakter for lynmeldinger"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:690
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Velg adressebok for venneliste fra Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:701
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr "Synkroniser med _vennelisten nå"
 
@@ -15131,30 +15149,32 @@ msgid ""
 msgstr ""
 "Forenkler jobben med å vedlikeholde din adressebok.\n"
 "\n"
-"Fyller dine adressebøker med navn og e-postadresser automatisk etter hvert som du svarer på meldinger. Fyller også ut IM-kontaktinformasjon fra dine vennelister."
+"Fyller dine adressebøker med navn og e-postadresser automatisk etter hvert "
+"som du svarer på meldinger. Fyller også ut IM-kontaktinformasjon fra dine "
+"vennelister."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "En feil oppsto under start av %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Underprosess til Bogofilter svarer ikke. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Venting på underprosess til Bogofilter avbrutt. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Rør til Bogofilter feilet. Feilkode: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "Konverter tekst i meldinger til _Unicode"
 
@@ -15192,7 +15212,6 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:390
-#: ../plugins/google-account-setup/google-source.c:606
 #: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Bruk _SSL"
@@ -15201,7 +15220,7 @@ msgstr "Bruk _SSL"
 #: ../plugins/caldav/caldav-source.c:433
 #: ../plugins/calendar-http/calendar-http.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:630
+#: ../plugins/google-account-setup/google-source.c:698
 #: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "O_ppdater"
@@ -15209,7 +15228,7 @@ msgstr "O_ppdater"
 #: ../plugins/caldav/caldav-source.c:451
 #: ../plugins/calendar-http/calendar-http.c:326
 #: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../plugins/google-account-setup/google-source.c:723
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 msgid "weeks"
 msgstr "uker"
@@ -15337,23 +15356,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Vil du bruke Evolution som forvalgt e-postprogram?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:601
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "Merk som _forvalgt adressebok"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "Merk som _forvalgt kalender"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "Merk som _forvalgt oppgaveliste"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "Merk som _forvalgt notatliste"
 
@@ -15363,38 +15382,38 @@ msgstr "Forvalgte kilder"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid "Mark your preferred address book and calendar as default."
-msgstr ""
+msgstr "Merk din foretrukne adressebok og kalender som forvalgt."
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "Sikkerhet:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
 msgstr "Uklassifisert"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "Beskyttet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "Hemmelig"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "Topphemmelig"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "E_gendefinert meldingshode"
 
-#: ../plugins/email-custom-header/email-custom-header.c:907
+#: ../plugins/email-custom-header/email-custom-header.c:906
 msgid "Key"
 msgstr "Nøkkel"
 
-#: ../plugins/email-custom-header/email-custom-header.c:918
-#: ../plugins/templates/templates.c:396
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "Verdier"
 
@@ -15477,11 +15496,11 @@ msgstr ""
 "Dette valget vil la deg koble til Exchange-tjeneren med et vanlig klartekst-"
 "passord."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "Ute av kontoret"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -15489,99 +15508,99 @@ msgstr ""
 "Meldingen spesifisert under vil sendes automatisk til alle \n"
 "som sender deg e-post mens du er borte fra kontoret."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "Jeg er ute av kontoret"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "Jeg er på kontoret"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "Endre passordet for Exchange-kontoen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Endre passord"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Håndter innstillinger for delegater for en Exchange konto"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "Assistent for delegering"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "Forskjellig"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "Se størrelsen på alle Exchange-mapper"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "Mappestørrelse"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Innstillinger for Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA-URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "A_utentiser"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:778
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
 msgid "Mailbox name is _different than user name"
 msgstr "Navn på postboks er _forskjellig fra brukernavn"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:791
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "_Postboks:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1006
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "_Autentiseringstype"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1020
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
 msgid "Ch_eck for Supported Types"
 msgstr "Sj_ekk støttede typer"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1135
-#: ../plugins/exchange-operations/exchange-contacts.c:218
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1137
-#: ../plugins/exchange-operations/exchange-contacts.c:220
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
 #. FIXME: Take care of i18n
-#: ../plugins/exchange-operations/exchange-account-setup.c:1142
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
 #: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:223
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "Størrelse:"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:171
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15620,35 +15639,35 @@ msgstr "Nytt passord:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Ditt nåværende passord har utløpt. Endre passordet nå."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Passordet ditt vil utløpe i løpet av de neste %d dagene"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:565
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:170
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "Redaktør (lese, opprette, redigere)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:174
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "Forfatter (les, opprett)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "Korrekturleser (skrivebeskyttet)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:228
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "Rettigheter for delegat"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:239
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Rettigheter for %s"
@@ -15656,7 +15675,7 @@ msgstr "Rettigheter for %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:330
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -15666,66 +15685,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:335
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "Du har blitt gitt følgende rettigheter på mine mapper:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:355
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "Du kan også se mine private oppføringer."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:362
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr "Men du kan ikke se mine private oppføringer."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Du er satt opp som delegat for %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "Deleger til"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Fjern delegat %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Kunne ikke aksessere Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Kunne ikke finne meg selv i Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Kunne ikke finne delegat %s i Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Kunne ikke fjerne delegat %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Kunne ikke oppdatere liste med delegater."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Kan ikke legge til delegat %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "Feil under lesing av liste med delegater."
 
@@ -15782,7 +15801,7 @@ msgstr "_Sammendrag av rettigheter"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "_Oppgaver:"
 
@@ -15800,11 +15819,11 @@ msgid "Folder Size"
 msgstr "Mappestørrelse"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "Bruker"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:311
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Abonner på annen brukers mappe"
@@ -15813,20 +15832,20 @@ msgstr "Abonner på annen brukers mappe"
 msgid "Exchange Folder Tree"
 msgstr "Tre for Exchange-mappe"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "Fjern abonnement på mappe..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Fjerne abonnement på mappen «%s»?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Fjern abonnement på «%s»"
@@ -15891,18 +15910,18 @@ msgstr "Passordet ditt utløper om 7 dager..."
 msgid "_Change Password"
 msgstr "En_dre passord"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Tilgang nektet.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "Legg til bruker:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:936
-#: ../plugins/groupwise-features/share-folder.c:718
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "Legg til bruker"
 
@@ -16020,11 +16039,11 @@ msgstr "_Sensitivitet: "
 msgid "_User"
 msgstr "Br_uker"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "Velg bruker"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "Adressebok..."
 
@@ -16038,7 +16057,7 @@ msgstr "Abonner på annen brukers kalender"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid "Activates the Evolution-Exchange extension package."
-msgstr ""
+msgstr "Slå på utvidelsespakken Evolution-Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -16183,7 +16202,7 @@ msgid "Folder offline"
 msgstr "Mappen er frakoblet"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -16303,7 +16322,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Ukjent feil ved oppslag av {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:604
 #: ../plugins/mail-to-task/mail-to-task.c:343
 #: ../plugins/mail-to-task/mail-to-task.c:555
 msgid "Unknown error."
@@ -16411,7 +16430,9 @@ msgstr "Eksternt redigeringsprogram"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
-msgstr "Bruk et eksternt redigeringsprogram til å skrive vanlige tekst e-postmeldinger."
+msgstr ""
+"Bruk et eksternt redigeringsprogram til å skrive vanlige tekst e-"
+"postmeldinger."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
@@ -16461,8 +16482,8 @@ msgstr ""
 "Bruk «xemacs» for Emacs\n"
 "Bruk «gvim -f» for VI"
 
-#: ../plugins/external-editor/external-editor.c:308
-#: ../plugins/external-editor/external-editor.c:310
+#: ../plugins/external-editor/external-editor.c:307
+#: ../plugins/external-editor/external-editor.c:309
 msgid "Compose in External Editor"
 msgstr "Skriv i eksternt redigeringsprogram"
 
@@ -16479,7 +16500,6 @@ msgid "_Face"
 msgstr "A_nsikt"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "Attach a small picture of your face to outgoing messages.\n"
 "\n"
@@ -16487,11 +16507,11 @@ msgid ""
 "encoded and stored in ~/.evolution/faces. This will be used in subsequent "
 "sent messages."
 msgstr ""
-"Legg ved ansikts-header i utgående meldinger. Første gang må bruker "
-"konfigurere et 48*48 png-bilde. Det er base64-kodet og lagres i ~/.evolution/"
-"faces. Dette vil brukes i senere meldinger."
+"Legg ved ansikts-header i utgående meldinger.\n"
+"\n"
+"Første gang må bruker konfigurere et 48*48 png-bilde. Det er base64-kodet og lagres i ~/.evolution/faces. Dette vil brukes i senere meldinger."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Fjerner abonnement på mappe «%s»"
@@ -16503,7 +16523,7 @@ msgstr "Fjern abonnement på mapper"
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid ""
 "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
-msgstr ""
+msgstr "Fjern abonnement på IMAP-mappe ved å høyreklikke på den i mappetreet."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
@@ -16514,12 +16534,12 @@ msgstr "_Fjern abonnement"
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/google-account-setup/google-source.c:499
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Oppgi passord for %s for å aksessere liste med abonnerte kalendere."
 
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:604
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16528,11 +16548,11 @@ msgstr ""
 "Kan ikke lese data fra Google-tjener.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:674
+#: ../plugins/google-account-setup/google-source.c:739
 msgid "Cal_endar:"
 msgstr "Kal_ender:"
 
-#: ../plugins/google-account-setup/google-source.c:709
+#: ../plugins/google-account-setup/google-source.c:774
 msgid "Retrieve _list"
 msgstr "Hent _liste"
 
@@ -16549,7 +16569,7 @@ msgstr "Legg til kalendere fra Google i Evolution."
 msgid "Google Calendars"
 msgstr "Google kalendere"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "Sjekkliste"
 
@@ -16561,7 +16581,7 @@ msgstr "Legg til støtte for Novell GroupWise i Evolution."
 msgid "GroupWise Account Setup"
 msgstr "Oppsett av konto for GroupWise"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16586,11 +16606,11 @@ msgstr ""
 "Klikk «Framover» for å installere den delte mappen\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "Installer delt mappe"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "Installering av delt mappe"
 
@@ -16628,11 +16648,11 @@ msgstr "Aktiv_er"
 msgid "_Junk List"
 msgstr "_Uønsket e-postliste"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "Trekk tilbake melding"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
@@ -16640,11 +16660,11 @@ msgstr ""
 "Tilbaketrekking av en melding kan fjerne den fra en mottakers postboks. Er "
 "du sikker på at du vil gjøre dette?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "Melding kalt tilbake"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "Kall tilbake e-post"
 
@@ -16653,9 +16673,8 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "Legg til sendingsalternativer for GroupWise-meldinger"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-#, fuzzy
 msgid "Fine-tune your GroupWise accounts."
-msgstr "Tillegg for funksjoner vedrørende GroupWise-kontoer."
+msgstr "Endre innstillinger for dine GroupWise-kontoer."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
@@ -16669,12 +16688,29 @@ msgstr "Tilbakekalling av melding feilet"
 msgid "The server did not allow the selected message to be retracted."
 msgstr "Tjener tillot ikke henting av valgt melding."
 
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+"Konto &quot;{0}&quot; eksisterer allerede. Vennligst sjekk ditt mappetre."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "Kontoen eksisterer allerede"
+
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "Ugyldig bruker"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"Proxy-pålogging som &quot;{0}&quot; lykkes ikke. Vennligst sjekk e-"
+"postadresse og prøv igjen."
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
@@ -16696,23 +16732,6 @@ msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 "Du må oppgi et gyldig brukernavn som skal få rettigheter til å bruke proxy."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr ""
-"Konto &quot;{0}&quot; eksisterer allerede. Vennligst sjekk ditt mappetre."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "Kontoen eksisterer allerede"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"Proxy-pålogging som &quot;{0}&quot; lykkes ikke. Vennligst sjekk e-"
-"postadresse og prøv igjen."
-
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "Du kan ikke dele denne mappen med oppgitt bruker &quot;{0}&quot;"
@@ -16721,11 +16740,11 @@ msgstr "Du kan ikke dele denne mappen med oppgitt bruker &quot;{0}&quot;"
 msgid "You have to specify a user name which you want to add to the list"
 msgstr "Du må oppgi et brukernavn du ønsker å legge til på listen"
 
-#: ../plugins/groupwise-features/process-meeting.c:54
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "Godta tentativt"
 
-#: ../plugins/groupwise-features/process-meeting.c:322
+#: ../plugins/groupwise-features/process-meeting.c:319
 msgid "Rese_nd Meeting..."
 msgstr "Se_nd møte på nytt..."
 
@@ -16742,7 +16761,7 @@ msgid "Con_tacts..."
 msgstr "Kon_takter..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:515
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "Melding"
 
@@ -16827,7 +16846,7 @@ msgstr "Proxy-innlogging"
 
 #: ../plugins/groupwise-features/proxy-login.c:207
 #: ../plugins/groupwise-features/proxy-login.c:250
-#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/proxy.c:488
 #: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16836,26 +16855,26 @@ msgstr "%sSkriv inn passord for %s (bruker %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:512
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "_Brukernavn for proxy..."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:691
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Proxy-fanen vil kun være tilgjengelig når kontoen er tilkoblet."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proxyfanen vil kun være tilgjengelig når kontoen er aktivert."
 
-#: ../plugins/groupwise-features/send-options.c:215
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "Avanserte alternativer for sending"
 
 #: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "Brukere"
 
@@ -16867,72 +16886,72 @@ msgstr "Oppgi brukere og sett rettigheter"
 msgid "New _Shared Folder..."
 msgstr "Ny _delt mappe..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:448
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Deling"
 
-#: ../plugins/groupwise-features/share-folder.c:536
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "Egendefinert varsling"
 
-#: ../plugins/groupwise-features/share-folder.c:758
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "Legg til"
 
-#: ../plugins/groupwise-features/share-folder.c:764
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "Endre"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "Meldingsstatus"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "Emne:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "Fra:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "Dato for opprettelse:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "Levert: "
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "Åpnet: "
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "Godtatt: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "Slettet: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "Avslått: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "Fullført: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "Ikke levert: "
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "Spor status på melding..."
 
@@ -16998,7 +17017,7 @@ msgstr ""
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "Fine-tune your IMAP accounts."
-msgstr ""
+msgstr "Endre innstillinger for dine IMAP-kontoer."
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
@@ -17016,11 +17035,11 @@ msgstr ""
 "«hald»-tjenesten kreves men kjører ikke. Vennligst aktiver tjenesten og kjør "
 "dette programmet på nytt, eller kontakt din systemadministrator."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:82
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "Søk etter en iPod feilet"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:85
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 msgid ""
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
@@ -17164,13 +17183,13 @@ msgstr "Kan ikke sende informasjon om oppgave. Oppgaven eksisterer ikke"
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kan ikke sende informasjon om notat. Notatet eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1497
-#: ../plugins/itip-formatter/itip-formatter.c:1508
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1498
-#: ../plugins/itip-formatter/itip-formatter.c:1509
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17178,15 +17197,15 @@ msgstr ""
 "Meldingen påstår at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1549
-#: ../plugins/itip-formatter/itip-formatter.c:1577
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringen i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1550
-#: ../plugins/itip-formatter/itip-formatter.c:1578
-#: ../plugins/itip-formatter/itip-formatter.c:1670
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17194,11 +17213,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppføringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1590
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17206,37 +17225,37 @@ msgstr ""
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2319
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "This meeting recurs"
 msgstr "Dettee møtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2322
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2325
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2561
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2571
-#: ../plugins/itip-formatter/itip-formatter.c:2604
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "Søk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2586
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:308
+#: ../widgets/misc/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "I dag"
 
@@ -17609,101 +17628,101 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> har avlyst følgende delt notat:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:824
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "_Åpne kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Decline"
 msgstr "Av_slå"
 
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:843
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:864
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "Godt_a"
 
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "A_vslå alle"
 
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "Gjør alle _tentative"
 
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "_Tentativ"
 
-#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "Godta _alle"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:847
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "_Send informasjon"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "_Oppdater status for deltaker"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "_Oppdater"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1034
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "Start-tid:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "Slutt-tid:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1065
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1104
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "Send sva_r til avsender"
 
-#: ../plugins/itip-formatter/itip-view.c:1134
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "Send _oppdateringer til deltakere"
 
-#: ../plugins/itip-formatter/itip-view.c:1143
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "B_ruk på alle instanser"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "Vis tid som _ledig"
 
-#: ../plugins/itip-formatter/itip-view.c:1155
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "_Bevar min påminnelse"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1161
+#: ../plugins/itip-formatter/itip-view.c:1160
 msgid "_Inherit reminder"
 msgstr "Arv påm_innelse"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1914
 msgid "_Memos:"
 msgstr "_Notater:"
 
@@ -17812,20 +17831,20 @@ msgstr "Om ikonet skal blinke eller ikke."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Im nye meldinger kun skal varsles i innboksen."
 
-#: ../plugins/mail-notification/mail-notification.c:256
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "Genererer en _D-Bus-melding"
 
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "Varsling om ny e-post for Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:389
 msgid "Mail Notification Properties"
 msgstr "Egenskaper for varsling om ny e-post"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:468
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17840,55 +17859,55 @@ msgstr[1] ""
 "Du har mottatt %d nye meldinger\n"
 "i %s."
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:473
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Du har mottatt %d ny melding."
 msgstr[1] "Du har mottatt %d nye meldinger."
 
-#: ../plugins/mail-notification/mail-notification.c:501
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:490
+#: ../plugins/mail-notification/mail-notification.c:495
 msgid "New email"
 msgstr "Ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:555
 msgid "Show icon in _notification area"
 msgstr "Vis ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:558
 msgid "B_link icon in notification area"
 msgstr "B_linkende ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:560
 msgid "Popup _message together with the icon"
 msgstr "Vis _melding sammen med ikonet"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:741
 msgid "_Play sound when new messages arrive"
 msgstr "S_pill en lydfil når nye meldinger ankommer"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:759
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Play _sound file"
 msgstr "_Spill en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:770
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:772
+#: ../plugins/mail-notification/mail-notification.c:761
 msgid "Pl_ay"
 msgstr "Sp_ill"
 
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:818
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
@@ -18006,7 +18025,8 @@ msgstr "E-post_liste"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr "Utfør vanlige kommandoer for e-postlister (abbonner, fjern abonnement, ...)."
+msgstr ""
+"Utfør vanlige kommandoer for e-postlister (abbonner, fjern abonnement, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -18238,7 +18258,8 @@ msgstr "Foretrekk vanlig tekst"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr "Vis e-postmeldinger som vanlig tekst, selv om de inneholder HTML-innhold."
+msgstr ""
+"Vis e-postmeldinger som vanlig tekst, selv om de inneholder HTML-innhold."
 
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
@@ -18262,7 +18283,7 @@ msgstr "Evolution profilering"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Profile data events in Evolution (for developers only)."
-msgstr ""
+msgstr "Profiler datahendelser i Evolution (kun for utviklere)."
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -18277,21 +18298,21 @@ msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personlige mapper (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "_Address Book"
 msgstr "_Adressebok"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "A_ppointments"
 msgstr "A_vtaler"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:335
 msgid "_Journal entries"
 msgstr "_Journaloppføringer"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:350
 msgid "Importing Outlook data"
 msgstr "Importerer data fra Outlook"
 
@@ -18311,37 +18332,37 @@ msgstr "Publiser kalendere på nettet."
 msgid "_Publish Calendar Information"
 msgstr "_Publiser kalenderinformasjon"
 
-#: ../plugins/publish-calendar/publish-calendar.c:95
-#: ../plugins/publish-calendar/publish-calendar.c:329
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#: ../plugins/publish-calendar/publish-calendar.c:339
 #, c-format
 msgid "Could not open %s:"
 msgstr "Kunne ikke åpne %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:97
+#: ../plugins/publish-calendar/publish-calendar.c:99
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Kunne ikke åpne %s: Ukjent feil"
 
-#: ../plugins/publish-calendar/publish-calendar.c:117
+#: ../plugins/publish-calendar/publish-calendar.c:119
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Det oppsto en feil under publisering til %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:119
+#: ../plugins/publish-calendar/publish-calendar.c:121
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Publisering til %s fullført"
 
-#: ../plugins/publish-calendar/publish-calendar.c:160
+#: ../plugins/publish-calendar/publish-calendar.c:166
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Montering av %s feilet:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:612
+#: ../plugins/publish-calendar/publish-calendar.c:622
 msgid "Are you sure you want to remove this location?"
 msgstr "Er du sikker på at du vil fjerne denne lokasjonen?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:776
+#: ../plugins/publish-calendar/publish-calendar.c:786
 msgid "Could not create publish thread."
 msgstr "Kunne ikke opprette tråd for publisering."
 
@@ -18481,47 +18502,47 @@ msgstr "Et tillegg som laster andre tillegg skrevet i Python."
 msgid "Python Loader"
 msgstr "Python-laster"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ble ikke funnet, kode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Klarte ikke å opprette rør: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Feil etter kjøring av fork(): %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "Underprosess til SpamAssassin svarer ikke. Terminerer..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:240
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Venting på underprosess til SpamAssassin avbrutt. Terminerer..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:249
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Rør til SpamAssassin feilet. Feilkode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:512
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin er ikke tilgjengelig."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:910
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dette vil gjøre SpamAssassin mer pålitelig, men tregere"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:916
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
@@ -18541,75 +18562,75 @@ msgstr "Alternativer for SpamAssassin"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "Beskrivelsesliste"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "Liste med kategorier"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "Liste med kommentarer"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "Slutt"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "Prosent fullført"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "Deltakerliste"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "Endret"
 
-#: ../plugins/save-calendar/csv-format.c:532
+#: ../plugins/save-calendar/csv-format.c:523
 msgid "Advanced options for the CSV format"
 msgstr "Avanserte alternativer for CVS-format"
 
-#: ../plugins/save-calendar/csv-format.c:539
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "Prepend a header"
 msgstr "Legg til et hode"
 
-#: ../plugins/save-calendar/csv-format.c:548
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Value delimiter:"
 msgstr "Skilletegn for verdier:"
 
-#: ../plugins/save-calendar/csv-format.c:554
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "Record delimiter:"
 msgstr "Skilletegn for poster:"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:551
 msgid "Encapsulate values with:"
 msgstr "Pakk inn verdier med:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Comma separated value format (.csv)"
 msgstr "Kommaseparert verdiformat (.csv)"
 
@@ -18634,21 +18655,19 @@ msgstr "Lagre til di_sk"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:158
 msgid "Select destination file"
 msgstr "Velg målfil"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-#, fuzzy
 msgid "Quickly select a single calendar or task list for viewing."
-msgstr "Velg en enslig kalender eller oppkavekilde for visning."
+msgstr "Velg en enkelt kalender eller oppkaveliste for visning raskt."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-#, fuzzy
 msgid "Select One Source"
 msgstr "Velg en kilde"
 
@@ -18703,19 +18722,19 @@ msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:132
-#: ../shell/e-shell-importer.c:420
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:203
-#: ../shell/e-shell-importer.c:530
+#: ../shell/e-shell-importer.c:529
 #, c-format
 msgid "Importing data."
 msgstr "Importerer data."
 
 #: ../plugins/startup-wizard/startup-wizard.c:205
-#: ../shell/e-shell-importer.c:544
+#: ../shell/e-shell-importer.c:543
 msgid "Please wait"
 msgstr "Vennligst vent"
 
@@ -18744,15 +18763,15 @@ msgstr ""
 "Liste med nøkkelord-/verdi-par for mal-tillegg for å sette inn i en "
 "meldingskropp."
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
 msgstr "Ingen tittel"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "Lagre som _mal"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "Lagre som mal"
 
@@ -18776,27 +18795,27 @@ msgstr "vCard i e-post"
 msgid "Show vCards directly in mail messages."
 msgstr "Vis vCard-vedlegg direkte i e-postmeldinger."
 
-#: ../plugins/vcard-inline/vcard-inline.c:155
-#: ../plugins/vcard-inline/vcard-inline.c:239
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
 msgid "Show Full vCard"
 msgstr "Vis alle data i vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:158
+#: ../plugins/vcard-inline/vcard-inline.c:162
 msgid "Show Compact vCard"
 msgstr "Vis kompakt vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:218
+#: ../plugins/vcard-inline/vcard-inline.c:222
 msgid "There is one other contact."
 msgstr "Det finnes en annen kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:227
+#: ../plugins/vcard-inline/vcard-inline.c:231
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Det finnes %d annen kontakt."
 msgstr[1] "Det finnes %d andre kontakter."
 
-#: ../plugins/vcard-inline/vcard-inline.c:248
+#: ../plugins/vcard-inline/vcard-inline.c:252
 msgid "Save in Address Book"
 msgstr "Lagre i adressebok"
 
@@ -18812,11 +18831,11 @@ msgstr "WebDAV-kontakter"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:296
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Unngå IfMatch (kreves med Apache < 2.2.8)"
 
@@ -18972,7 +18991,7 @@ msgstr "Sidelinjen er synlig"
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:485
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -19151,37 +19170,37 @@ msgstr ""
 "som kunne importeres ble funnet. Hvis du vil prøve igjen\n"
 "kan du klikke på «Tilbake»-knappen.\n"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
-#: ../shell/e-shell-importer.c:301
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../shell/e-shell-importer.c:310
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: ../shell/e-shell-importer.c:358
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: ../shell/e-shell-importer.c:361
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: ../shell/e-shell-importer.c:725
+#: ../shell/e-shell-importer.c:724
 msgid "_Import"
 msgstr "_Importer"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "Evolution brukervalg"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:326
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19196,38 +19215,38 @@ msgstr ""
 msgid "Error executing %s. (%s)"
 msgstr "Feil under kjøring av %s. (%s)"
 
-#: ../shell/e-shell-window-commands.c:136
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy er ikke installert."
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:939
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: ../shell/e-shell-window-commands.c:950
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "Evolution nettsted"
 
-#: ../shell/e-shell-window-commands.c:1168
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-commands.c:1194
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: ../shell/e-shell-window.c:375
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -19235,11 +19254,11 @@ msgstr ""
 "Evolution er koblet til.\n"
 "Klikk på denne knappen for å arbeide frakoblet."
 
-#: ../shell/e-shell-window.c:382
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i ferd med å koble fra."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -19247,52 +19266,52 @@ msgstr ""
 "Evolution er frakoblet.\n"
 "Klikk på denne knappen for å arbeide tilkoblet."
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: ../shell/e-shell.c:639
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "Ukjent systemfeil."
 
-#: ../shell/e-shell.c:837 ../shell/e-shell.c:838
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1260 ../widgets/misc/e-cell-date-edit.c:324
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1262
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: ../shell/e-shell.c:1264
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "Ny test"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "_Test"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "Opprett en ny testoppføring"
 
@@ -19335,7 +19354,7 @@ msgstr ""
 "eksterne filer til Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19370,7 +19389,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19378,43 +19397,43 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:490
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: ../shell/main.c:494
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvungen ommigrering fra Evolution 1.4"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:501
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:588
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
 
-#: ../shell/main.c:616
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19573,7 +19592,7 @@ msgstr ""
 "\n"
 "Rediger innstillinger for tillit:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19583,7 +19602,7 @@ msgstr ""
 "stoler du også på at dette sertifikatet er autentisk med mindre annet "
 "indikeres her"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19621,7 +19640,7 @@ msgid "Purposes"
 msgstr "Hensikter"
 
 #: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "Serienummer"
 
@@ -19739,7 +19758,7 @@ msgstr ""
 "Før du stoler på denne CAen for noe formål bør du undersøke sertifikatet og "
 "dets regelsett og prosedyrer (hvis tilgjengelig)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "Sertifikat"
 
@@ -19815,11 +19834,11 @@ msgstr "Organisasjonsenhet (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtrykk"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL-klientsertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL-tjenersertifikat"
 
@@ -19866,7 +19885,7 @@ msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:653
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "Sertifikatet eksisterer allerede"
 
@@ -19875,161 +19894,161 @@ msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "Signer"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "Krypter"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "Versjon"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "Versjon 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "Versjon 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "Versjon 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "Bruksområde for sertifikatnøkkel"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Netscape sertifikattype"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Nøkkelidentifikator for sertifikatmyndighet"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifikator (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "Algoritmeidentifikator"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "Parametere for algoritme"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "Informasjon om subjektets offentlige nøkkel"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritme for subjektets offentlige nøkkel"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "Subjektets offentlige nøkkel"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "Feil: Kan ikke prosessere utvidelse"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Signeringspart for objekt"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL-sertifikatmyndighet"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "Sertifikatmyndighet for e-post"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "Signering"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "Ikke-benekting"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "Nøkkelchiffer"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "Datachiffer"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "Nøkkelavtale"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "Sertifikatsignerer"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL-signerer"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "Ikke-kritisk"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "Utvidelser"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Signeringsalgoritme for sertifikat"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "Utsteder"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "Unik ID for utsteder"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "Unik ID for subjekt"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "Signaturverdi for sertifikat"
 
@@ -20177,7 +20196,7 @@ msgstr "Lagre valgte kontakter som et VCard"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Lagre kontakter i valgt mappe som VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2725
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "Velg alle"
 
@@ -20311,7 +20330,7 @@ msgid "Month"
 msgstr "Måned"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Neste"
 
@@ -20320,7 +20339,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Forhåndsviser av kalenderen som skal skrives ut"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
-#: ../widgets/misc/e-calendar.c:171
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Forrige"
 
@@ -21423,11 +21442,11 @@ msgid "With _Status"
 msgstr "Med _status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:426
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:777
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:421
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:423
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:425
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:764
 msgid "UTC"
 msgstr "UTC"
 
@@ -21484,11 +21503,11 @@ msgstr "Definer visninger for «%s»"
 msgid "Table"
 msgstr "Tabell"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "Instans"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "Lagre aktiv visning"
 
@@ -21501,17 +21520,17 @@ msgid "_Replace existing view"
 msgstr "E_rstatt eksisterende visning"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "Lagre egendefinert visning"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "Definer visninger..."
 
@@ -21519,24 +21538,24 @@ msgstr "Definer visninger..."
 msgid "C_urrent View"
 msgstr "A_ktiv visning"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "Velg visning: %s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "Aktiv visning er en egendefinert visning"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "Lagre aktiv egendefinert visning"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "Opprett eller rediger visninger"
 
@@ -21565,16 +21584,16 @@ msgid "Attached message"
 msgstr "Vedlagt melding"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1723 ../widgets/misc/e-attachment.c:2274
+#: ../widgets/misc/e-attachment.c:1723 ../widgets/misc/e-attachment.c:2261
 #: ../widgets/misc/e-attachment-store.c:636
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
-#: ../widgets/misc/e-attachment.c:1770 ../widgets/misc/e-attachment.c:2580
+#: ../widgets/misc/e-attachment.c:1770 ../widgets/misc/e-attachment.c:2567
 msgid "A load operation is already in progress"
 msgstr "En lasteoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1778 ../widgets/misc/e-attachment.c:2588
+#: ../widgets/misc/e-attachment.c:1778 ../widgets/misc/e-attachment.c:2575
 msgid "A save operation is already in progress"
 msgstr "En lagreoperasjon er allerede i gang"
 
@@ -21588,26 +21607,26 @@ msgstr "Kunne ikke laste «%s»"
 msgid "Could not load the attachment"
 msgstr "Kunne ikke laste vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2151
+#: ../widgets/misc/e-attachment.c:2138
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunne ikke åpne «%s»"
 
-#: ../widgets/misc/e-attachment.c:2154
+#: ../widgets/misc/e-attachment.c:2141
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Kunne ikke åpne vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2596
+#: ../widgets/misc/e-attachment.c:2583
 msgid "Attachment contents not loaded"
 msgstr "Vedleggets innhold ble ikke lastet"
 
-#: ../widgets/misc/e-attachment.c:2673
+#: ../widgets/misc/e-attachment.c:2660
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Kunne ikke lagre «%s»"
 
-#: ../widgets/misc/e-attachment.c:2676
+#: ../widgets/misc/e-attachment.c:2663
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Kunne ikke lagre vedlegget"
@@ -21652,12 +21671,12 @@ msgstr "Laster"
 msgid "Saving"
 msgstr "Lagrer"
 
-#: ../widgets/misc/e-attachment-paned.c:80
+#: ../widgets/misc/e-attachment-paned.c:81
 msgid "Hide _Attachment Bar"
 msgstr "Skjul ve_dleggsfelt"
 
-#: ../widgets/misc/e-attachment-paned.c:82
-#: ../widgets/misc/e-attachment-paned.c:618
+#: ../widgets/misc/e-attachment-paned.c:83
+#: ../widgets/misc/e-attachment-paned.c:620
 msgid "Show _Attachment Bar"
 msgstr "Vis ve_dleggsfelt"
 
@@ -21694,32 +21713,32 @@ msgid "Open this attachment in %s"
 msgstr "Åpne dette vedlegget i %s"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "Månedskalender"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3645
-#: ../widgets/text/e-text.c:3646
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "Fyllfarge"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3652
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3660
-#: ../widgets/text/e-text.c:3661
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "Fyllfarge for GDK"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3667
-#: ../widgets/text/e-text.c:3668
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "Fyll stiplet"
 
@@ -21743,17 +21762,17 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1416
-#: ../widgets/table/e-table-group-container.c:1003
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Minste bredde"
 
-#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:1004
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Minste bredde"
 
@@ -21761,198 +21780,198 @@ msgstr "Minste bredde"
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: ../widgets/misc/e-cell-date-edit.c:300
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "Nå"
 
-#: ../widgets/misc/e-cell-date-edit.c:865
+#: ../widgets/misc/e-cell-date-edit.c:846
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen må skrives inn på formatet: %s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Central European"
 msgstr "Sentral-europeisk"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Thai"
 msgstr "Thai"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Vest-europeisk"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Western European, New"
 msgstr "Vest-europeisk, ny"
 
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "Tradisjonell"
 
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
 #: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Forenklet"
 
-#: ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../widgets/misc/e-charset-picker.c:101
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr "Synlig"
 
-#: ../widgets/misc/e-charset-picker.c:170
+#: ../widgets/misc/e-charset-picker.c:172
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukjent tegnsett: %s"
 
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-picker.c:217
 msgid "Character Encoding"
 msgstr "Tegnkoding"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-picker.c:232
 msgid "Enter the character set to use"
 msgstr "Skriv inn tegnsett som skal brukes"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-picker.c:339
 msgid "Other..."
 msgstr "Andre..."
 
-#: ../widgets/misc/e-charset-picker.c:599
+#: ../widgets/misc/e-charset-picker.c:601
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../widgets/misc/e-dateedit.c:302
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "Dato og klokkeslett"
 
-#: ../widgets/misc/e-dateedit.c:323
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "Tekstfelt for å oppgi dato"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "Klikk på denne knappen for å vise en kalender"
 
-#: ../widgets/misc/e-dateedit.c:387
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "Kombinasjonsboks med nedtrekksmeny for å velge tid"
 
-#: ../widgets/misc/e-dateedit.c:463
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "N_å"
 
-#: ../widgets/misc/e-dateedit.c:469
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "I _dag"
 
-#: ../widgets/misc/e-dateedit.c:1634
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "Ugyldig datoverdi"
 
-#: ../widgets/misc/e-dateedit.c:1665
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "Ugyldig verdi for tid"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:742
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "Lagre søk"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "_Søk"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "Søk"
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_Lagre søk..."
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede søk..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "_Avansert søk..."
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "Denne mappen"
 
-#: ../widgets/misc/e-image-chooser.c:168
+#: ../widgets/misc/e-image-chooser.c:166
 msgid "Choose Image"
 msgstr "Velg et bilde"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Verdenskart"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21968,84 +21987,85 @@ msgstr "Tilkoblet"
 msgid "The button state is online"
 msgstr "Knappetilstanden er tilkoblet"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "Synkroniser med:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "Synkroniser private oppføringer:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "Synkroniser kategorier:"
 
-#: ../widgets/misc/e-reflow.c:1438 ../widgets/misc/e-reflow.c:1439
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "Tom e-post"
 
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "Oppdater modell"
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "Kolonnebredde"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:475
-#: ../widgets/misc/e-search-bar.c:477
+#: ../widgets/misc/e-search-bar.c:94 ../widgets/misc/e-search-bar.c:361
+#: ../widgets/misc/e-search-bar.c:505 ../widgets/misc/e-search-bar.c:507
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Search"
 msgstr "Søk"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:475
-#: ../widgets/misc/e-search-bar.c:477
+#: ../widgets/misc/e-search-bar.c:361 ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:507
 msgid "Click here to change the search type"
 msgstr "Klikk her for å endre søketype"
 
-#: ../widgets/misc/e-search-bar.c:608
+#: ../widgets/misc/e-search-bar.c:639
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:645
 msgid "_Find Now"
 msgstr "_Finn nå "
 
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:646
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../widgets/misc/e-search-bar.c:870
+#: ../widgets/misc/e-search-bar.c:901
 msgid "Item ID"
 msgstr "ID for oppføring"
 
-#: ../widgets/misc/e-search-bar.c:877 ../widgets/text/e-text.c:3567
-#: ../widgets/text/e-text.c:3568
+#: ../widgets/misc/e-search-bar.c:908 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "Tekst"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1055
 msgid "Sho_w: "
 msgstr "_Vis: "
 
-#: ../widgets/misc/e-search-bar.c:1032
+#: ../widgets/misc/e-search-bar.c:1074
 msgid "Sear_ch: "
 msgstr "Sø_k: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1048
+#: ../widgets/misc/e-search-bar.c:1090
 msgid " i_n "
 msgstr " _i "
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "Markørrad"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "Markørkolonne"
 
@@ -22061,7 +22081,7 @@ msgstr "Utvalgsmodus"
 msgid "Cursor Mode"
 msgstr "Markørmodus"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "Når s_lettet:"
 
@@ -22195,23 +22215,23 @@ msgid "_When opened:"
 msgstr "_Ved åpning:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "Klikk her for å vise URL"
 
-#: ../widgets/table/e-cell-combo.c:173
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "oppsprettliste"
 
@@ -22231,23 +22251,23 @@ msgstr "Kolonne med fokus"
 msgid "Unselected Column"
 msgstr "Ikke-valgt kolonne"
 
-#: ../widgets/table/e-cell-text.c:1800
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "Uthev kolonne"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "Understrek kolonne"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "Fet kolonne"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "Farget kolonne"
 
-#: ../widgets/table/e-cell-text.c:1835
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "Kolonne for bakgrunnsfarge"
 
@@ -22271,12 +22291,12 @@ msgstr "Ikke sortert"
 msgid "No grouping"
 msgstr "Ingen gruppering"
 
-#: ../widgets/table/e-table-config.c:644
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Vis felter"
 
-#: ../widgets/table/e-table-config.c:665
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "Tilgjengelige felt"
 
@@ -22285,7 +22305,7 @@ msgid "A_vailable Fields:"
 msgstr "T_ilgjengelige felter:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1581
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "Stigende"
 
@@ -22298,7 +22318,7 @@ msgid "Clear _All"
 msgstr "Fjern _alt"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1581
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "Synkende"
 
@@ -22374,164 +22394,164 @@ msgstr ""
 "For å legge til en kolonne i din tabell kan\n"
 "du dra den til lokasjonen du vil ha den."
 
-#: ../widgets/table/e-table-group-container.c:343
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d oppføring)"
 msgstr[1] "%s : %s (%d oppføringer)"
 
-#: ../widgets/table/e-table-group-container.c:349
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d oppføring)"
 msgstr[1] "%s (%d oppføringer)"
 
-#: ../widgets/table/e-table-group-container.c:926
-#: ../widgets/table/e-table-group-container.c:927
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Skiftende farger på rader"
 
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-container.c:934
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Horisontalt rutenett for tegning"
 
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-container.c:941
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Vertikalt rutenett for tegning"
 
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-container.c:948
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "Tegn fokus"
 
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-container.c:955
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Markørmodus"
 
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-container.c:962
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Utvalgsmodell"
 
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-container.c:969
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3336
-#: ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "Lengdeterskel"
 
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-container.c:976
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3368
-#: ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "Enhetlig høyde på rad"
 
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-container.c:983
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Frosset"
 
-#: ../widgets/table/e-table-header-item.c:1451
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "Sorter s_tigende"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "Sorter s_ynkende"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "_Fjern sortering"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "Grupper etter dette _feltet"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "Grupper etter _boks"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "Fjern denne _kolonnen"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "Legg til en k_olonne..."
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "_Justering"
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "B_este tilpasning"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "For_mater kolonner..."
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "T_ilpass aktiv visning..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "_Sorter etter"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1559
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "E_gendefinert"
 
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Tabellhode"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Modell for tabell"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Pekerrad"
 
@@ -22539,12 +22559,12 @@ msgstr "Pekerrad"
 msgid "Sort Info"
 msgstr "Sorteringsinformasjon"
 
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3375
-#: ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Alltid søk"
 
-#: ../widgets/table/e-table.c:3345
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "Bruk klikk for å legge til"
 
@@ -22553,127 +22573,127 @@ msgstr "Bruk klikk for å legge til"
 msgid "Tree"
 msgstr "Tre"
 
-#: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree tabelladapter"
 
-#: ../widgets/table/e-tree.c:3382
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "Gammeldags utseende"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "Tegn linjer og +/- utvidere."
 
-#: ../widgets/table/e-tree.c:3389
+#: ../widgets/table/e-tree.c:3386
 msgid "Expander Size"
 msgstr "Størrelse på utvider"
 
-#: ../widgets/table/e-tree.c:3390
+#: ../widgets/table/e-tree.c:3387
 msgid "Size of the expander arrow"
 msgstr "Størrelse på utviderpilen"
 
-#: ../widgets/text/e-text.c:2737
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "Inndatametoder"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "Hendelsesprosessor"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Fet"
 
-#: ../widgets/text/e-text.c:3581 ../widgets/text/e-text.c:3582
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "Uthevet"
 
-#: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "Anker"
 
-#: ../widgets/text/e-text.c:3596 ../widgets/text/e-text.c:3597
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "Justering"
 
-#: ../widgets/text/e-text.c:3603 ../widgets/text/e-text.c:3604
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "Bredde på utklipp"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "Høyde på utklipp"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "Utklipp"
 
-#: ../widgets/text/e-text.c:3624 ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "Fyll utklippsrektangel"
 
-#: ../widgets/text/e-text.c:3631 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X-avstand"
 
-#: ../widgets/text/e-text.c:3638 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y-avstand"
 
-#: ../widgets/text/e-text.c:3674 ../widgets/text/e-text.c:3675
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "Tekstbredde"
 
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Teksthøyde"
 
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "Bruk ellipse"
 
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "Ellipse"
 
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "Linjebryting"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "Brytingstegn"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "Maks antall linjer"
 
-#: ../widgets/text/e-text.c:3746 ../widgets/text/e-text.c:3747
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "Tegn kanter"
 
-#: ../widgets/text/e-text.c:3753 ../widgets/text/e-text.c:3754
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "Tillat linjeskift"
 
-#: ../widgets/text/e-text.c:3760 ../widgets/text/e-text.c:3761
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "Tegn bakgrunn"
 
-#: ../widgets/text/e-text.c:3767 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "Tegn knapp"
 
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "Markørposisjon"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3782 ../widgets/text/e-text.c:3784
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "IM-kontekst"
 
-#: ../widgets/text/e-text.c:3790 ../widgets/text/e-text.c:3791
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "Håndter sprettopp"
author	Kjartan Maraas <kmaraas@gnome.org>	2009-07-20 17:59:36 +0800
committer	Kjartan Maraas <kmaraas@gnome.org>	2009-08-03 17:15:31 +0800
commit	329452e040dfa546b9427588a2411eb71db6ad38 (patch)
tree	9796087ecf1c811cac23b3f1e36fdb5aa134a914 /po/nb.po
parent	faab01f3e359896d4786041c106678a120830504 (diff)
download	gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar.gz gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar.bz2 gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar.lz gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar.xz gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.tar.zst gsoc2013-evolution-329452e040dfa546b9427588a2411eb71db6ad38.zip