Updated Norwegian translation. Updated with missing files.

2001-08-17  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian translation.
	* POTFILES.in: Updated with missing files.

svn path=/trunk/; revision=12148

3 files changed, 696 insertions, 571 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 23f20d4ab7..304c298b22 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-17  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+	* POTFILES.in: Updated with missing files.
+	
 2001-08-16  Andras Timar <timar@gnome.hu>
 
         * hu.po: Updated Hungarian translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 08054282c8..458995e6b2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,7 @@ addressbook/backend/ebook/test-client-list.c
 addressbook/backend/ebook/test-client.c
 addressbook/conduit/address-conduit.c
 addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+addressbook/gui/component/addressbook-component.c
 addressbook/gui/component/addressbook-config.c
 addressbook/gui/component/addressbook-config.glade
 addressbook/gui/component/addressbook-factory.c
@@ -56,6 +57,7 @@ calendar/gui/calendar-commands.c
 calendar/gui/calendar-model.c
 calendar/gui/calendar-view-factory.c
 calendar/gui/cal-search-bar.c
+calendar/gui/component-factory.c
 calendar/gui/control-factory.c
 calendar/gui/dialogs/alarm-options.c
 calendar/gui/dialogs/alarm-options.glade
@@ -68,8 +70,6 @@ calendar/gui/dialogs/comp-editor-util.c
 calendar/gui/dialogs/comp-editor.c
 calendar/gui/dialogs/delete-comp.c
 calendar/gui/dialogs/e-delegate-dialog.glade
-calendar/gui/dialogs/e-timezone-dialog.c
-calendar/gui/dialogs/e-timezone-dialog.glade
 calendar/gui/dialogs/event-editor.c
 calendar/gui/dialogs/event-page.glade
 calendar/gui/dialogs/meeting-page.c
@@ -261,6 +261,7 @@ shell/e-shell-folder-selection-dialog.c
 shell/e-shell-folder-title-bar.c
 shell/e-shell-importer.c
 shell/e-shell-offline-handler.c
+shell/e-shell-startup-wizard.c
 shell/e-shell-view-menu.c
 shell/e-shell-view.c
 shell/e-shell.c
@@ -298,6 +299,8 @@ views/addressbook/galview.xml
 views/calendar/galview.xml
 views/mail/galview.xml
 views/tasks/galview.xml
+widgets/e-timezone-dialog/e-timezone-dialog.c
+widgets/e-timezone-dialog/e-timezone-dialog.glade
 widgets/meeting-time-sel/e-meeting-time-sel-item.c
 widgets/meeting-time-sel/e-meeting-time-sel.c
 widgets/menus/gal-view-menus.c
diff --git a/po/no.po b/po/no.po
index 5550c36ced..cf931c9835 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets 1.4.1\n"
-"POT-Creation-Date: 2001-08-14 21:58+0200\n"
-"PO-Revision-Date: 2001-08-14 21:59+0200\n"
+"POT-Creation-Date: 2001-08-17 09:47+0200\n"
+"PO-Revision-Date: 2001-08-17 09:51+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -397,6 +397,23 @@ msgstr "Factory for Evolution adressebok-komponent."
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory for eksempelkontroll for adressebok"
 
+#: addressbook/gui/component/addressbook-component.c:385
+#: ui/evolution-addressbook.xml.h:11
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:385
+msgid "New _Contact"
+msgstr "Ny _kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:386
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:386
+msgid "New Contact _List"
+msgstr "Ny kontakt_liste"
+
 #: addressbook/gui/component/addressbook-config.c:144
 msgid "Edit Addressbook"
 msgstr "Rediger adressebok"
@@ -414,51 +431,55 @@ msgid "Add Addressbook"
 msgstr "Legg til adressebok"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "Adressebok-kilder"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
 msgid "Advanced"
 msgstr "Avansert"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "Base"
 msgstr "Basis"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:7
 #: calendar/gui/dialogs/task-editor.c:151
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:8
 msgid "De_lete"
 msgstr "S_lett"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.glade.h:9
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
+#: addressbook/gui/component/addressbook-config.glade.h:10
 msgid "Search _base:"
 msgstr "Søke_basis:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "Search s_cope: "
 msgstr "Sø_keområde:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:12
 msgid "Server Name"
 msgstr "Tjenernavn:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/addressbook-config.glade.h:13
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "The information below is required in order to add an addressbook.  "
 msgstr "Informasjonen under kreves for å legge til en adressebok."
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/addressbook-config.glade.h:15
 msgid "This information is not required for most ldap servers. "
 msgstr "Denne informasjonen kreves ikke for de fleste ldap-tjenere."
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
@@ -466,7 +487,7 @@ msgstr ""
 "Denne informasjonen brukes av din ldap-tjener for å spesifisere hvilke noder "
 "som brukes i et søk. Kontakt din administrator for mer informasjon."
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:17
 msgid ""
 "This is the base node for all your searches on the ldap server. Contact your "
 "server administrator for more information."
@@ -474,15 +495,15 @@ msgstr ""
 "Dette er basisnoden for alle dine søk på ldap-tjeneren. Kontakt din "
 "administrator for mer informasjon."
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
+#: addressbook/gui/component/addressbook-config.glade.h:18
 msgid "This is the name of the server where your addressbook is located."
 msgstr "Dette er navnet på tjeneren hvor din adressebok er lokalisert."
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/addressbook-config.glade.h:19
 msgid "This is the port that your ldap server uses."
 msgstr "Dette er porten som din ldap-tjener bruker."
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/addressbook-config.glade.h:20
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
@@ -490,11 +511,11 @@ msgstr ""
 "Dette navnet vil brukes til å indentifisere din konto. Det brukes kun for "
 "visning på skjermen."
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "_Account name:"
 msgstr "Konton_avn:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
+#: addressbook/gui/component/addressbook-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:89
@@ -502,27 +523,27 @@ msgstr "Konton_avn:"
 msgid "_Add"
 msgstr "_Legg til"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/component/addressbook-config.glade.h:23
 #: mail/mail-config.glade.h:94 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:37
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
+#: addressbook/gui/component/addressbook-config.glade.h:24
 msgid "_My server requires authentication"
 msgstr "_Min tjener krever autentisering"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:25
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/addressbook-config.glade.h:26
 msgid "_Server name:"
 msgstr "_Tjenernavn:"
 
-#: addressbook/gui/component/addressbook-storage.c:135
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
@@ -577,37 +598,37 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien\n"
 "eksisterer og at du har rettigheter til å aksessere den."
 
-#: addressbook/gui/component/addressbook.c:638
+#: addressbook/gui/component/addressbook.c:628
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:639
+#: addressbook/gui/component/addressbook.c:629
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:640
+#: addressbook/gui/component/addressbook.c:630
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:641
+#: addressbook/gui/component/addressbook.c:631
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:642 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:632 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avansert..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:810
+#: addressbook/gui/component/addressbook.c:821
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:848
+#: addressbook/gui/component/addressbook.c:859
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -780,7 +801,6 @@ msgid "File A_s:"
 msgstr "Lagre _som:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "General"
 msgstr "Generelt"
 
@@ -828,9 +848,9 @@ msgstr "_Kontakter..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1472 mail/folder-browser.c:1319
+#: calendar/gui/dialogs/meeting-page.c:1476 mail/folder-browser.c:1319
 #: mail/mail-config.glade.h:93 ui/evolution-mail-message.xml.h:88
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:36
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -1200,7 +1220,7 @@ msgstr ""
 "eksisterer allerede i denne mappen. Vil du legge til likevel?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:242
+#: widgets/misc/e-filter-bar.c:243
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
@@ -1322,7 +1342,7 @@ msgstr "z"
 #: addressbook/gui/widgets/e-addressbook-view.c:610
 #: addressbook/gui/widgets/e-addressbook-view.c:672
 #: addressbook/gui/widgets/e-addressbook-view.c:1286
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
@@ -1333,7 +1353,6 @@ msgstr "Åpne"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:673
-#: ui/evolution-addressbook.xml.h:25
 msgid "Send contact to other"
 msgstr "Send kontakt til andre"
 
@@ -1345,7 +1364,7 @@ msgstr "Send melding til kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
 #: addressbook/gui/widgets/e-addressbook-view.c:675
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
 #: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
 msgid "Print"
@@ -1358,7 +1377,7 @@ msgstr "Skriv ut konvolutt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
 #: addressbook/gui/widgets/e-addressbook-view.c:679 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:280
+#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:283
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
@@ -1377,7 +1396,7 @@ msgid "Success"
 msgstr "Suksess"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1620
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1653
 #: shell/e-storage.c:503
 msgid "Unknown error"
 msgstr "Ukjent feil"
@@ -2089,14 +2108,13 @@ msgid "Undefined"
 msgstr "Udefinert"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
 #: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1416
-#: mail/mail-accounts.c:142 mail/mail-accounts.c:387
-#: mail/mail-config.glade.h:48 shell/e-shell-view.c:1386
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:437
-#: widgets/misc/e-dateedit.c:1356 widgets/misc/e-dateedit.c:1471
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:390
+#: mail/mail-config.glade.h:48 shell/e-shell-view.c:1415
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
 msgid "None"
 msgstr "Ingen"
 
@@ -2110,13 +2128,13 @@ msgstr "Tildelt"
 
 #: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
 #: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1279
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1280
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "Nei"
 
@@ -2152,6 +2170,22 @@ msgstr "Kommentar inneholder"
 msgid "Unmatched"
 msgstr "Ingen treff"
 
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:6
+msgid "Create a new appointment"
+msgstr "Opprett en ny avtale"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+msgid "New _Appointment"
+msgstr "Ny _avtale"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-tasks.xml.h:4
+msgid "Create a new task"
+msgstr "Opprett en ny oppgave"
+
+#: calendar/gui/component-factory.c:409
+msgid "New _Task"
+msgstr "Ny _oppgave"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
@@ -2220,95 +2254,95 @@ msgstr "timer"
 msgid "minutes"
 msgstr "minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr "%d dager"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr "%d uker"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr "1 uke"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr "%d timer"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr "1 time"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr "%d  sekunder"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Vis en melding"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Send en melding"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Kjør et program"
 
-#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
 #: calendar/gui/dialogs/meeting-page.c:601
 #: calendar/gui/dialogs/meeting-page.c:636
 #: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1251
-#: calendar/gui/dialogs/meeting-page.c:1267
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
 #: camel/providers/smtp/camel-smtp-transport.c:224
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:409
 msgid "before start of appointment"
 msgstr "før avtalen starter"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 msgid "after start of appointment"
 msgstr "etter avtalens start"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 msgid "before end of appointment"
 msgstr "før avtalens slutt"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 msgid "after end of appointment"
 msgstr "etter avtalens slutt"
 
@@ -2374,161 +2408,192 @@ msgid "10 minutes"
 msgstr "10 minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 timer (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 timer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Calendar Preferences"
-msgstr "Brukervalg for kalender"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "Calendar and Tasks Settings"
+msgstr "Innstillinger for kalender og oppgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Color for overdue tasks"
 msgstr "Farge for utgåtte oppgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for tasks due today"
 msgstr "Farge for oppgaver som går ut idag"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Create new appointments with a default _reminder"
+msgstr "Opp_rett en ny avtale med standard påminnelse"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Days"
+msgstr "Dager"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Compress weekends in month view"
-msgstr "Komprimer helger i månedsvisning"
+msgid "First day of wee_k:"
+msgstr "Første dag i u_ken:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:26
-msgid "Display"
-msgstr "Vis"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "Fredag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "End of day:"
-msgstr "Dagen slutter:"
+msgid "Hours"
+msgstr "Timer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "First day of week:"
-msgstr "Første dag i uken:"
+msgid "Minutes"
+msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Fri"
-msgstr "Fre"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Mandag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "Fredag"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "Lørdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Show appointment _end times in week and month views"
+msgstr "Vis tid for avtal_ers slutt i ukes- og månedsvisning"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Mon"
-msgstr "Man"
+msgid "Show week _numbers in date navigator"
+msgstr "Vis uke_nummer i datonavigasjon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "Mandag"
+msgid "Sta_rt of day:"
+msgstr "Dagen sta_rter:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Overdue tasks:"
-msgstr "Utgåtte oppgaver:"
+msgid "Su_n"
+msgstr "Sø_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Sat"
-msgstr "Lør"
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Søndag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "Lørdag"
+msgid "T_hu"
+msgstr "T_or"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Show appointment end times in week and month views"
-msgstr "Vis tid for avtalers slutt i ukes- og månedsvisning"
+msgid "T_ue"
+msgstr "T_ir"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Show week numbers in date navigator"
-msgstr "Vis ukenummer i datonavigasjon"
+msgid "Tas_ks due today:"
+msgstr "Opp_gaver som går ut idag:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Start of day:"
-msgstr "Dagen starter:"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "Torsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Sun"
-msgstr "Søn"
+msgid "Time"
+msgstr "Tid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "Søndag"
+msgid "Time _zone:"
+msgstr "Tids_sone:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Task List"
-msgstr "Oppgaveliste"
+msgid "Time di_visions:"
+msgstr "Oppdeling a_v tid:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Tasks due today:"
-msgstr "Oppgaver som går ut idag:"
+msgid "Time format:"
+msgstr "Tidformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Thu"
-msgstr "Tor"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "Tirsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "Torsdag"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "Onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Time"
-msgstr "Tid"
+#: ui/evolution-calendar.xml.h:30
+msgid "Work Week"
+msgstr "Arbeidsuke"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Time divisions:"
-msgstr "Oppdeling av tid:"
+msgid "_12 hour (AM/PM)"
+msgstr "_12 timer (AM/PM)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Time format:"
-msgstr "Tidformat:"
+msgid "_24 hour"
+msgstr "_24 timer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Time zone:"
-msgstr "Tidssone:"
+msgid "_Ask for confirmation when deleting items"
+msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Tue"
-msgstr "Tir"
+msgid "_Compress weekends in month view"
+msgstr "_Komprimer helger i månedsvisning"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "Tirsdag"
+msgid "_Display"
+msgstr "_Vis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Wed"
-msgstr "Ons"
+msgid "_End of day:"
+msgstr "Dag_en slutter:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "Onsdag"
+msgid "_Fri"
+msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: ui/evolution-calendar.xml.h:30
-msgid "Work Week"
-msgstr "Arbeidsuke"
+msgid "_General"
+msgstr "_Generell"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "_Mon"
+msgstr "_Man"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "_Other"
+msgstr "_Andre"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "_Overdue tasks:"
+msgstr "Utgåtte _oppgaver:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+msgid "_Sat"
+msgstr "L_ør"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+msgid "_Task List"
+msgstr "O_ppgaveliste"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "_Wed"
+msgstr "_Ons"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "before the start of the appointment"
+msgstr "før avtalen starter"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2592,26 +2657,32 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:154 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:158 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:160 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Ferdig "
 
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:174
+#: shell/e-shortcuts.c:1026
+msgid "Contacts"
+msgstr "Kontakter"
+
 #: calendar/gui/dialogs/comp-editor.c:454
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
@@ -2635,13 +2706,13 @@ msgstr "Journaloppføring - %s"
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:843 mail/mail-callbacks.c:1485
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:849 mail/mail-callbacks.c:1486
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:847 mail/mail-callbacks.c:1491
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:853 mail/mail-callbacks.c:1492
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2649,12 +2720,12 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: calendar/gui/dialogs/comp-editor.c:910 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:916 ui/evolution-comp-editor.xml.h:15
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1063
+#: calendar/gui/dialogs/comp-editor.c:1069
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versjonsdata!"
 
@@ -2712,28 +2783,6 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
-msgstr "Velg en tidssone"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-msgid "Selection:"
-msgstr "Utvalg:"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Tidssoner"
-
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-" Use the right mouse button to zoom out."
-msgstr ""
-"Bruk venstre musknapp til å zoome inn på et område av kartet og velg en "
-"tidssone.\n"
-"Bru høyre musknapp til å zoome ut."
-
 #: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Avtale"
@@ -2808,83 +2857,83 @@ msgstr "_Start-tid:"
 
 #: calendar/gui/dialogs/meeting-page.c:576
 #: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1179
-#: calendar/gui/dialogs/meeting-page.c:1247
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr "Individuell"
 
 #: calendar/gui/dialogs/meeting-page.c:578
 #: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1248
+#: calendar/gui/dialogs/meeting-page.c:1252
 msgid "Group"
 msgstr "Gruppe"
 
 #: calendar/gui/dialogs/meeting-page.c:580
 #: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1249
+#: calendar/gui/dialogs/meeting-page.c:1253
 msgid "Resource"
 msgstr "Ressurs"
 
 #: calendar/gui/dialogs/meeting-page.c:582
 #: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1250
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr "Rom"
 
 #: calendar/gui/dialogs/meeting-page.c:611
 #: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1263
+#: calendar/gui/dialogs/meeting-page.c:1267
 msgid "Chair"
 msgstr "Styremedlem"
 
 #: calendar/gui/dialogs/meeting-page.c:613
 #: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1181
-#: calendar/gui/dialogs/meeting-page.c:1264
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
 #: calendar/gui/dialogs/meeting-page.c:615
 #: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1265
+#: calendar/gui/dialogs/meeting-page.c:1269
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
 #: calendar/gui/dialogs/meeting-page.c:617
 #: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1266
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
 #: calendar/gui/dialogs/meeting-page.c:663
 #: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1189
-#: calendar/gui/dialogs/meeting-page.c:1292
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 msgid "Needs Action"
 msgstr "Trenger handling"
 
 #: calendar/gui/dialogs/meeting-page.c:665
 #: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1293
+#: calendar/gui/dialogs/meeting-page.c:1297
 msgid "Accepted"
 msgstr "Godtatt"
 
 #: calendar/gui/dialogs/meeting-page.c:667
 #: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1294
+#: calendar/gui/dialogs/meeting-page.c:1298
 msgid "Declined"
 msgstr "Avslått"
 
 #: calendar/gui/dialogs/meeting-page.c:669
 #: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1295
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Tentativ"
 
 #: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1296
+#: calendar/gui/dialogs/meeting-page.c:1300
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -2898,31 +2947,31 @@ msgid "That person is already attending the meeting!"
 msgstr "Denne personen er allerede satt opp for dette møtet!"
 
 #: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
 #: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:838
-#: calendar/gui/dialogs/meeting-page.c:958
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
 #: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
 #: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:842
 msgid "Non-Participants"
 msgstr "Ikke-deltakere"
 
-#: calendar/gui/dialogs/meeting-page.c:916
+#: calendar/gui/dialogs/meeting-page.c:920
 msgid "Sent By:"
 msgstr "Sendt av:"
 
-#: calendar/gui/dialogs/meeting-page.c:1467
+#: calendar/gui/dialogs/meeting-page.c:1471
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -3017,7 +3066,7 @@ msgstr "den"
 msgid "th"
 msgstr "de"
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr "gjentakelser"
 
@@ -3202,47 +3251,47 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3378
-#: calendar/gui/e-week-view.c:3230 mail/folder-browser.c:1284
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1284
 msgid "_Open"
 msgstr "_Åpne"
 
-#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3387
-#: calendar/gui/e-week-view.c:3239 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: calendar/gui/e-calendar-table.c:855 calendar/gui/e-day-view.c:3389
-#: calendar/gui/e-week-view.c:3241 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3364
-#: calendar/gui/e-day-view.c:3391 calendar/gui/e-week-view.c:3217
-#: calendar/gui/e-week-view.c:3243 ui/evolution-addressbook.xml.h:35
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
 #: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:862
+#: calendar/gui/e-calendar-table.c:863
 msgid "_Mark as Complete"
 msgstr "_Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:864
+#: calendar/gui/e-calendar-table.c:865
 msgid "_Delete this Task"
 msgstr "Sle_tt denne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-table.c:868
 msgid "_Mark Tasks as Complete"
 msgstr "_Merk oppgaver som fullført"
 
-#: calendar/gui/e-calendar-table.c:869
+#: calendar/gui/e-calendar-table.c:870
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: calendar/gui/e-calendar-table.c:1129
+#: calendar/gui/e-calendar-table.c:1130
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikk for å legge til en oppgave"
@@ -3284,7 +3333,8 @@ msgstr "Prioritet"
 msgid "Start Date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:16 shell/e-storage-set-view.c:1464
+#: shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -3327,36 +3377,32 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3357
-msgid "New _Appointment"
-msgstr "Ny _avtale"
-
-#: calendar/gui/e-day-view.c:3359 calendar/gui/e-week-view.c:3212
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3369 calendar/gui/e-week-view.c:3222
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Gå _til idag"
 
-#: calendar/gui/e-day-view.c:3371 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-day-view.c:3380 calendar/gui/e-week-view.c:3232
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 msgid "_Delete this Appointment"
 msgstr "Sle_tt denne avtalen"
 
-#: calendar/gui/e-day-view.c:3399 calendar/gui/e-week-view.c:3257
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: calendar/gui/e-day-view.c:3401 calendar/gui/e-week-view.c:3259
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-day-view.c:3403 calendar/gui/e-week-view.c:3261
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
@@ -3584,16 +3630,16 @@ msgstr "Kunne ikke laste oppgavene i `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 
-#: calendar/gui/e-week-view.c:3210 calendar/gui/e-week-view.c:3248
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/gnome-cal.c:1248
+#: calendar/gui/gnome-cal.c:1257
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke åpne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1259
+#: calendar/gui/gnome-cal.c:1268
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er nødvendig for å åpne `%s' er ikke støttet"
@@ -3849,8 +3895,9 @@ msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1882 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:10
+#: mail/mail-callbacks.c:1895 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-comp-editor.xml.h:10
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -4595,7 +4642,7 @@ msgstr "Feil under dekoding av melding."
 msgid "Failed to verify certificates."
 msgstr "Feil under verifisering av sertifikater."
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4605,7 +4652,7 @@ msgstr ""
 "Emne: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4701,21 +4748,21 @@ msgstr "Mappen ble ødelagt og laget på nytt på tjeneren."
 msgid "Scanning for changed messages"
 msgstr "Søker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1478
-#: camel/providers/imap/camel-imap-folder.c:1902
+#: camel/providers/imap/camel-imap-folder.c:1491
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:1620
-#: camel/providers/imap/camel-imap-folder.c:1701
+#: camel/providers/imap/camel-imap-folder.c:1633
+#: camel/providers/imap/camel-imap-folder.c:1714
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1626
+#: camel/providers/imap/camel-imap-folder.c:1639
 msgid "Scanning for new messages"
 msgstr "Søker etter nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1935
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -4732,7 +4779,7 @@ msgstr "Ser etter nye meldinger"
 msgid "Check for new messages in all folders"
 msgstr "Se etter nye meldinger i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:655
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:684
 msgid "Folders"
 msgstr "Mapper"
 
@@ -4798,12 +4845,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:837 mail/mail-local.c:333
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1027
+#: camel/providers/imap/camel-imap-store.c:1037
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke å ha undermapper"
 
@@ -5773,7 +5820,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -5864,7 +5911,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer.c:687
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5873,7 +5920,7 @@ msgstr ""
 "Kan ikke åpne fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5882,29 +5929,29 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:890
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:901
+#: composer/e-msg-composer.c:884
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:943
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5912,16 +5959,16 @@ msgstr ""
 "Kunne ikke åpne skisse-mappen for denne kontoen.\n"
 "Vil du bruke standard skisse-mappe?"
 
-#: composer/e-msg-composer.c:1064
+#: composer/e-msg-composer.c:1047
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1055
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1078
+#: composer/e-msg-composer.c:1061
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5930,7 +5977,7 @@ msgstr ""
 "Kunne ikke søke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1067
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5939,7 +5986,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5948,7 +5995,7 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1193
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
@@ -5956,7 +6003,7 @@ msgstr ""
 "Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
 "Vil du prøve å gjenopprette?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1324
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5966,24 +6013,24 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1348 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1331 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1354
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:1520
+#: composer/e-msg-composer.c:1503
 msgid "Insert File"
 msgstr "Sett inn fil"
 
-#: composer/e-msg-composer.c:1894 composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:1877 composer/e-msg-composer.c:2318
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2384
+#: composer/e-msg-composer.c:2408
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -6024,18 +6071,22 @@ msgid "Body or subject contains"
 msgstr "Kropp eller emne inneholder"
 
 #: default_user/searches.xml.h:4
+msgid "Message contains"
+msgstr "Melding inneholder"
+
+#: default_user/searches.xml.h:5
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
-#: default_user/searches.xml.h:5
+#: default_user/searches.xml.h:6
 msgid "Sender contains"
 msgstr "Sender inneholder"
 
-#: default_user/searches.xml.h:6
+#: default_user/searches.xml.h:7
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
-#: default_user/searches.xml.h:7
+#: default_user/searches.xml.h:8
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
@@ -6043,7 +6094,7 @@ msgstr "Emne inneholder ikke"
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
 #: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -6061,15 +6112,15 @@ msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
-#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
-#: widgets/misc/e-dateedit.c:1515
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
-#: widgets/misc/e-dateedit.c:1512
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -6194,6 +6245,11 @@ msgstr "en tid du spesifiserer"
 msgid "a time relative to the current time"
 msgstr "en tid relativ til tiden nå"
 
+#. The dialog
+#: filter/filter-datespec.c:394
+msgid "Select a time to compare against"
+msgstr "Velg en tid å sammenligne mot"
+
 #. The label
 #: filter/filter-datespec.c:428
 msgid "Compare against"
@@ -6444,7 +6500,7 @@ msgstr "Svart til"
 msgid "Score"
 msgstr "Poenggi"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1070
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1071
 msgid "Sender"
 msgstr "Avsender"
 
@@ -6660,31 +6716,31 @@ msgstr "Factory for e-post sammendrag komponent."
 msgid "Mail configuration interface"
 msgstr "Grensesnitt for e-post-konfigurasjon"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:112
 msgid "This folder cannot contain messages."
 msgstr "Denne mappen kan ikke inneholde meldinger."
 
-#: mail/component-factory.c:331
+#: mail/component-factory.c:332
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#: mail/component-factory.c:331
+#: mail/component-factory.c:332
 msgid "Change this folder's properties"
 msgstr "Endre denne mappens egenskaper"
 
-#: mail/component-factory.c:738
+#: mail/component-factory.c:741
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/component-factory.c:738
+#: mail/component-factory.c:741
 msgid "New _Mail Message"
 msgstr "Ny e-post _melding"
 
-#: mail/component-factory.c:770
+#: mail/component-factory.c:773
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:907
+#: mail/component-factory.c:910
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
@@ -6697,7 +6753,7 @@ msgstr "Egenskaper for \"%s\""
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:233 mail/mail-display.c:278
+#: mail/folder-browser.c:233 mail/mail-display.c:281
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
@@ -6742,7 +6798,7 @@ msgstr "Filtrer på e-_postliste"
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/folder-browser.c:1288 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1288 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Lagre _som..."
@@ -6751,15 +6807,15 @@ msgstr "Lagre _som..."
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1297 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1297 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1299 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1299 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
@@ -6791,7 +6847,7 @@ msgstr "Fl_ytt til mappe..."
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1321 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1321 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
@@ -6907,36 +6963,36 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: mail/mail-accounts.c:143
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (forvalgt)"
 
-#: mail/mail-accounts.c:187
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: mail/mail-accounts.c:189
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "Aktiver"
 
-#: mail/mail-accounts.c:277
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne kontoen?"
 
-#: mail/mail-accounts.c:281
+#: mail/mail-accounts.c:284
 msgid "Don't delete"
 msgstr "Ikke slett"
 
-#: mail/mail-accounts.c:284
+#: mail/mail-accounts.c:287
 msgid "Really delete account?"
 msgstr "Vil du virkelig slette kontoen?"
 
-#: mail/mail-accounts.c:508 mail/mail-accounts.c:512
+#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker på at du vil slette denne diskusjonsgruppekontoen?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:754 mail/mail-config.glade.h:41
+#: mail/mail-accounts.c:757 mail/mail-config.glade.h:41
 msgid "Mail Settings"
 msgstr "Innstillinger for e-post"
 
@@ -7024,29 +7080,29 @@ msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
 msgid "You must configure an account before you can send this email."
 msgstr "Du må konfigurere en konto før du kan sender denne meldingen."
 
-#: mail/mail-callbacks.c:632
+#: mail/mail-callbacks.c:633
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Den %s, skrev %s:"
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:894
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-callbacks.c:990
+#: mail/mail-callbacks.c:991
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:993
 msgid "Copy message(s) to"
 msgstr "Kopier melding(er) til"
 
-#: mail/mail-callbacks.c:1361
+#: mail/mail-callbacks.c:1362
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker på at du vil redigere alle %d meldingene?"
 
-#: mail/mail-callbacks.c:1383
+#: mail/mail-callbacks.c:1384
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -7054,7 +7110,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:1417
+#: mail/mail-callbacks.c:1418
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -7062,42 +7118,43 @@ msgstr ""
 "Du kan kun sende meldinger på nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:1429
+#: mail/mail-callbacks.c:1430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker på at du vil sende alle %d meldingene på nytt?"
 
-#: mail/mail-callbacks.c:1450
+#: mail/mail-callbacks.c:1451
 msgid "No Message Selected"
 msgstr "Ingen melding valgt"
 
-#: mail/mail-callbacks.c:1535
+#: mail/mail-callbacks.c:1536
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:1537
+#: mail/mail-callbacks.c:1538
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:1679
-msgid "Are you sure?"
-msgstr "Er du sikker?"
+#: mail/mail-callbacks.c:1683 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Advarsel"
 
-#: mail/mail-callbacks.c:1684
+#: mail/mail-callbacks.c:1688
 msgid ""
-"You are about to expunge a folder. This will\n"
-"permantly remove all messages with a \"deleted\"\n"
-"flag from both this folder and the Trash folder.\n"
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
 "\n"
-"Are you sure you want to continue?"
+"Really erase these messages?"
 msgstr ""
-"Du er i ferd med å tømme en mappe. Dette vil\n"
-"fjerne alle slettede meldinger permanent både fra\n"
-"denne mappen og søppelkurven.\n"
+"Denne operasjonen vil fjerne alle meldinger merket som slettet permanent. Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene. \n"
 "\n"
-"Er du sikker på at du vil fortsette?"
+"Vil du virkelig slette disse meldingene?"
+
+#: mail/mail-callbacks.c:1695
+msgid "Do not ask me again."
+msgstr "Ikke spør meg igjen."
 
-#: mail/mail-callbacks.c:1787
+#: mail/mail-callbacks.c:1800
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -7106,24 +7163,24 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1797
+#: mail/mail-callbacks.c:1810
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:1843
+#: mail/mail-callbacks.c:1856
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:1889
+#: mail/mail-callbacks.c:1902
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-callbacks.c:1973
+#: mail/mail-callbacks.c:1986
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker på at du vil åpne alle %d meldingene i separate vinduer?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:136
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -7133,7 +7190,7 @@ msgstr ""
 "feltene under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å "
 "inkludere denne informasjonen i e-post du sender."
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:138
 msgid ""
 "Please enter information about your incoming mail server below. If you don't "
 "know what kind of server you use, contact your system administrator or "
@@ -7143,7 +7200,7 @@ msgstr ""
 "Hvis du ikke vet hvilken type tjener du bruker, kontakt din "
 "systemadministrator eller Internett tjenestetilbyder."
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:142
 msgid ""
 "Please enter information about your outgoing mail protocol below. If you "
 "don't know which protocol you use, contact your system administrator or "
@@ -7153,7 +7210,7 @@ msgstr ""
 "du ikke vet hvilken protokoll du bruker, kontakt din systemadministrator "
 "eller Internett tjenestetilbyder."
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:144
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -7168,7 +7225,7 @@ msgstr ""
 "visning på skjermen."
 
 #. set window title
-#: mail/mail-config-druid.c:464
+#: mail/mail-config-druid.c:623
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
@@ -7177,16 +7234,16 @@ msgstr "Evolution kontoassistent"
 #. * name. I don't think this will work with maildir. How can we figure out
 #. * what shortcut to insert?
 #.
-#: mail/mail-config.c:1534
+#: mail/mail-config.c:1559
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Innboks"
 
-#: mail/mail-config.c:1764
+#: mail/mail-config.c:1789
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-config.c:1835 mail/mail-config.c:1838
+#: mail/mail-config.c:1860 mail/mail-config.c:1863
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
@@ -7278,6 +7335,10 @@ msgstr "Standard tegnkoding: "
 msgid "Digital IDs..."
 msgstr "Digitale IDer..."
 
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "Vis"
+
 #: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Ferdig"
@@ -7630,53 +7691,53 @@ msgstr "Kunne ikke opprette S/MIME \"envelope\" kontekst."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke opprette S/MIME dekodingskontekst."
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:402
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:406
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:427
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1051
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1407
 msgid "Open Link in Browser"
 msgstr "Åpne lenke i nettleser"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1409
 msgid "Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1411
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenke som"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1413
 msgid "Save Image as..."
 msgstr "Lagre bilde som..."
 
@@ -7801,12 +7862,12 @@ msgstr "Feilutformet del for ekstern-kropp."
 msgid "Opening '%s'"
 msgstr "Åpner '%s'"
 
-#: mail/mail-local.c:758
+#: mail/mail-local.c:754
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:879
+#: mail/mail-local.c:875
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7815,7 +7876,7 @@ msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
 "ikke kunne åpne denne mappen igjen: %s"
 
-#: mail/mail-local.c:918
+#: mail/mail-local.c:914
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7823,11 +7884,11 @@ msgstr ""
 "Hvis du ikke kan åpne denne postboksen igjen må\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1007
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan ikke endre format på en ikke-lokal mappe."
 
-#: mail/mail-local.c:1022
+#: mail/mail-local.c:1018
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Omkonfigurer %s"
@@ -8075,7 +8136,7 @@ msgstr "Videresendt melding - %s"
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 msgid "Forwarded Message"
 msgstr "Videresendt melding"
 
@@ -8152,14 +8213,10 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2318
+#: mail/message-list.c:2314
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: mail/message-list.c:2330
-msgid "Updating message list"
-msgstr "Oppdaterer meldingsliste"
-
 #: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Merket"
@@ -8172,36 +8229,36 @@ msgstr "Mottatt"
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/subscribe-dialog.c:166
+#: mail/subscribe-dialog.c:167
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Søker i mapper under %s på \"%s\""
 
-#: mail/subscribe-dialog.c:168
+#: mail/subscribe-dialog.c:169
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Søker i mapper på rot-nivå på \"%s\""
 
-#: mail/subscribe-dialog.c:267
+#: mail/subscribe-dialog.c:268
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnerer på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:269
+#: mail/subscribe-dialog.c:270
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement på mappe \"%s\""
 
-#: mail/subscribe-dialog.c:1190 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1241 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1432
+#: mail/subscribe-dialog.c:1483
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: mail/subscribe-dialog.c:1489
+#: mail/subscribe-dialog.c:1540
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
@@ -8245,7 +8302,7 @@ msgstr "Evolution-komponent for sammendrag."
 msgid "Factory for the Evolution executive summary component."
 msgstr "Factory for Evolutions sammendrag-komponent."
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Kan ikke initiere Evolutions sammendragskomponent."
 
@@ -8290,8 +8347,8 @@ msgid "Name:"
 msgstr "Navn:"
 
 #: my-evolution/e-summary-preferences.c:1403
-msgid "My Evolution Settings"
-msgstr "Innstillinger for Min Evolution"
+msgid "Summary Settings"
+msgstr "Innstillinger for sammendrag"
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -8318,16 +8375,16 @@ msgid "Regions"
 msgstr "Regioner"
 
 #: my-evolution/e-summary.c:145
-msgid "%A, %d %B %Y"
-msgstr "%A, %d %B %Y"
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %e %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
-msgid "Print My Evolution"
-msgstr "Skriv ut Min Evolution"
+msgid "Print Summary"
+msgstr "Skriv ut sammendrag"
 
 #: my-evolution/e-summary.c:518
-msgid "Printing of My Evolution failed"
-msgstr "Utskrift av Min Evolution feilet"
+msgid "Printing of Summary failed"
+msgstr "Feil under utskrift av sammendrag"
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
@@ -9648,10 +9705,6 @@ msgstr "Vis detaljer"
 msgid "Cancel Operation"
 msgstr "Alys operasjon"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1026
-msgid "Contacts"
-msgstr "Kontakter"
-
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1023
@@ -9716,7 +9769,7 @@ msgstr ""
 "En feil oppsto under kopiering av filer til\n"
 "`%s'."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9727,7 +9780,7 @@ msgstr ""
 "Venligst flytt denne for å tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9741,7 +9794,7 @@ msgstr ""
 "kan kjøre.\n"
 "Vil du fjerne denne katalogen?"
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9848,7 +9901,7 @@ msgstr ""
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
+#: shell/e-shell-folder-title-bar.c:569 shell/e-shell-folder-title-bar.c:570
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
@@ -9957,19 +10010,31 @@ msgstr "Velg en målmappe for å importere data"
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:534
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Vennligst vent...\n"
+"Søker etter eksisterende oppsett"
+
+#: shell/e-shell-startup-wizard.c:537
+msgid "Starting Intelligent Importers"
+msgstr "Starter intelligent import"
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9979,28 +10044,28 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljøet."
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:435
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:436
 msgid "Select the folder that you want to open"
 msgstr "Velg mappen du ønsker å åpne"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:581
 msgid "Create a new shortcut"
 msgstr "Opprett en ny snarvei"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:582
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Velg mappen du ønsker snarveien skal peke til:"
 
-#: shell/e-shell-view-menu.c:702
+#: shell/e-shell-view-menu.c:696
 msgid "Work Online"
 msgstr "Arbeid \"online\""
 
-#: shell/e-shell-view-menu.c:715 shell/e-shell-view-menu.c:728
-#: ui/evolution.xml.h:35
+#: shell/e-shell-view-menu.c:709 shell/e-shell-view-menu.c:722
+#: ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Arbeid \"offline\""
 
@@ -10008,61 +10073,61 @@ msgstr "Arbeid \"offline\""
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1391
+#: shell/e-shell-view.c:1420
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1393
+#: shell/e-shell-view.c:1422
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution - %s [%s]"
 
-#: shell/e-shell-view.c:1431
+#: shell/e-shell-view.c:1460
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
 
-#: shell/e-shell-view.c:1438
+#: shell/e-shell-view.c:1467
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i ferd med å koble fra."
 
-#: shell/e-shell-view.c:1444
+#: shell/e-shell-view.c:1473
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
 
-#: shell/e-shell.c:491
+#: shell/e-shell.c:508
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1406
+#: shell/e-shell.c:1439
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Ops! Visningen for `%s' døde uventet. :-(\n"
 "Dette betyr sannsynligvis at komponenten %s har krasjet."
 
-#: shell/e-shell.c:1610 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1643 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1612
+#: shell/e-shell.c:1645
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1614
+#: shell/e-shell.c:1647
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1616
+#: shell/e-shell.c:1649
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1618 shell/e-storage.c:481
+#: shell/e-shell.c:1651 shell/e-storage.c:481
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -10179,10 +10244,6 @@ msgstr "Feil under lagring av snarveier."
 msgid "Shortcuts"
 msgstr "Snarveier"
 
-#: shell/e-storage-set-view.c:1464 shell/e-summary-storage.c:78
-msgid "My Evolution"
-msgstr "Min Evolution"
-
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Uten navn)"
@@ -10394,50 +10455,50 @@ msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
 #: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "Ny kontakt"
+msgid "Forward Contact"
+msgstr "Videresend kontakt"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "New list"
+#: ui/evolution-addressbook.xml.h:12
+msgid "New List"
 msgstr "Ny liste"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-mail-list.xml.h:12
 msgid "Paste"
 msgstr "Lim inn"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:19
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Forhåndsviser kontaktene som skal skrives ut"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Skriv ut valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Lagre valgte kontakter som et VCard."
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Velg alle kontakter"
 
-#: ui/evolution-addressbook.xml.h:22
-msgid "Send _contact to other"
+#: ui/evolution-addressbook.xml.h:23
+msgid "Send _Contact to Other"
 msgstr "Send _kontakt til andre"
 
-#: ui/evolution-addressbook.xml.h:23
-msgid "Send _message to contact"
+#: ui/evolution-addressbook.xml.h:24
+msgid "Send _Message to Contact"
 msgstr "Send _melding til kontakt"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Send en melding til valgte kontakter."
 
@@ -10454,7 +10515,7 @@ msgid "Stop Loading"
 msgstr "Stopp innlesing"
 
 #: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:31
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
@@ -10474,7 +10535,8 @@ msgstr "_Kontakt"
 msgid "_Contact List"
 msgstr "_Kontaktliste"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:36
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-mail-message.xml.h:95
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "S_kriv ut..."
@@ -10492,9 +10554,9 @@ msgid "_Select All"
 msgstr "_Velg alle"
 
 #: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:37
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
 #: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:20
-#: ui/my-evolution.xml.h:8
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Verktøy"
 
@@ -10510,10 +10572,6 @@ msgstr "Opprett en ny avtale for h_ele dagen"
 msgid "Create a _New Appointment"
 msgstr "Opprett en _ny avtale"
 
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
-msgstr "Opprett en ny avtale"
-
 #: ui/evolution-calendar.xml.h:7
 msgid "Create an event for the whole day"
 msgstr "Opprett en hendelse for hele dagen"
@@ -10603,10 +10661,6 @@ msgstr "_Avtale..."
 msgid "_Calendar Settings..."
 msgstr "Innstillinger for _kalender..."
 
-#: ui/evolution-calendar.xml.h:36
-msgid "_Print Calendar..."
-msgstr "Skriv _ut kalender"
-
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -10616,15 +10670,15 @@ msgid "Close"
 msgstr "Lukk"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "Lukk denne avtalen"
+msgid "Close this item"
+msgstr "Lukk denne oppføringen"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "Slett denne avtalen"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "Slett denne oppføringen"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
 
@@ -10644,35 +10698,38 @@ msgstr "Skriv ut denne oppføringen"
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ui/evolution-comp-editor.xml.h:15
-msgid "Save and Close"
-msgstr "Lagre og lukk"
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "Lagre"
 
 #: ui/evolution-comp-editor.xml.h:16
-msgid "Save the appointment and close the dialog box"
-msgstr "Lagre avtalen og lukk dialogboksen"
+msgid "Save and Close"
+msgstr "Lagre og lukk"
 
 #: ui/evolution-comp-editor.xml.h:17
+msgid "Save the item and close the dialog box"
+msgstr "Lagre oppføringen og lukk dialogboksen"
+
+#: ui/evolution-comp-editor.xml.h:18
 msgid "Save this item to disk"
 msgstr "Lagre denne oppføringen til disk"
 
-#: ui/evolution-comp-editor.xml.h:18
+#: ui/evolution-comp-editor.xml.h:19 ui/evolution-mail-message.xml.h:73
 msgid "Setup the page settings for your current printer"
 msgstr "Rediger sideinnstillinger for aktiv skriver"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:38
 msgid "_File"
 msgstr "_Fil"
 
-#: ui/evolution-contact-editor.xml.h:3
-msgid "Delete this item"
-msgstr "Slett denne oppføringen"
-
 #: ui/evolution-contact-editor.xml.h:4
 msgid "Help"
 msgstr "Hjelp"
@@ -10681,13 +10738,6 @@ msgstr "Hjelp"
 msgid "Print En_velope..."
 msgstr "Skriv ut konvolutt..."
 
-#: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:244
-msgid "Save"
-msgstr "Lagre"
-
 #: ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
@@ -10741,19 +10791,19 @@ msgstr "Send _melding til liste..."
 msgid "Cancel Mee_ting"
 msgstr "Alys mø_te"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr "Avlys møte for denne oppføringen"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Videresend som i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Videresend oppføring via e-post"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr "Hent siste møteinformasjon"
 
@@ -10765,7 +10815,7 @@ msgstr "Oppdater møte"
 msgid "Schedule _Meeting"
 msgstr "Sett opp _møte"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr "Sett opp møte for denne oppføringen"
 
@@ -10954,7 +11004,7 @@ msgstr "Meldingsliste med tråder"
 msgid "_Expunge"
 msgstr "_Tøm"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:39
 msgid "_Folder"
 msgstr "M_appe"
 
@@ -11179,8 +11229,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "Åpne valgt melding i redigeringsvinduet for å sende den på nytt"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
-msgstr "Viser forhåndsvisning av meldingen som skal skrives ut"
+msgid "Preview the message to be printed"
+msgstr "Forhåndsvis meldingen som skal skrives ut"
 
 #: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
@@ -11198,35 +11248,27 @@ msgstr "Forrige melding"
 msgid "Previous Unread Message"
 msgstr "Forrige uleste melding"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "Skriv ut melding..."
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "Forhåndsvisning av utskrift"
-
-#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "Søk i m_elding"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "Lagre meldingen som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
@@ -11309,12 +11351,12 @@ msgstr "Lukk dette vinduet"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:34
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Vis"
 
@@ -11505,7 +11547,7 @@ msgstr "Svar-til felt"
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:42
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -11538,14 +11580,26 @@ msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
 #: ui/evolution-task-editor.xml.h:1
+msgid "Assign Task"
+msgstr "Tildel oppgave"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr "Tildel denne oppgaven til andre"
+
+#: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Avbryt oppgave"
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Delegate Task"
-msgstr "Deleger oppgave"
+#: ui/evolution-task-editor.xml.h:4
+msgid "Cancel this task"
+msgstr "Avbryt denne oppgaven"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr "Hent siste informasjon om oppgaven"
+
+#: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "O_ppdater oppgave"
 
@@ -11557,10 +11611,6 @@ msgstr "Konfigurer innstillinger for oppgavevisning"
 msgid "Copy selected task"
 msgstr "Kopier valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "Opprett en ny oppgave"
-
 #: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut valgt oppgave"
@@ -11646,17 +11696,17 @@ msgid "Exit the program"
 msgstr "Avslutt programmet"
 
 #: ui/evolution.xml.h:16
-msgid "Getting _Started"
-msgstr "Kom _igang"
-
-#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr "Importer et eksternt filformat"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "Flytt denne mappen til et annet sted"
 
+#: ui/evolution.xml.h:19
+msgid "Open a new Evolution window"
+msgstr "Åpne et nytt Evolution vindu"
+
 #: ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Åpne i nytt _vindu"
@@ -11698,88 +11748,76 @@ msgid "Toggle whether we are working offline."
 msgstr "Skift til \"offline\" arbeidsmodus."
 
 #: ui/evolution.xml.h:31
-msgid "Using the C_ontact Manager"
-msgstr "Bruk av k_ontaktdatabasen"
-
-#: ui/evolution.xml.h:32
-msgid "Using the _Calendar"
-msgstr "Bruk av _kalenderen"
-
-#: ui/evolution.xml.h:33
-msgid "Using the _Mailer"
-msgstr "Bruk av e-_postprogrammet"
-
-#: ui/evolution.xml.h:34
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:33
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:35
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:40
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:41
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: ui/evolution.xml.h:46
-msgid "_Import file..."
+#: ui/evolution.xml.h:43
+msgid "_Import File..."
 msgstr "_Importer fil..."
 
-#: ui/evolution.xml.h:47
-msgid "_Index"
-msgstr "_Indeks"
-
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:44
 msgid "_Move..."
 msgstr "_Flytt..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:45
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:46
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:47
 msgid "_Rename..."
 msgstr "_Gi nytt navn..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:48
 msgid "_Shortcut"
 msgstr "_Snarvei"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:49
 msgid "_Shortcut Bar"
 msgstr "_Snarveilinje"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "Ar_beid \"offline\""
 
 #: ui/my-evolution.xml.h:1
-msgid "Change the settings for My Evolution"
-msgstr "Endre innstilingene for Min Evolution"
+msgid "Change the settings for the summary"
+msgstr "Endre innstilingene for sammendrag"
 
 #: ui/my-evolution.xml.h:4
+msgid "Print summary"
+msgstr "Skriv ut sammendrag"
+
+#: ui/my-evolution.xml.h:5
 msgid "Reload"
 msgstr "Oppdater"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:6
 msgid "Reload the view"
 msgstr "Oppdater visningen"
 
-#: ui/my-evolution.xml.h:6
-msgid "_My Evolution Settings..."
-msgstr "Innstillinger for _Min Evolution..."
+#: ui/my-evolution.xml.h:8
+msgid "_Summary Settings..."
+msgstr "Innstillinger for _sammendrag..."
 
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -11813,6 +11851,28 @@ msgstr "Meldinger"
 msgid "With Category"
 msgstr "Med kategori"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Velg en tidssone"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Utvalg:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Tidssoner"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+"Bruk venstre musknapp til å zoome inn på et område av kartet og velg en "
+"tidssone.\n"
+"Bru høyre musknapp til å zoome ut."
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
@@ -11907,11 +11967,11 @@ msgstr "MTOTFLS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "nå"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "Idag"
 
@@ -12021,10 +12081,6 @@ msgstr "Vis alle"
 msgid "Information"
 msgstr "Informasjon"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Advarsel"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "Feil"
@@ -12042,11 +12098,11 @@ msgstr "Melding"
 msgid "Don't show this message again."
 msgstr "Ikke vis denne meldingen igjen."
 
-#: widgets/misc/e-search-bar.c:333
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "Sø_k"
 
-#: widgets/misc/e-search-bar.c:459
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "Finn nå "
 
@@ -12070,6 +12126,88 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid "_12 hour (am/pm)"
+#~ msgstr "_12 timer (am/pm)"
+
+#~ msgid "New contact"
+#~ msgstr "Ny kontakt"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Lukk denne avtalen"
+
+#~ msgid "Delete this appointment"
+#~ msgstr "Slett denne avtalen"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Lagre avtalen og lukk dialogboksen"
+
+#~ msgid "Print Message..."
+#~ msgstr "Skriv ut melding..."
+
+#~ msgid "Print Preview..."
+#~ msgstr "Forhåndsvisning av utskrift"
+
+#~ msgid "Delegate Task"
+#~ msgstr "Deleger oppgave"
+
+#~ msgid "Getting _Started"
+#~ msgstr "Kom _igang"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Bruk av k_ontaktdatabasen"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "Bruk av _kalenderen"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "Bruk av e-_postprogrammet"
+
+#~ msgid "_Index"
+#~ msgstr "_Indeks"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Brukervalg for kalender"
+
+#~ msgid "Are you sure?"
+#~ msgstr "Er du sikker?"
+
+#~ msgid ""
+#~ "You are about to expunge a folder. This will\n"
+#~ "permantly remove all messages with a \"deleted\"\n"
+#~ "flag from both this folder and the Trash folder.\n"
+#~ "\n"
+#~ "Are you sure you want to continue?"
+#~ msgstr ""
+#~ "Du er i ferd med å tømme en mappe. Dette vil\n"
+#~ "fjerne alle slettede meldinger permanent både fra\n"
+#~ "denne mappen og søppelkurven.\n"
+#~ "\n"
+#~ "Er du sikker på at du vil fortsette?"
+
+#~ msgid "Updating message list"
+#~ msgstr "Oppdaterer meldingsliste"
+
+#~ msgid "My Evolution Settings"
+#~ msgstr "Innstillinger for Min Evolution"
+
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%A, %d %B %Y"
+
+#~ msgid "Print My Evolution"
+#~ msgstr "Skriv ut Min Evolution"
+
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "Utskrift av Min Evolution feilet"
+
+#~ msgid "My Evolution"
+#~ msgstr "Min Evolution"
+
+#~ msgid "_Print Calendar..."
+#~ msgstr "Skriv _ut kalender"
+
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "Innstillinger for _Min Evolution..."
+
 #~ msgid "All"
 #~ msgstr "Alle"
 
@@ -12202,9 +12340,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr ""
 #~ "Velg type adressebok du har, og skriv inn relevant informasjon om den."
 
-#~ msgid "Addressbook Sources"
-#~ msgstr "Adressebok-kilder"
-
 #~ msgid "Name"
 #~ msgstr "Navn"
 
@@ -15534,9 +15669,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "_Unread Item (FIXME)"
 #~ msgstr "_Ulest oppføring"
 
-#~ msgid "Assig_n Task (FIXME)"
-#~ msgstr "_Tildel oppgave"
-
 #~ msgid "Redo"
 #~ msgstr "Gjenopprett"
 
@@ -15603,9 +15735,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Create a new email"
 #~ msgstr "Skriv ny melding"
 
-#~ msgid "Executive Summary Settings..."
-#~ msgstr "Innstillinger for sammendrag..."
-
 #~ msgid "New Mail"
 #~ msgstr "Ny melding"
 
@@ -16347,15 +16476,9 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Open..."
 #~ msgstr "Åpne..."
 
-#~ msgid "Hours"
-#~ msgstr "Timer"
-
 #~ msgid "Mail _to:"
 #~ msgstr "Send _til:"
 
-#~ msgid "Minutes"
-#~ msgstr "Minutter"
-
 #~ msgid "_Audio"
 #~ msgstr "_Lyd"
 
@@ -16877,9 +17000,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Time format"
 #~ msgstr "Tidsformat"
 
-#~ msgid "12-hour (AM/PM)"
-#~ msgstr "12 timer (AM/PM)"
-
 #~ msgid "24-hour"
 #~ msgstr "24 timer"
 
@@ -17084,9 +17204,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "FIXME: Assign Task..."
 #~ msgstr "Tildel oppgave..."
 
-#~ msgid "Assign the task to someone"
-#~ msgstr "Tildel oppgaven til noen"
-
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "Ka_lender..."