Updated Norwegian bokmål translation.

2008-09-30  Kjartan Maraas  <kmaraas@gnome.org>

	* nb.po: Updated Norwegian bokmål translation.

svn path=/trunk/; revision=36504

1 files changed, 713 insertions, 636 deletions

diff --git a/po/nb.po b/po/nb.po
index 14f2ebb9d8..0ab40288f8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.23.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 17:00+0200\n"
-"PO-Revision-Date: 2008-09-21 17:04+0200\n"
+"POT-Creation-Date: 2008-09-30 16:56+0200\n"
+"PO-Revision-Date: 2008-09-30 19:17+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"
@@ -163,7 +163,7 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
 #: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1583
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1583
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -195,7 +195,7 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
 #: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1599
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1599
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
@@ -266,19 +266,19 @@ msgstr "vend"
 msgid "toggle the cell"
 msgstr "vend cellen"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "utvid"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "utvider raden i ETree som inneholder denne cellen"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "slå sammen"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "slår sammen raden i ETree som inneholder denne cellen"
 
@@ -413,7 +413,7 @@ msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1735
 msgid "Failed to delete contact"
 msgstr "Klarte ikke å slette kontakt"
 
@@ -426,6 +426,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:50
 msgid "Server Version"
 msgstr "Versjon av tjener"
 
@@ -594,9 +595,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:1326
+#: ../addressbook/gui/component/addressbook-view.c:1325
 #: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Kontakter"
@@ -643,7 +644,7 @@ msgstr "Håndter dine S/MIME-sertifikater her"
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
 #: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
 #: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/message-list.c:1518
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
@@ -654,7 +655,7 @@ msgstr "På denne datamaskinen"
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:151
 #: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
 #: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
@@ -726,13 +727,13 @@ msgstr "Kopier innholdet i adresse_boken lokalt for frakoblet operasjon"
 #: ../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:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../plugins/itip-formatter/itip-formatter.c:2372
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Generelt"
 
 #: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Adressebok"
@@ -826,32 +827,32 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:501
+#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappen «%s» til:"
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Gi nytt navn på mappe"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:509
+#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet «/»"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:941
 msgid "_New Address Book"
 msgstr "_Ny adressebok"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "Save As vCard..."
 msgstr "Lagre som vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
 #: ../calendar/gui/calendar-component.c:619
 #: ../calendar/gui/e-calendar-table.c:1595
 #: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:940
@@ -863,16 +864,16 @@ msgstr "Lagre som vCard..."
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
+#: ../addressbook/gui/component/addressbook-view.c:948
 #: ../calendar/gui/calendar-component.c:622
 #: ../calendar/gui/dialogs/comp-editor.c:2035
 #: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1044 ../mail/em-folder-tree.c:2120
+#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "Egenska_per..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1336
 msgid "Contact Source Selector"
 msgstr "Valg av kontaktkilde"
 
@@ -920,30 +921,40 @@ msgstr ""
 "forhåndsvisningsfeltet, i piksler."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Vis forhåndsvisningsområdet"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
 "Antall tegn som må skrives før Evolution forsøker automatisk fullføring."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for sist brukt mappe i dialogen for å velge navn"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for sist brukt mappe i dialogen for å velge navn."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Posisjon til vertikalt felt"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Om forhåndsvisningsområdet skal vises."
 
@@ -1141,10 +1152,9 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr ""
-"Dette er fullt navn på din LDAP-tjener. For eksempel «ldap.mittfirma.no»."
+msgstr "Dette er hele navnet på din LDAP-tjener. For eksempel «ldap.mittfirma.no»."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
@@ -1155,9 +1165,10 @@ msgstr ""
 "dette tallet for høyt vil adresseboken bli treg."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
 "Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
@@ -1211,7 +1222,7 @@ msgstr "Metode for på_logging:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1226,7 +1237,7 @@ msgid "_Search scope:"
 msgstr "_Søkeområde:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "Tj_ener:"
@@ -1291,7 +1302,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Arbeid</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1303,16 +1314,16 @@ msgid "Ca_tegories..."
 msgstr "Kate_gorier..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
 #: ../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:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../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:2421
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1339,132 +1350,136 @@ msgstr "_Kallenavn:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Telefon"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Bryllupsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Fødselsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:791
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_By:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "F_irma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "Av_deling:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Lagre under:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Ledig/opptatt:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Hjemmeside:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Leder:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Notater:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "K_ontor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Yrke:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Ektefelle:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Videoprat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Ønsker å motta HTML-formatert e-post"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Weblogg:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
@@ -1477,16 +1492,16 @@ msgstr "Adresse"
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3687
 #: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Redigerbar"
@@ -2476,7 +2491,7 @@ msgid "AOL Instant Messenger"
 msgstr "AOL øyeblikksmeldinger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2490,7 +2505,7 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2512,77 +2527,77 @@ msgid "Username"
 msgstr "Brukernavn"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Hjemme"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Andre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Source Book"
 msgstr "Kildebok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Target Book"
 msgstr "Målbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Required Fields"
 msgstr "Obligatoriske felt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Endret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2590,43 +2605,43 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
 msgid "_Full name"
 msgstr "_Fullt navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
 msgid "_Select Address Book"
 msgstr "_Velg adressebok"
 
@@ -2804,9 +2819,9 @@ msgid "_Members"
 msgstr "_Medlemmer"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2873,14 +2888,14 @@ msgid "Email"
 msgstr "E-post"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
@@ -2888,26 +2903,26 @@ msgstr "E-post begynner med"
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Ingen kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Spør"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
@@ -2924,15 +2939,15 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Name begins with"
 msgstr "Navn begynner med"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Kilde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
@@ -2940,12 +2955,12 @@ msgstr "Kilde"
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1954
 msgid "Save as vCard..."
 msgstr "Lagre som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 #: ../calendar/gui/dialogs/comp-editor.c:2033
 #: ../calendar/gui/e-calendar-table.c:1573
 #: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
@@ -2953,74 +2968,74 @@ msgstr "Lagre som vCard..."
 msgid "_Open"
 msgstr "_Åpne"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Ny kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Ny kontakt_liste..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "Lagre _som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Videresend kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Videresend kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Send _melding til kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Send _melding til liste"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Send _melding til kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "_Skriv ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "_Kopier til adressebok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "_Flytt til adressebok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 #: ../calendar/gui/dialogs/comp-editor.c:480
 #: ../calendar/gui/e-calendar-table.c:1581
 #: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2055 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
+#: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2106
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "_Lim inn"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1525
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Any Category"
 msgstr "Enhver kategori"
 
@@ -3198,7 +3213,7 @@ msgstr "Nettside"
 #: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
@@ -3387,7 +3402,7 @@ msgstr "Videosamtale"
 #: ../calendar/gui/calendar-commands.c:92
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../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
@@ -3446,56 +3461,56 @@ msgid "Blog"
 msgstr "Weblogg"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Suksess"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Motor opptatt"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Frakoblet lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "Egen kontaktinformasjon er ikke definert"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Kontakt ikke funnet"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID eksisterer allerede"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:364
@@ -3506,53 +3521,53 @@ msgid "Canceled"
 msgstr "Avbrutt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Kunne ikke avbryte"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 #: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgjengelig"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Ingen slik kilde"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "Ikke tilgjengelig i frakoblet modus"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "Annen feil"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Ugyldig versjon av tjener"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "Autentiseringsmetoden er ikke støttet"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this address book. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3562,7 +3577,7 @@ msgstr ""
 "for frakoblet bruk eller at den ikke er lastet ned enda. Last adresseboken i "
 "tilkoblet tilstand for å laste ned innholdet"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
 "We were unable to open this address book.  Please check that the path %s "
@@ -3571,7 +3586,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien %s eksisterer "
 "og at du har rettigheter til å aksessere den."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:127
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the LDAP server is unreachable."
@@ -3579,7 +3594,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at LDAP-tjeneren ikke kan nås."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3589,7 +3604,7 @@ msgstr ""
 "ønsker å bruke LDAP i Evolution må du installere en pakke som har denne "
 "støtten."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the server is unreachable."
@@ -3597,11 +3612,11 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at tjeneren ikke kan nås."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "Detailed error:"
 msgstr "Detaljert feil:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3613,7 +3628,7 @@ msgstr ""
 "Gjør søket ditt mer nøyaktig eller hev grensen på resultater i\n"
 "brukervalgene til mappetjeneren for denne adresseboken."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this address book.  Please make your search\n"
@@ -3625,45 +3640,45 @@ msgstr ""
 "nøyaktig eller hev tidsgrensen i brukervalgene til mappetjeneren\n"
 "for denne adresseboken."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "The backend for this address book was unable to parse this query."
 msgstr "Motoren for denne adresseboken forsto ikke denne spørringen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "The backend for this address book refused to perform this query."
 msgstr "Motoren for denne adresseboken nektet å utføre denne spørringen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:190
 msgid "This query did not complete successfully."
 msgstr "Denne spørringen ble ikke fullført."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 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:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:688
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying contact"
 msgstr "Feil under endring av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
 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:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:638
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3678,16 +3693,16 @@ msgstr[1] ""
 "Åpning av %d kontakter vil medføre at %d nye vinduer vil\n"
 "vises på skjermen. Vil du virkelig vise alle disse kontaktene?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "_Don't Display"
 msgstr "Ikke _vis"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:326
 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:352
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3696,65 +3711,65 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:356
 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:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:400
 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:446
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Select Address Book"
 msgstr "Velg adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:749
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:900
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 msgid "Multiple vCards"
 msgstr "Flere vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:907
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard for %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:919
-#: ../addressbook/gui/widgets/eab-gui-util.c:945
+#: ../addressbook/gui/widgets/eab-gui-util.c:921
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformasjon"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#: ../addressbook/gui/widgets/eab-gui-util.c:949
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformasjon for %s"
@@ -3763,23 +3778,23 @@ msgstr "Kontaktinformasjon for %s"
 msgid "Querying Address Book..."
 msgstr "Kjører spørring i adressebok..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Det finnes en annen kontakt."
 msgstr[1] "Det finnes %d andre kontakter."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "Vis alle data i vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Vis kompakt vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Lagre i adressebok"
 
@@ -3791,7 +3806,7 @@ msgstr "Kortvisning"
 #: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importerer..."
 
@@ -4214,19 +4229,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Er du sikker på at du vil slette denne avtalen?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Er du sikker på at du vil slette dette møtet?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Er du sikker på at du vil slette dette notatet?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven?"
@@ -4330,6 +4345,18 @@ msgstr ""
 "at oppgaven er slettet."
 
 #: ../calendar/calendar.error.xml.h:45
+msgid "Save Appointment"
+msgstr "Lagre avtale"
+
+#: ../calendar/calendar.error.xml.h:46
+msgid "Save Memo"
+msgstr "Lagre notat"
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "Save Task"
+msgstr "Lagre oppgave"
+
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4337,7 +4364,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine kalendere "
 "oppdatert."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4345,7 +4372,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine "
 "oppgavelister oppdatert."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4353,7 +4380,7 @@ msgstr ""
 "Noen vedlegg blir lastet ned. Avtalen vil bli lagret uten disse vedleggene "
 "hvis den blir lagret nå."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4361,83 +4388,83 @@ msgstr ""
 "Noen vedlegg blir lastet ned. Oppgaven vil bli lagret uten disse vedleggene "
 "hvis den blir lagret nå."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid "Some features may not work properly with your current server."
 msgstr "Noen funksjoner vil kanskje ikke fungere med denne tjeneren."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution-notater har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-oppgaver har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenderen er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "The memo list is not marked for offline usage."
 msgstr "Notatlisten er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "The task list is not marked for offline usage."
 msgstr "Oppgavelisten er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "This memo list will be removed permanently."
 msgstr "Denne notatlisten vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgavelisten vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vil du lagre dine endringer i denne avtalen?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Vil du lagre dine endringer i dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Vil du lagre dine endringer i denne oppgaven?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Vil du sende en avlysingsmelding for dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Vil du sende en avlysningsmelding til alle deltakere?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vil du sende møteinvitasjoner til deltakerene?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Vil du sende denne oppgaven til deltakere?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vil du sende oppdatert møteinformasjon til alle deltakere?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4447,57 +4474,57 @@ msgstr ""
 "muligens støte på problemer. Tjeneren bør oppgraderes til en støttet versjon "
 "for å unngå problemer."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Du har endret denne avtalen, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Du har endret denne oppgaven, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Du har endret dette notatet, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenderene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Notatene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Oppgavene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Lagre endringer"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:82
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Send"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Send melding"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:84
 msgid "{0}."
 msgstr "{0}."
 
@@ -4544,7 +4571,7 @@ 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:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2363
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
@@ -4606,7 +4633,7 @@ msgstr "Notater"
 #: ../calendar/gui/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:588
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
@@ -4671,7 +4698,7 @@ msgstr "Utsett-_tid:"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/comp-editor.c:1332
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:169
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
@@ -4764,7 +4791,7 @@ msgid "invalid time"
 msgstr "ugyldig tid"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -4773,7 +4800,7 @@ msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -4784,7 +4811,7 @@ msgstr[1] "%d minutter"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -5217,56 +5244,56 @@ msgstr "Hvilket minutt arbeidsdagen starter"
 msgid "daylight savings time"
 msgstr "daylight savings time"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Kategorien er"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "Lokasjon inneholder"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
+#: ../calendar/gui/cal-search-bar.c:633 ../calendar/gui/cal-search-bar.c:676
+#: ../calendar/gui/cal-search-bar.c:695
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Next 7 Days' Tasks"
 msgstr "Oppgaver for de neste 7 dagene"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Active Tasks"
 msgstr "Aktive oppgaver"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Overdue Tasks"
 msgstr "Utgåtte oppgaver"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Completed Tasks"
 msgstr "Fullførte oppgaver"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:657
 msgid "Tasks with Attachments"
 msgstr "Oppgaver med vedlegg"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Active Appointments"
 msgstr "Aktive avtaler"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:707
 msgid "Next 7 Days' Appointments"
 msgstr "Avtaler for de neste 7 dagene"
 
@@ -5421,7 +5448,7 @@ msgid "Any Field"
 msgstr "Ethvert felt"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
 msgid "Attachments"
 msgstr "Vedlegg"
 
@@ -5470,12 +5497,12 @@ msgid "Description Contains"
 msgstr "Beskrivelse inneholder"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:38
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:41
 msgid "Exist"
 msgstr "Eksisterer"
 
@@ -5566,7 +5593,7 @@ msgstr "Gjeninntreffelse"
 #: ../calendar/gui/e-meeting-list-view.c:545
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+#: ../mail/em-filter-i18n.h:86 ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Status"
 
@@ -5610,22 +5637,22 @@ msgid "Waiting"
 msgstr "Venter"
 
 #: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:26
 msgid "contains"
 msgstr "inneholder"
 
 #: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:32
 msgid "does not contain"
 msgstr "inneholder ikke"
 
 #: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:46
 msgid "is"
 msgstr "er"
 
 #: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:52
 msgid "is not"
 msgstr "er ikke"
 
@@ -5678,17 +5705,17 @@ msgid "Mes_sage:"
 msgstr "Be_skjed:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Vis varsling"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Kjør et program"
 
@@ -5701,7 +5728,7 @@ msgid "Send To:"
 msgstr "Send til:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Send en melding"
 
@@ -5779,7 +5806,7 @@ msgstr "Fore_slå automatisk visning av vedlegg"
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendere valgt for varsel"
 
@@ -6157,22 +6184,22 @@ msgstr "Vedlagt melding - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1769
-#: ../composer/e-msg-composer.c:1988
+#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1766
+#: ../composer/e-msg-composer.c:1985
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt melding"
 msgstr[1] "%d vedlagte meldinger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2053
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2058
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2055
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
@@ -6386,8 +6413,8 @@ msgid "Show Attachment _Bar"
 msgstr "Vis ve_dleggsfelt"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1043
+#: ../calendar/gui/dialogs/event-page.c:1875
+#: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
@@ -6395,7 +6422,7 @@ msgid "_Remove"
 msgstr "Fje_rn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1046
+#: ../composer/e-msg-composer.c:1043
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Legg til vedlegg..."
@@ -6433,7 +6460,7 @@ msgstr "Kunne ikke åpne destinasjon"
 msgid "Destination is read only"
 msgstr "Destinasjonen er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Slett denne oppføringen fra andre mottakere's postbokser?"
 
@@ -6553,113 +6580,113 @@ msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
 msgid "Appoint_ment"
 msgstr "Av_tale"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:735
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:798
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:844
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:846
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1033
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1202
+#: ../calendar/gui/dialogs/memo-page.c:640
+#: ../calendar/gui/dialogs/task-page.c:812
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1405
+#: ../calendar/gui/dialogs/memo-page.c:681
+#: ../calendar/gui/dialogs/task-page.c:872
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1411
+#: ../calendar/gui/dialogs/memo-page.c:687
+#: ../calendar/gui/dialogs/task-page.c:878
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1436
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198
 msgid "_Add "
 msgstr "_Legg til"
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:1797
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer på vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2918
 #, 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:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, 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:2926
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, 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:2939
+#: ../calendar/gui/dialogs/event-page.c:2943
 msgid "Customize"
 msgstr "Tilpass"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
+#: ../calendar/gui/dialogs/event-page.c:2948
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
@@ -6667,7 +6694,7 @@ msgstr "Tilpass"
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:2021
 #: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
@@ -6755,15 +6782,15 @@ msgstr "Organisator:"
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:851
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åpne notater i «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Til"
 
@@ -6777,7 +6804,7 @@ msgid "T_o:"
 msgstr "T_il:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:364
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -7023,7 +7050,7 @@ msgstr "Fullført"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
 #: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "High"
 msgstr "Høy"
 
@@ -7040,14 +7067,14 @@ msgstr "Under arbeid"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
 #: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../mail/message-list.c:1064
 msgid "Low"
 msgstr "Lav"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
 #: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1065
 msgid "Normal"
 msgstr "Normal"
 
@@ -7108,16 +7135,16 @@ msgstr "_Oppgave"
 msgid "Task Details"
 msgstr "Oppgavedetaljer"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:372
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:785
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1754
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
@@ -7139,7 +7166,7 @@ msgid "Time zone:"
 msgstr "Tids_sone:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7147,69 +7174,69 @@ msgstr[0] "%d dag"
 msgstr[1] "%d dager"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d uke"
 msgstr[1] "%d uker"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utføres"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s før avtalen starter"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:479
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s etter avtalen har startet"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved avtalens start"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:497
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s før avtalen slutter"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s etter avtalens slutt"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:509
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved avtalens slutt"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:533
+#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:541
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
@@ -7672,7 +7699,7 @@ msgstr "%02i minutters oppdeling"
 #. 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:852 ../calendar/gui/e-day-view.c:1566
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1566
 #: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -8956,11 +8983,11 @@ msgstr "Avbrutt"
 msgid "In progress"
 msgstr "Under arbeid"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:50
 msgid "is greater than"
 msgstr "er større enn"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:51
 msgid "is less than"
 msgstr "er mindre enn"
 
@@ -10813,18 +10840,18 @@ 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:180 ../composer/e-msg-composer.c:1556
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1553
 msgid "Show _Attachment Bar"
 msgstr "Vis ve_dleggsfelt"
 
-#: ../composer/e-msg-composer.c:870
+#: ../composer/e-msg-composer.c:867
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:877
+#: ../composer/e-msg-composer.c:874
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10832,7 +10859,7 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1498 ../mail/em-format-html-display.c:1919
+#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
 #: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
@@ -10840,15 +10867,15 @@ msgid_plural "Attachments"
 msgstr[0] "Vedlegg"
 msgstr[1] "Vedlegg"
 
-#: ../composer/e-msg-composer.c:1554
+#: ../composer/e-msg-composer.c:1551
 msgid "Hide _Attachment Bar"
 msgstr "Skjul ve_dleggsfelt"
 
-#: ../composer/e-msg-composer.c:1571 ../composer/e-msg-composer.c:2778
+#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2775
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4053
+#: ../composer/e-msg-composer.c:4050
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10939,8 +10966,9 @@ msgstr ""
 "meldingen vil la deg fortsette der du slapp."
 
 #: ../composer/mail-composer.error.xml.h:17
+#, fuzzy
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
 "Alternativer for sending er kun tilgjengelig for Novell GroupWise og "
@@ -11051,11 +11079,11 @@ msgstr "Evolution spørring"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Intern feil, ukjent feil «%s» forespurt"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Komponent"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "Navn på komponenten som logges"
 
@@ -11111,7 +11139,7 @@ msgstr "Overskriv fil?"
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:96
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
@@ -11172,119 +11200,119 @@ msgstr "GConf-feil: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Alle videre feil blir kun vist på konsollet."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekund i fremtiden"
 msgstr[1] "%d sekunder i fremtiden"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "om 1 minutt"
 msgstr[1] "om %d minutter"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 time siden"
 msgstr[1] "%d timer siden"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "om 1 time"
 msgstr[1] "om %d timer"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag siden"
 msgstr[1] "%d dager siden"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "om 1 dag"
 msgstr[1] "om %d dager"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 uke siden"
 msgstr[1] "%d uker siden"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 uke i fremtiden"
 msgstr[1] "%d uker i fremtiden"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "om 1 måned"
 msgstr[1] "om %d måneder"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år siden"
 msgstr[1] "%d år siden"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "Om 1 år"
 msgstr[1] "Om %d år"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "nå"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
@@ -11446,7 +11474,7 @@ msgstr "i fremtiden"
 msgid "months"
 msgstr "måneder"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:197
 msgid "seconds"
 msgstr " sekunder"
 
@@ -11605,7 +11633,7 @@ msgstr "Se etter _nye meldinger hver(t)"
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
@@ -11693,48 +11721,64 @@ msgstr "-----Opprinnelig melding-----"
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
+#.
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:18
 msgid "Adjust Score"
 msgstr "Juster poeng"
 
-#: ../mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:19
 msgid "Assign Color"
 msgstr "Tilegn farge"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:20
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:22
 msgid "BCC"
 msgstr "Bcc"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:23
 msgid "Beep"
 msgstr "Pip"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:24
 msgid "CC"
 msgstr "Cc"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:25
 msgid "Completed On"
 msgstr "Fullført"
 
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/em-filter-i18n.h:27
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:28
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:29
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:30
 #: ../plugins/groupwise-features/share-folder.c:768
 #: ../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
@@ -11742,202 +11786,202 @@ msgstr "Dato sendt"
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:31
 msgid "Deleted"
 msgstr "Slettet"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:33
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:34
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:35
 msgid "does not return"
 msgstr "returnerer ikke"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:36
 msgid "does not sound like"
 msgstr "ligner ikke"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:37
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:39
 msgid "Draft"
 msgstr "Skisse"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:40
 msgid "ends with"
 msgstr "slutter med"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:42
 msgid "exists"
 msgstr "eksisterer"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:43
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:44
 msgid "Follow Up"
 msgstr "Følg opp"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Viktig"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:47
 msgid "is after"
 msgstr "er etter"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:48
 msgid "is before"
 msgstr "er før"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:49
 msgid "is Flagged"
 msgstr "er merket"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:53
 msgid "is not Flagged"
 msgstr "er ikke merket"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:54
 msgid "is not set"
 msgstr "er ikke satt"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:55
 msgid "is set"
 msgstr "er satt"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Uønsket e-post"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:57
 msgid "Junk Test"
 msgstr "Uønsket e-posttest"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Etikett"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:59
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:60
 msgid "Match All"
 msgstr "Treff på alle"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:61
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:62
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:63
 msgid "Message is Junk"
 msgstr "Uønsket e-post"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:64
 msgid "Message is not Junk"
 msgstr "Ikke uønsket e-post"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:65
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:66
 msgid "Pipe to Program"
 msgstr "Send til program"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:67
 msgid "Play Sound"
 msgstr "Spill lyd"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Les"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:71
 msgid "Regex Match"
 msgstr "Treff på vanlig uttrykk"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:72
 msgid "Replied to"
 msgstr "Svart til"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:73
 msgid "returns"
 msgstr "returnerer"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:74
 msgid "returns greater than"
 msgstr "returnerer større enn"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:75
 msgid "returns less than"
 msgstr "returnerer mindre enn"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:76
 msgid "Run Program"
 msgstr "Kjør program"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Gi poeng"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Avsender"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:79
 msgid "Set Label"
 msgstr "Sett etikett"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:80
 msgid "Set Status"
 msgstr "Sett status"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:81
 msgid "Size (kB)"
 msgstr "Størrelse (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:82
 msgid "sounds like"
 msgstr "lyder som"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:83
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:84
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:85
 msgid "starts with"
 msgstr "starter med"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:87
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
+#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
 #: ../plugins/groupwise-features/properties.glade.h:7
@@ -11945,7 +11989,7 @@ msgstr "Stopp behandling"
 msgid "Subject"
 msgstr "Emne"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:89
 msgid "Unset Status"
 msgstr "Nullstill status"
 
@@ -12035,7 +12079,7 @@ msgstr "Bruk av kvote"
 #: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
 #: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:159
 #: ../mail/mail-component.c:580
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Innboks"
@@ -12119,12 +12163,12 @@ msgstr "Flytter mappe %s"
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2015
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2017
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
@@ -12190,19 +12234,19 @@ msgstr "Velg mappe"
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: ../mail/em-folder-utils.c:743
+#: ../mail/em-folder-utils.c:690
 #: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: ../mail/em-folder-utils.c:743
+#: ../mail/em-folder-utils.c:690
 #: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
@@ -12878,7 +12922,7 @@ msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
 
 #: ../mail/em-migrate.c:2898
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
@@ -12939,7 +12983,7 @@ msgstr "Ingen tjener er valgt"
 
 #. Check buttons
 #: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
 
@@ -12986,7 +13030,7 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Bredde på «Send & motta e-post»-vindu"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+msgid "Allows Evolution to display text part of limited size"
 msgstr "Lar evolution vise tekstdel av begrenset størrelse"
 
 #: ../mail/evolution-mail.schemas.in.h:5
@@ -13268,10 +13312,11 @@ msgstr ""
 "vertikalt hvis det er aktivt."
 
 #: ../mail/evolution-mail.schemas.in.h:61
+#, fuzzy
 msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
 msgstr "Hvis det ikke finnes et innebygd program v"
 
 #: ../mail/evolution-mail.schemas.in.h:62
@@ -13334,14 +13379,18 @@ msgid "List of Labels and their associated colors"
 msgstr "Liste over etiketter og deres assosierte farger"
 
 #: ../mail/evolution-mail.schemas.in.h:72
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "Liste over MIME-typer som skal se etter bonobo-komponentvisere"
+
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accepted licenses"
 msgstr "Liste med godtatte lisenser"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of accounts"
 msgstr "Liste med kontoer"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13350,15 +13399,15 @@ msgstr ""
 "innholder strenger som er undermapper relativt til /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste over tillpassede topptekster og om de er slått på."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13367,21 +13416,18 @@ msgstr ""
 "inneholder strenger som inneholder «name:color» hvor «color» bruker HTML hex "
 "koding."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "Liste over mime-typer som skal se etter bonobo-komponentvisere"
-
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste over protokollnavn som har en godkjent lisens."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
-msgstr "Last bilder for HTML-meldinger og http"
+msgid "Load images for HTML messages over HTTP"
+msgstr "Last bilder for HTML-meldinger og HTTP"
 
 #: ../mail/evolution-mail.schemas.in.h:81
+#, fuzzy
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
@@ -13635,9 +13681,10 @@ msgstr ""
 "feilsøkingsmeldinger."
 
 #: ../mail/evolution-mail.schemas.in.h:141
+#, fuzzy
 msgid ""
 "This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "Bestemmer maksimal størrelse for tekstdelen som kan formatteres i evolution. "
 "Forvalg er 4MB / 4096 KB og oppgis i KB."
@@ -13868,16 +13915,16 @@ msgstr "Berkeley Mailbox (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer mapper i Berkeley Mailbox format"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer «%s»"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
@@ -14056,7 +14103,7 @@ msgstr "Loggnivå"
 msgid "Time"
 msgstr "Tid"
 
-#: ../mail/mail-component.c:1820 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1820 ../mail/message-list.c:2516
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
@@ -14541,66 +14588,74 @@ msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
 #: ../mail/mail-config.glade.h:132
+msgid "Select Drafts Folder"
+msgstr "Velg mappe for skisser"
+
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
 #: ../mail/mail-config.glade.h:137
+msgid "Select Sent Folder"
+msgstr "Velg Sendt-mappe"
+
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Tabell med signaturer"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "S_tart skriving under meldingen ved svar"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14608,7 +14663,7 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.glade.h:149
+#: ../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"
@@ -14618,7 +14673,7 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14626,26 +14681,26 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:156
 msgid "Us_ername:"
 msgstr "Bruk_ernavn:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:157
 msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:284
 #: ../plugins/google-account-setup/google-source.c:625
 #: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14655,124 +14710,124 @@ msgstr ""
 "\n"
 "Klikk «Framover» for å begynne. "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:164
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:165
 msgid "_Automatic proxy configuration URL:"
 msgstr "URL for _automatisk konfigurasjon av proxy:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:166
 msgid "_Default junk plugin:"
 msgstr "_Forvalgt tillegg for uønsket e-post:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:167
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte tilkobling til internett"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:168
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:170
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:171
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Behold signaturen over opprinnelig melding ved svar"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
 msgid "_Load images in messages from contacts"
 msgstr "_Last bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 msgid "_Lookup in local address book only"
 msgstr "S_lå kun opp i lokale adressebokmapper"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell konfigurasjon av proxy:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
 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:179
+#: ../mail/mail-config.glade.h:181
 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:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:185
 msgid "_Select..."
 msgstr "_Velg..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:188
 msgid "_Show image animations"
 msgstr "Vi_s animasjoner"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:189
 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:188
+#: ../mail/mail-config.glade.h:190
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Slå sammen Til/Cc/Bcc-hoder til "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:191
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:192
 msgid "_Use system defaults"
 msgstr "Br_uk systemets forvalg"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:193
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "beskrivelse"
 
@@ -14872,7 +14927,7 @@ msgstr "_Flagg:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:833
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -14965,58 +15020,58 @@ msgstr "Åpner lager %s"
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1530
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1593
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1648
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1688 ../mail/mail-ops.c:1738
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1735
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1736
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1817
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1924
 #, 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:1980
+#: ../mail/mail-ops.c:2009
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2087
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15025,11 +15080,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2159
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2177 ../mail/mail-ops.c:2185
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15038,27 +15093,27 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2200
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2346
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2346
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2442
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto «%s» for frakoblet bruk"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2528
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
@@ -15779,79 +15834,79 @@ msgstr "T_øm"
 msgid "_Open Messages"
 msgstr "_Åpne meldinger"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1058
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1063
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1068
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1657 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1664 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1673 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1685 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1695 ../widgets/table/e-cell-date.c:102
 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:3916 ../mail/message-list.c:4376
+#: ../mail/message-list.c:3978 ../mail/message-list.c:4438
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4286
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15859,7 +15914,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:4226
+#: ../mail/message-list.c:4288
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -15892,6 +15947,10 @@ msgstr "Sendte meldinger"
 msgid "Size"
 msgstr "Størrelse"
 
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "Forkortet emne"
+
 #: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Ring"
@@ -15980,7 +16039,7 @@ msgstr ""
 "Liste med hint om ting å se etter i meldingskroppen for tillegg for "
 "påminnelse om vedlegg."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
 #: ../plugins/templates/templates.c:392
 msgid "Keywords"
 msgstr "Nøkkelord"
@@ -16016,7 +16075,7 @@ msgstr "R_ediger melding"
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 "Et formatteringstillegg som viser lydfiler i meldinger lar deg spille dem av "
 "direkte fra Evolution."
@@ -16245,35 +16304,35 @@ msgstr "Gj_enopprett innstillinger..."
 msgid "_Backup Settings..."
 msgstr "_Innstillinger for sikkerhetskopiering..."
 
-#: ../plugins/bbdb/bbdb.c:532 ../plugins/bbdb/bbdb.c:541
+#: ../plugins/bbdb/bbdb.c:530 ../plugins/bbdb/bbdb.c:539
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:556
+#: ../plugins/bbdb/bbdb.c:554
 msgid "_Auto-create address book entries when replying to messages"
 msgstr "Opprett oppføringer i adresseboken _automatisk når du svarer på e-post"
 
-#: ../plugins/bbdb/bbdb.c:562
+#: ../plugins/bbdb/bbdb.c:560
 msgid "Select Address book for Automatic Contacts"
 msgstr "Velg adressebok for automatiske kontakter"
 
-#: ../plugins/bbdb/bbdb.c:577
+#: ../plugins/bbdb/bbdb.c:575
 msgid "Instant Messaging Contacts"
 msgstr "Kontakter for lynmeldinger"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:592
+#: ../plugins/bbdb/bbdb.c:590
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:598
+#: ../plugins/bbdb/bbdb.c:596
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Velg adressebok for venneliste fra Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:607
 msgid "Synchronize with _buddy list now"
 msgstr "Synkroniser med _vennelisten nå"
 
@@ -16743,32 +16802,32 @@ msgstr "Ditt nåværende passord har utløpt. Endre passordet nå."
 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:152
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Redaktør (lese, opprette, redigere)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Forfatter (les, opprett)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Korrekturleser (skrivebeskyttet)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Rettigheter for delegat"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
@@ -16777,7 +16836,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:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 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."
@@ -16787,25 +16846,25 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 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:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 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:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 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:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Du er satt opp som delegat for %s"
@@ -17639,7 +17698,7 @@ msgid "<b>Server</b>"
 msgstr "<b>Tjener</b> "
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "Et tillegg for å sette opp kalenderressurser og kontakter fra Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17651,11 +17710,11 @@ msgid "Checklist"
 msgstr "Sjekkliste"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
-msgstr "Et tillegg for å sette opp kalenderressurser i Groupwise."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
+msgstr "Et tillegg for å sette opp kalenderressurser i GroupWise."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+msgid "GroupWise Account Setup"
 msgstr "Oppsett av konto for GroupWise"
 
 #: ../plugins/groupwise-features/install-shared.c:220
@@ -17746,15 +17805,15 @@ msgid "Retract Mail"
 msgstr "Kall tilbake e-post"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
+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
-msgid "A plugin for the features in Groupwise accounts."
+msgid "A plugin for the features in GroupWise accounts."
 msgstr "Tillegg for funksjoner vedrørende GroupWise-kontoer."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+msgid "GroupWise Features"
 msgstr "Funksjoner for GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17810,20 +17869,24 @@ msgstr ""
 msgid "This is a recurring meeting"
 msgstr "Dette er et repeterende møte"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "Vil du godta den?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "Vil du avslå den?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#, fuzzy
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "Du kan ikke dele en mappe med oppgitt bruker &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+#, fuzzy
+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:52
@@ -18344,17 +18407,17 @@ msgstr "Dette notatet gjeninntreffer"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2388
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2398
+#: ../plugins/itip-formatter/itip-formatter.c:2430
 msgid "Conflict Search"
 msgstr "Søk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2413
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
@@ -19398,7 +19461,8 @@ msgid "_Publish Calendar Information"
 msgstr "_Publiser kalenderinformasjon"
 
 #: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
+#, fuzzy
+msgid "Are you sure you want to remove this location?"
 msgstr "Er du sikker på at du vil fjerne denne URLen?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19436,8 +19500,9 @@ msgid "Publishing _Frequency:"
 msgstr "Publiserings_frekvens<"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
+#, fuzzy
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19502,58 +19567,59 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Testtillegg for Python EPlugin laster."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+#, fuzzy
+msgid "A plugin which loads other plugins written using Python."
 msgstr "Et tillegg som laster andre tillegg skrevet i Python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Python-laster"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "Spamassassin (innebygget)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ble ikke funnet, kode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Klarte ikke å opprette rør: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Feil etter kjøring av fork(): %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, 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:246
-#, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#, fuzzy, 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:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, 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:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin er ikke tilgjengelig."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 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:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
@@ -19566,12 +19632,13 @@ msgstr ""
 "Spamassassin er installert."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin-tillegg for uønsket e-post"
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "Alternativer for Spamassassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Alternativer for Spamassassin"
+msgid "SpamAssassin junk plugin"
+msgstr "SpamAssassin-tillegg for uønsket e-post"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19830,7 +19897,8 @@ msgid "Drafts based template plugin"
 msgstr "Tillegg for å lage maler av skisser"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
+#, fuzzy
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr "Et enkelt tillegg som buker ytnef til å dekode tnef-vedlegg."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -19856,7 +19924,8 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+#, fuzzy
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Unngå IfMatch (kreves på apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -20152,7 +20221,9 @@ msgstr "Velg type importerer som skal kjøres:"
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
-msgstr "Velg filen du ønsker å importere til Evolution og velg hvilken type fil det er fra listen."
+msgstr ""
+"Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
+"er fra listen."
 
 #: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
@@ -20447,18 +20518,23 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Er du sikker på at du vil glemme alle lagrede passord?"
 
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Start Evolution på nytt"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Fortsett"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Slett gamle data fra versjon {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution kan ikke starte."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20466,15 +20542,15 @@ msgstr ""
 "Glemming av passord tømmer alle passord som huskes av programmet. Du vil bli "
 "spurt igjen neste gang de kreves."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Ikke nok diskplass for oppgraderingen."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Vil du virkelig slette gamle data?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20496,9 +20572,10 @@ msgstr ""
 "Når disse er slettet kan du ikke nedgradere til forrige versjon av Evolution "
 "uten å gjøre manuelle inngrep.\n"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
 "evolution&quot; directory will be removed permanently. If you choose to keep "
@@ -20512,11 +20589,11 @@ msgstr ""
 "dataene vil du kunne fjerne innholdet i &quot;evolution&quot; manuelt når du "
 "ønsker det.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Oppgradering fra forrige versjon feilet: {0}"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20529,7 +20606,7 @@ msgstr ""
 "\n"
 "Du må gjøre mer plass tilgjengelig i din hjemmekatalog før du kan fortsette."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20539,7 +20616,7 @@ msgstr ""
 "\n"
 "Klikk på hjelp for detaljer"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20553,19 +20630,19 @@ msgstr ""
 "\n"
 "Klikk på «hjelp» for detaljer."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Glem"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Behold data"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Vis påminnelse senere"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -23236,23 +23313,23 @@ msgstr "Kolonne med fokus"
 msgid "Unselected Column"
 msgstr "Ikke-valgt kolonne"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Uthev kolonne"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Understrek kolonne"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Fet kolonne"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Farget kolonne"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Kolonne for bakgrunnsfarge"