Added ui/*.h

2000-10-14  Kjartan Maraas  <kmaraas@gnome.org>

	* POTFILES.in: Added ui/*.h

svn path=/trunk/; revision=5922

3 files changed, 1166 insertions, 493 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 620e6d05b3..09c3ed4435 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-14  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* POTFILES.in: Added ui/*.h
+	
 2000-10-14  Valek Filippov  <frob@df.ru>
 
 	* ru.po: updated russian translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3a0f5edb77..d29233f61d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -103,6 +103,13 @@ shell/e-storage.c
 shell/e-storage-set-view.c
 shell/main.c
 #tests/ui-tests/message-browser.c
+ui/evolution-addressbook-ldap.h
+ui/evolution-addressbook.h
+ui/evolution-calendar.h
+ui/evolution-contact-editor.h
+ui/evolution-mail.h
+ui/evolution-subscribe.h
+ui/evolution.h
 widgets/meeting-time-sel/e-meeting-time-sel.c
 widgets/misc/e-calendar.c
 widgets/misc/e-calendar-item.c
diff --git a/po/no.po b/po/no.po
index d91bcb7abe..99e0815eaa 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.4\n"
-"POT-Creation-Date: 2000-10-03 23:28+0200\n"
+"POT-Creation-Date: 2000-10-14 22:22+0200\n"
 "PO-Revision-Date: 2000-10-03 23:34+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -19,8 +19,8 @@ msgstr ""
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1215
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1673
-#: calendar/conduits/todo/todo-conduit.c:1173 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1156
+#: calendar/conduits/todo/todo-conduit.c:1077 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -29,43 +29,43 @@ msgstr "Kunne ikke initialisere Bonobo"
 #. Custom type implies Disabled state.
 #.
 #: addressbook/conduit/address-conduit-control-applet.c:54
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:70
 #: calendar/conduits/todo/todo-conduit-control-applet.c:70
 msgid "Disabled"
 msgstr "Slått av"
 
 #: addressbook/conduit/address-conduit-control-applet.c:55
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:56
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:71
 #: calendar/conduits/todo/todo-conduit-control-applet.c:71
 msgid "Synchronize"
 msgstr "Synkronisér"
 
 #: addressbook/conduit/address-conduit-control-applet.c:56
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:57
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:72
 #: calendar/conduits/todo/todo-conduit-control-applet.c:72
 msgid "Copy From Pilot"
 msgstr "Kopiér fra Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:57
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:58
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:73
 #: calendar/conduits/todo/todo-conduit-control-applet.c:73
 msgid "Copy To Pilot"
 msgstr "Kopiér til Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:58
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:59
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:74
 #: calendar/conduits/todo/todo-conduit-control-applet.c:74
 msgid "Merge From Pilot"
 msgstr "Flett fra Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:59
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:60
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:75
 #: calendar/conduits/todo/todo-conduit-control-applet.c:75
 msgid "Merge To Pilot"
 msgstr "Flett til Pilot"
 
 #: addressbook/conduit/address-conduit-control-applet.c:143
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:144
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:116
 #: calendar/conduits/todo/todo-conduit-control-applet.c:116
 msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
@@ -75,7 +75,6 @@ msgid "Gpilotd address conduit"
 msgstr "Gpilotd addressekomponent"
 
 #: addressbook/conduit/address-conduit-control-applet.c:146
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
 msgid "(C) 1998 the Free Software Foundation"
 msgstr "(C) 1998 the Free Software Foundation"
 
@@ -84,27 +83,27 @@ msgid "Configuration utility for the address conduit.\n"
 msgstr "Konfigurasjonsverktøy for adressekomponenten.\n"
 
 #: addressbook/conduit/address-conduit-control-applet.c:149
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:150
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:124
 #: calendar/conduits/todo/todo-conduit-control-applet.c:124
 msgid "gnome-unknown.xpm"
 msgstr "gnome-unknown.xpm"
 
 #: addressbook/conduit/address-conduit-control-applet.c:190
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:191
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:155
 #: calendar/conduits/todo/todo-conduit-control-applet.c:155
 msgid "Synchronize Action"
 msgstr "Synkroniseringshandling"
 
 #: addressbook/conduit/address-conduit-control-applet.c:261
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:262
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:214
 #: calendar/conduits/todo/todo-conduit-control-applet.c:214
 msgid "Conduit state"
 msgstr "Komponent-tilstand"
 
 #: addressbook/conduit/address-conduit-control-applet.c:315
 #: addressbook/conduit/address-conduit-control-applet.c:328
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:266
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:279
 #: calendar/conduits/todo/todo-conduit-control-applet.c:266
 #: calendar/conduits/todo/todo-conduit-control-applet.c:279
 msgid ""
@@ -115,13 +114,13 @@ msgstr ""
 "velg cappleten 'Egenskaper for pilot link' først."
 
 #: addressbook/conduit/address-conduit-control-applet.c:334
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:285
 #: calendar/conduits/todo/todo-conduit-control-applet.c:285
 msgid "Not connected to the gnome-pilot daemon"
 msgstr "Ikke tilkoblet gnome-pilot daemon"
 
 #: addressbook/conduit/address-conduit-control-applet.c:339
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:340
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:290
 #: calendar/conduits/todo/todo-conduit-control-applet.c:290
 msgid ""
 "An error occured when trying to fetch\n"
@@ -171,96 +170,96 @@ msgstr "Oppføring(er) hører til disse kategoriene:"
 msgid "Available Categories:"
 msgstr "Tilgjengelige kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
+#: addressbook/contact-editor/e-contact-editor.c:1216
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
+#: addressbook/contact-editor/e-contact-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:1321
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1220
+#: addressbook/contact-editor/e-contact-editor.c:1218
 msgid "Business 2"
 msgstr "Arbeid 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:1219
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:1220
 msgid "Callback"
 msgstr "Tilbakering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1221
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:1222
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
+#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1322
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:1224
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1227
+#: addressbook/contact-editor/e-contact-editor.c:1225
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1226
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:1227
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
+#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1323
 #: mail/mail-config.glade.h:28
 msgid "Other"
 msgstr "Annet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/contact-editor/e-contact-editor.c:1229
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/contact-editor/e-contact-editor.c:1230
 msgid "Pager"
 msgstr "Personsøker"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1231
 msgid "Primary"
 msgstr "Primær"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/contact-editor/e-contact-editor.c:1232
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1234
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Email 3"
 msgstr "E-post 3"
 
@@ -292,6 +291,7 @@ msgstr "_Legg til"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
 #: calendar/gui/dialogs/task-editor.c:459 calendar/gui/event-editor.c:1203
+#: ui/evolution-mail.h:31
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -435,42 +435,51 @@ msgid "Check Address"
 msgstr "Sjekk adresse"
 
 #: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_Street Address:"
-msgstr "_Gateadresse:"
+#, fuzzy
+msgid "_Address:"
+msgstr "Adresse"
 
 #: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "City:"
+#, fuzzy
+msgid "_City:"
 msgstr "By:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "State/Province:"
-msgstr "Stat/Provins:"
+#, fuzzy
+msgid "_PO Box:"
+msgstr "Postboks:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Country:"
-msgstr "Land:"
+#, fuzzy
+msgid "Address _2:"
+msgstr "Adresse"
 
 #: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "ZIP/Postal Code:"
-msgstr "ZIP/Postnummer:"
+#, fuzzy
+msgid "_State/Province:"
+msgstr "Stat/Provins:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "E_xt:"
-msgstr "Linje:"
+msgid "USA"
+msgstr ""
 
 #: addressbook/contact-editor/fulladdr.glade.h:14
-msgid ""
-"USA\n"
-"Canada\n"
-"Finland\n"
+msgid "Canada"
 msgstr ""
-"USA\n"
-"Kanada\n"
-"Finland\n"
 
-#: addressbook/contact-editor/fulladdr.glade.h:18
-msgid "PO Box:"
-msgstr "Postboks:"
+#: addressbook/contact-editor/fulladdr.glade.h:15
+msgid "Finland"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:16
+#, fuzzy
+msgid "_ZIP Code:"
+msgstr "ZIP/Postnummer:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:17
+#, fuzzy
+msgid "Countr_y:"
+msgstr "Land:"
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -531,11 +540,11 @@ msgstr "_Etternavn:"
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/gui/component/addressbook.c:426
+#: addressbook/gui/component/addressbook.c:409
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:431
+#: addressbook/gui/component/addressbook.c:414
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -556,15 +565,15 @@ msgstr ""
 "installere OpenLDAP, deretter må du kompilere og\n"
 "installere Evolution på nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:548
+#: addressbook/gui/component/addressbook.c:531
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
-#: addressbook/gui/component/addressbook.c:553
+#: addressbook/gui/component/addressbook.c:536 ui/evolution-addressbook.h:10
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:576
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -738,15 +747,11 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-addressbook-view.c:414
 #: addressbook/gui/widgets/e-minicard.c:337
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:543
-msgid "* Click here to add a contact *"
-msgstr "* Klikk her for å legge til en kontakt *"
-
 #: addressbook/gui/widgets/e-minicard-control.c:278
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
@@ -765,9 +770,8 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
 #: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:405
+#: mail/folder-browser.c:490
 msgid "Search"
 msgstr "Søk"
 
@@ -953,163 +957,125 @@ msgstr "Motsatt på like sider"
 msgid "Header/Footer"
 msgstr "Topp-/bunntekst"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:603
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:146
-msgid "Gpilotd calendar conduit"
-msgstr "Gpilotd kalenderkomponent"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:149
-msgid "Configuration utility for the calendar conduit.\n"
-msgstr "Konfigurasjonsverktøy for kalenderkomponenten.\n"
-
-#: calendar/conduits/calendar/calendar-conduit.c:398
-#: calendar/conduits/calendar/calendar-conduit.c:1111
-#: calendar/conduits/todo/todo-conduit.c:554
-msgid "Error while communicating with calendar server"
-msgstr "Feil under kommunikasjon med kalendertjeneren"
-
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/calendar/calendar-conduit.c:780
-msgid "Could not start gnomecal server"
-msgstr "Kunne ikke starte gnomecal-tjeneren"
-
-#: calendar/conduits/calendar/calendar-conduit.c:808
-#: calendar/conduits/calendar/calendar-conduit.c:811
-msgid "Could not read pilot's DateBook application block"
-msgstr "Kunne ikke lese pilotens DateBook applikasjonsblokk"
-
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:114
 #: calendar/conduits/todo/todo-conduit-control-applet.c:114
 msgid "JP Rosevear <jpr@helixcode.com>"
 msgstr "JP Rosevar <jpr@helixcode.com>"
 
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:115
 #: calendar/conduits/todo/todo-conduit-control-applet.c:115
 msgid "Original Author:"
 msgstr "Opprinnelig forfatter:"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:120
-msgid "Evolution ToDo Conduit"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:120
+#, fuzzy
+msgid "Evolution Calendar Conduit"
 msgstr "Evolution oppgaveliste-komponent"
 
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
 #: calendar/conduits/todo/todo-conduit-control-applet.c:121
 msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
 msgstr "© 1998-2000 the Free Software Foundation og Helix Code"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Configuration utility for the evolution todo conduit.\n"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+#, fuzzy
+msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Konfigurasjonsverktøy for evolutions oppgavelistekomponent.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/calendar/calendar-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:577
+msgid "Error while communicating with calendar server"
+msgstr "Feil under kommunikasjon med kalendertjeneren"
+
+#: calendar/conduits/calendar/calendar-conduit.c:701
+#: calendar/conduits/todo/todo-conduit.c:622
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat tjener"
 
-#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/calendar/calendar-conduit.c:702
+#: calendar/conduits/todo/todo-conduit.c:623
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: calendar/conduits/todo/todo-conduit.c:658
-#: calendar/conduits/todo/todo-conduit.c:661
+#: calendar/conduits/calendar/calendar-conduit.c:765
+#: calendar/conduits/calendar/calendar-conduit.c:768
+#, fuzzy
+msgid "Could not read pilot's Calendar application block"
+msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:120
+msgid "Evolution ToDo Conduit"
+msgstr "Evolution oppgaveliste-komponent"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
+msgid "Configuration utility for the evolution todo conduit.\n"
+msgstr "Konfigurasjonsverktøy for evolutions oppgavelistekomponent.\n"
+
+#: calendar/conduits/todo/todo-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:689
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:60
 msgid "Outline:"
 msgstr "Omriss:"
 
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:61
 msgid "Headings:"
 msgstr "Topptekster:"
 
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:62
 msgid "Empty days:"
 msgstr "Tomme dager:"
 
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:63
 msgid "Appointments:"
 msgstr "Avtaler:"
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:64
 msgid "Highlighted day:"
 msgstr "Merket dag:"
 
-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:65
 msgid "Day numbers:"
 msgstr "Dagnummer:"
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:66
 msgid "Current day's number:"
 msgstr "Nummer for idag:"
 
-#: calendar/gui/calendar-commands.c:66
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is not yet due:"
 msgstr "Oppgavelisteoppføring som ikke har gått ut ennå:"
 
-#: calendar/gui/calendar-commands.c:67
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is due today:"
 msgstr "Oppgavelisteoppføring som går ut idag:"
 
-#: calendar/gui/calendar-commands.c:68
+#: calendar/gui/calendar-commands.c:69
 msgid "To-Do item that is overdue:"
 msgstr "Oppgavelisteoppføring som har gått ut:"
 
-#: calendar/gui/calendar-commands.c:370
+#: calendar/gui/calendar-commands.c:396
 msgid "File not found"
 msgstr "Fil ikke funnet"
 
-#: calendar/gui/calendar-commands.c:394
+#: calendar/gui/calendar-commands.c:420
 msgid "Open calendar"
 msgstr "Åpne kalender"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:459
 msgid "Save calendar"
 msgstr "Lagre kalender"
 
-#: calendar/gui/calendar-commands.c:464
-msgid "Day"
-msgstr "Dag"
-
-#: calendar/gui/calendar-commands.c:464
-msgid "Show 1 day"
-msgstr "Vis 1 dag"
-
-#: calendar/gui/calendar-commands.c:467
-msgid "5 Days"
-msgstr "5 dager"
-
-#: calendar/gui/calendar-commands.c:467
-msgid "Show the working week"
-msgstr "Vis arbeidsuken"
-
-#: calendar/gui/calendar-commands.c:470
-msgid "Week"
-msgstr "Uke"
-
-#: calendar/gui/calendar-commands.c:470
-msgid "Show 1 week"
-msgstr "Vis 1 uke"
-
-#: calendar/gui/calendar-commands.c:473
-msgid "Month"
-msgstr "Måned"
-
-#: calendar/gui/calendar-commands.c:473
-msgid "Show 1 month"
-msgstr "Vis 1 måned"
-
-#: calendar/gui/calendar-commands.c:477
-msgid "Year"
-msgstr "År"
-
-#: calendar/gui/calendar-commands.c:477
-msgid "Show 1 year"
-msgstr "Vis 1 år"
-
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
@@ -1184,8 +1150,8 @@ msgstr ""
 
 #. strptime format for a date.
 #: calendar/gui/calendar-model.c:849 calendar/gui/calendar-model.c:897
-#: widgets/misc/e-dateedit.c:475 widgets/misc/e-dateedit.c:507
-#: widgets/misc/e-dateedit.c:664 widgets/misc/e-dateedit.c:720
+#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
+#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -1251,11 +1217,12 @@ msgstr "Ingen sammendrag tilgjengelig."
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: calendar/gui/event-editor.c:1372
+#: calendar/gui/event-editor.c:1372 ui/evolution-contact-editor.h:14
+#: ui/evolution-subscribe.h:10
 msgid "Close"
 msgstr "Lukk"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1427
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1424
 msgid "Snooze"
 msgstr "Utsett"
 
@@ -1497,11 +1464,12 @@ msgid "_Insert"
 msgstr "Sett _inn"
 
 #: calendar/gui/dialogs/task-editor.c:596 calendar/gui/event-editor.c:1335
-#: composer/e-msg-composer.c:1022
+#: composer/e-msg-composer.c:962
 msgid "F_ormat"
 msgstr "F_ormat"
 
 #: calendar/gui/dialogs/task-editor.c:597 calendar/gui/event-editor.c:1336
+#: ui/evolution-addressbook.h:12
 msgid "_Tools"
 msgstr "_Verktøy"
 
@@ -1510,6 +1478,7 @@ msgid "Actio_ns"
 msgstr "Ha_ndlinger"
 
 #: calendar/gui/dialogs/task-editor.c:624 calendar/gui/event-editor.c:1362
+#: ui/evolution-contact-editor.h:15
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
@@ -1522,6 +1491,7 @@ msgid "FIXME: Print..."
 msgstr "Skriv ut..."
 
 #: calendar/gui/dialogs/task-editor.c:630 calendar/gui/event-editor.c:1380
+#: ui/evolution-contact-editor.h:18
 msgid "Print this item"
 msgstr "Skriv ut denne oppføringen"
 
@@ -1541,11 +1511,13 @@ msgstr "Tildel oppgave..."
 msgid "Assign the task to someone"
 msgstr "Tildel oppgaven til noen"
 
-#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:324
+#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:303
 #: calendar/gui/event-editor-dialog.glade.h:92
 #: calendar/gui/event-editor.c:1367 mail/mail-config.glade.h:13
 #: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
-#: mail/mail-view.c:163
+#: mail/mail-view.c:163 ui/evolution-addressbook.h:20
+#: ui/evolution-contact-editor.h:12 ui/evolution-contact-editor.h:19
+#: ui/evolution-mail.h:59
 msgid "Delete"
 msgstr "Slett"
 
@@ -1666,9 +1638,9 @@ msgid "C_lassification:"
 msgstr "K_lassifisering"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:981
-#: widgets/misc/e-dateedit.c:332 widgets/misc/e-dateedit.c:704
-#: widgets/misc/e-dateedit.c:1027
+#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:992
+#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
+#: widgets/misc/e-dateedit.c:1171
 msgid "None"
 msgstr "Ingen"
 
@@ -1688,128 +1660,74 @@ msgstr "Fullført dato:"
 msgid "URL:"
 msgstr "URL:"
 
-#. Create the header columns
-#: calendar/gui/e-calendar-table.c:196
-msgid "Categories"
-msgstr "Kategorier"
-
-#: calendar/gui/e-calendar-table.c:197
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "Klassifisering"
-
-#: calendar/gui/e-calendar-table.c:198
-msgid "Completion date"
-msgstr "Fullført dato"
-
-#: calendar/gui/e-calendar-table.c:199
-msgid "End date"
-msgstr "Slutt-dato"
-
-#: calendar/gui/e-calendar-table.c:200
-msgid "Start date"
-msgstr "Start-dato"
-
-#: calendar/gui/e-calendar-table.c:201
-msgid "Due date"
-msgstr "Ferdig-dato"
-
-#: calendar/gui/e-calendar-table.c:202
-msgid "Geographical position"
-msgstr "Geografisk plassering"
-
-#: calendar/gui/e-calendar-table.c:203
-msgid "Percent complete"
-msgstr "Prosent fullført"
-
-#: calendar/gui/e-calendar-table.c:204 calendar/gui/prop.c:611
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/e-calendar-table.c:212
-msgid "Summary"
-msgstr "Sammendrag"
-
-#: calendar/gui/e-calendar-table.c:216
-msgid "Transparency"
-msgstr "Gjennomsiktighet"
-
-#: calendar/gui/e-calendar-table.c:217
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:219 calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarmer"
-
-#: calendar/gui/e-calendar-table.c:318
+#: calendar/gui/e-calendar-table.c:297
 msgid "Open..."
 msgstr "Åpne..."
 
-#: calendar/gui/e-calendar-table.c:319
+#: calendar/gui/e-calendar-table.c:298
 msgid "Open the task"
 msgstr "Åpne oppgaven"
 
-#: calendar/gui/e-calendar-table.c:321
+#: calendar/gui/e-calendar-table.c:300
 msgid "Mark Complete"
 msgstr "Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:322
+#: calendar/gui/e-calendar-table.c:301
 msgid "Mark the task complete"
 msgstr "Merk oppgaven som fullført"
 
-#: calendar/gui/e-calendar-table.c:325
+#: calendar/gui/e-calendar-table.c:304
 msgid "Delete the task"
 msgstr "Slett oppgaven"
 
-#: calendar/gui/e-day-view-time-item.c:393
+#: calendar/gui/e-day-view-time-item.c:406
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1173
+#: calendar/gui/e-day-view.c:1172
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1187
+#: calendar/gui/e-day-view.c:1186
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1200
+#: calendar/gui/e-day-view.c:1199
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2594 calendar/gui/e-day-view.c:2601
-#: calendar/gui/e-day-view.c:2610 calendar/gui/e-week-view.c:2958
-#: calendar/gui/e-week-view.c:2965 calendar/gui/e-week-view.c:2974
+#: calendar/gui/e-day-view.c:2632 calendar/gui/e-day-view.c:2639
+#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2935
+#: calendar/gui/e-week-view.c:2942 calendar/gui/e-week-view.c:2951
 msgid "New appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-day-view.c:2598 calendar/gui/e-day-view.c:2605
-#: calendar/gui/e-week-view.c:2962 calendar/gui/e-week-view.c:2969
+#: calendar/gui/e-day-view.c:2636 calendar/gui/e-day-view.c:2643
+#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2946
 msgid "Edit this appointment..."
 msgstr "Redigér denne avtalen..."
 
-#: calendar/gui/e-day-view.c:2599 calendar/gui/e-week-view.c:2963
+#: calendar/gui/e-day-view.c:2637 calendar/gui/e-week-view.c:2940
 #: calendar/gui/event-editor.c:1368
 msgid "Delete this appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:2606 calendar/gui/e-week-view.c:2970
+#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2947
 msgid "Make this appointment movable"
 msgstr "Gjør denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:2607 calendar/gui/e-week-view.c:2971
+#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2948
 msgid "Delete this occurrence"
 msgstr "Slett denne oppføringen"
 
-#: calendar/gui/e-day-view.c:2608 calendar/gui/e-week-view.c:2972
+#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2949
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
@@ -1853,7 +1771,8 @@ msgstr "Invitér deltakere..."
 msgid "Invite attendees to a meeting"
 msgstr "Invitér deltakere til et møte"
 
-#: calendar/gui/event-editor.c:1947
+#: calendar/gui/event-editor.c:1947 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -1901,6 +1820,10 @@ msgstr "Slutt-tid:"
 msgid "A_ll day event"
 msgstr "Varer he_le dagen"
 
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "Classification"
+msgstr "Klassifisering"
+
 #: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Pu_blic"
 msgstr "Of_fentlig"
@@ -2363,28 +2286,28 @@ msgstr "Prioritet:"
 msgid "Item Comments:"
 msgstr "Kommentarer for oppføring:"
 
-#: calendar/gui/gnome-cal.c:697 calendar/gui/gnome-cal.c:1435
-#: calendar/gui/gnome-cal.c:1491
+#: calendar/gui/gnome-cal.c:694 calendar/gui/gnome-cal.c:1432
+#: calendar/gui/gnome-cal.c:1488
 msgid "Reminder of your appointment at "
 msgstr "Påminnelse om din avtale "
 
-#: calendar/gui/gnome-cal.c:1131
+#: calendar/gui/gnome-cal.c:1128
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Kunne ikke laste kalenderen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1142
+#: calendar/gui/gnome-cal.c:1139
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Kunne ikke opprette kalender i `%s'"
 
-#: calendar/gui/gnome-cal.c:1153
+#: calendar/gui/gnome-cal.c:1150
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1440 calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1437 calendar/gui/gnome-cal.c:1492
 msgid "Ok"
 msgstr "Ok"
 
@@ -2563,55 +2486,47 @@ msgstr "Fre"
 msgid "Sa"
 msgstr "Lør"
 
-#: calendar/gui/print.c:951
-msgid "TODO Items"
-msgstr "Oppgavelisteoppføringer"
+#: calendar/gui/print.c:936
+#, fuzzy
+msgid "Tasks"
+msgstr "Oppgave"
 
 #. Day
-#: calendar/gui/print.c:1052
+#: calendar/gui/print.c:1066
 msgid "Current day (%a %b %d %Y)"
 msgstr "I dag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1072 calendar/gui/print.c:1086
-#: calendar/gui/print.c:1087
-msgid "%a"
-msgstr "%a"
+#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+#, fuzzy
+msgid "%a %b %d"
+msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1073 calendar/gui/print.c:1074
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1089
-msgid "%b"
-msgstr "%b"
+#: calendar/gui/print.c:1081
+#, fuzzy
+msgid "%a %d %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1076
-#, c-format
-msgid "Current week (%s %s %d - %s %d %d)"
+#: calendar/gui/print.c:1092
+#, fuzzy, c-format
+msgid "Current week (%s - %s)"
 msgstr "Denne uken (%s %s %d - %s %d %d)"
 
-#: calendar/gui/print.c:1093
-#, c-format
-msgid "Current week (%s %s %d - %s %s %d %d)"
-msgstr "Denne uken (%s %s %d - %s %s %d %d)"
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s %s %d %d - %s %s %d %d)"
-msgstr "Denne uken (%s %s %d %d - %s %s %d %d)"
-
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%a %Y)"
+#: calendar/gui/print.c:1100
+#, fuzzy
+msgid "Current month (%b %Y)"
 msgstr "Denne måneden (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
+#: calendar/gui/print.c:1107
 msgid "Current year (%Y)"
 msgstr "Dette året (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:1144
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:785
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:794
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -2686,6 +2601,10 @@ msgstr "Vis på oppgavelisten:"
 msgid "Due Date"
 msgstr "Ferdig-dato"
 
+#: calendar/gui/prop.c:611
+msgid "Priority"
+msgstr "Prioritet"
+
 #: calendar/gui/prop.c:612
 msgid "Time Until Due"
 msgstr "Tid før den går ut"
@@ -2718,6 +2637,10 @@ msgstr "Oppgaveliste"
 msgid "Preferences"
 msgstr "Brukervalg"
 
+#: calendar/gui/prop.c:786
+msgid "Alarms"
+msgstr "Alarmer"
+
 #. build miscellaneous box
 #: calendar/gui/prop.c:789
 msgid "Alarm Properties"
@@ -2752,7 +2675,7 @@ msgstr "Klipp ut"
 msgid "Cut selected item into clipboard"
 msgstr "Klipp ut valgt oppføring til utklippstavlen"
 
-#: composer/e-msg-composer-address-dialog.c:190
+#: composer/e-msg-composer-address-dialog.c:190 ui/evolution-mail.h:55
 msgid "Copy"
 msgstr "Kopiér"
 
@@ -2852,24 +2775,24 @@ msgstr "%.1fM"
 msgid "%.1fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:396
+#: composer/e-msg-composer-attachment-bar.c:411
 msgid "Add attachment"
 msgstr "Legg til vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:459 shell/e-shortcuts-view.c:239
+#: composer/e-msg-composer-attachment-bar.c:474 shell/e-shortcuts-view.c:239
 #: shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Fjern"
 
-#: composer/e-msg-composer-attachment-bar.c:460
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte oppføringer fra vedleggslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:506
 msgid "Add attachment..."
 msgstr "Legg til vedlegg..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:507
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
@@ -2890,39 +2813,39 @@ msgstr "MIME-type:"
 msgid "File name:"
 msgstr "Filnavn:"
 
-#: composer/e-msg-composer-hdrs.c:138 composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:140 composer/e-msg-composer-hdrs.c:298
 msgid "From:"
 msgstr "Fra:"
 
-#: composer/e-msg-composer-hdrs.c:244
+#: composer/e-msg-composer-hdrs.c:246
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: composer/e-msg-composer-hdrs.c:297
+#: composer/e-msg-composer-hdrs.c:299
 msgid "Enter the identity you wish to send this message from"
 msgstr "Skriv inn identiteten du ønsker å bruke ved sending av denne meldingen"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:303
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:308
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:313
+#: composer/e-msg-composer-hdrs.c:315
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2930,41 +2853,41 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
 "syne i mottakerlisten for meldingen."
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:322
 msgid "Enter the subject of the mail"
 msgstr "Skriv inn emnet for meldingen"
 
-#: composer/e-msg-composer.c:468
+#: composer/e-msg-composer.c:408
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:479
+#: composer/e-msg-composer.c:419
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:499
+#: composer/e-msg-composer.c:439
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:521
+#: composer/e-msg-composer.c:461
 msgid "Saving changes to message..."
 msgstr "Lagre endringer i meldingen..."
 
-#: composer/e-msg-composer.c:523
+#: composer/e-msg-composer.c:463
 msgid "About to save changes to message..."
 msgstr "Lagrer endringer til meldingen..."
 
-#: composer/e-msg-composer.c:608 shell/e-shell-view-menu.c:166
+#: composer/e-msg-composer.c:548 shell/e-shell-view-menu.c:166
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:614
+#: composer/e-msg-composer.c:554
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -2974,27 +2897,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:636
+#: composer/e-msg-composer.c:576
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:755
+#: composer/e-msg-composer.c:695
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:765
+#: composer/e-msg-composer.c:705
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:775
+#: composer/e-msg-composer.c:715
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:785
+#: composer/e-msg-composer.c:725
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Filen ser ut til å være tilgjengelig men open(2) feilet."
 
-#: composer/e-msg-composer.c:807
+#: composer/e-msg-composer.c:747
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3002,123 +2925,132 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker på at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:828
+#: composer/e-msg-composer.c:768
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:924
+#.
+#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
+#. *
+#. *  This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: composer/e-msg-composer.c:864 ui/evolution-contact-editor.h:9
+#: ui/evolution-subscribe.h:9 ui/evolution.h:13
 msgid "_File"
 msgstr "_Fil"
 
-#: composer/e-msg-composer.c:930
+#: composer/e-msg-composer.c:870
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: composer/e-msg-composer.c:931
+#: composer/e-msg-composer.c:871
 msgid "Load a previously saved message"
 msgstr "Les en tidligere lagret melding"
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:879
 msgid "_Save..."
 msgstr "_Lagre..."
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:880
 msgid "Save message"
 msgstr "Send melding"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:888
 msgid "Save _as..."
 msgstr "L_agre som..."
 
-#: composer/e-msg-composer.c:949
+#: composer/e-msg-composer.c:889
 msgid "Save message with a different name"
 msgstr "Lagre meldingen med et nytt navn"
 
-#: composer/e-msg-composer.c:957
+#: composer/e-msg-composer.c:897
 msgid "Save in _folder..."
 msgstr "Lagre i _mappe..."
 
-#: composer/e-msg-composer.c:958
+#: composer/e-msg-composer.c:898
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:907
 msgid "_Insert text file... (FIXME)"
 msgstr "Sett _inn tekstfil..."
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:908
 msgid "Insert a file as text into the message"
 msgstr "Sett inn en tekstfil i meldingen"
 
-#: composer/e-msg-composer.c:977
+#: composer/e-msg-composer.c:917
 msgid "Send _Now"
 msgstr "Send _nå"
 
-#: composer/e-msg-composer.c:978
+#: composer/e-msg-composer.c:918
 msgid "Send the message now"
 msgstr "Send meldingen nå"
 
-#: composer/e-msg-composer.c:986
+#: composer/e-msg-composer.c:926
 msgid "Send _Later"
 msgstr "Send se_nere"
 
-#: composer/e-msg-composer.c:987
+#: composer/e-msg-composer.c:927
 msgid "Send the message later"
 msgstr "Send meldingen senere"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:937
 msgid "_Close..."
 msgstr "L_ukk..."
 
-#: composer/e-msg-composer.c:998
+#: composer/e-msg-composer.c:938
 msgid "Quit the message composer"
 msgstr "Avslutt meldingsredigering"
 
-#: composer/e-msg-composer.c:1011
+#: composer/e-msg-composer.c:951 ui/evolution-subscribe.h:11 ui/evolution.h:28
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: composer/e-msg-composer.c:1028
+#: composer/e-msg-composer.c:968
 msgid "HTML"
 msgstr "HTML"
 
-#: composer/e-msg-composer.c:1029
+#: composer/e-msg-composer.c:969
 msgid "Send the mail in HTML format"
 msgstr "Send meldingen i HTML-format"
 
-#: composer/e-msg-composer.c:1042 shell/e-storage-set-view.c:221
+#: composer/e-msg-composer.c:982 shell/e-storage-set-view.c:222
+#: ui/evolution.h:15 ui/evolution.h:29
 msgid "_View"
 msgstr "_Vis"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:988
 msgid "Show _attachments"
 msgstr "Vis _vedlegg"
 
-#: composer/e-msg-composer.c:1049
+#: composer/e-msg-composer.c:989
 msgid "Show/hide attachments"
 msgstr "Vis/skjul vedlegg"
 
-#: composer/e-msg-composer.c:1082
+#: composer/e-msg-composer.c:1022
 msgid "Send"
 msgstr "Send"
 
-#: composer/e-msg-composer.c:1083
+#: composer/e-msg-composer.c:1023
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: composer/e-msg-composer.c:1092
+#: composer/e-msg-composer.c:1032
 msgid "Attach"
 msgstr "Legg ved"
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1033
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1257
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1334
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -3238,36 +3170,38 @@ msgstr "<klikk her for å velge en mappe>"
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:504
+#: filter/filter-rule.c:494
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:508
+#: filter/filter-rule.c:498
 msgid "untitled"
 msgstr "uten navn"
 
-#: filter/filter-rule.c:519
+#: filter/filter-rule.c:509
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:536
+#: filter/filter-rule.c:526
 msgid "Execute actions"
 msgstr "Utfør handlinger"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:530
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: filter/filter-rule.c:547
+#: filter/filter-rule.c:537
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er møtt"
 
-#: filter/filter-rule.c:561
-msgid "Add criterion"
-msgstr "Legg til kriterie"
+#: filter/filter-rule.c:550
+#, fuzzy
+msgid "More criterion"
+msgstr "Fjern kriterie"
 
-#: filter/filter-rule.c:567
-msgid "Remove criterion"
+#: filter/filter-rule.c:556
+#, fuzzy
+msgid "Fewer criterion"
 msgstr "Fjern kriterie"
 
 #: filter/score-editor.c:165
@@ -3282,16 +3216,32 @@ msgstr "Poenggi"
 msgid "Edit VFolder Rule"
 msgstr "Redigér VFolder regel"
 
-#: mail/component-factory.c:198
+#: mail/component-factory.c:236
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: mail/folder-browser-factory.c:50
+#: mail/component-factory.c:243
+#, fuzzy
+msgid "Cannot initialize Evolution's mail summary component."
+msgstr "Kan ikke initialisere Evolutions e-postkomponent."
+
+#: mail/component-factory.c:248
+#, fuzzy
+msgid "Cannot initialize Evolution's mail storage hash."
+msgstr "Kan ikke initialisere Evolutions e-postkomponent."
+
+#: mail/folder-browser-factory.c:53
 #, c-format
 msgid "Run filter \"%s\""
 msgstr "Kjør filter \"%s\""
 
-#: mail/folder-browser.c:408
+#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
+#: mail/folder-browser.c:488
+#, fuzzy
+msgid "Full Search"
+msgstr "Søk"
+
+#: mail/folder-browser.c:493
 msgid "Save"
 msgstr "Lagre"
 
@@ -3342,7 +3292,7 @@ msgstr ""
 "Du må konfigurere en e-post-transport\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:241
+#: mail/mail-callbacks.c:242
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3358,7 +3308,7 @@ msgstr "Flytt melding(er) til"
 msgid "Copy message(s) to"
 msgstr "Kopiér melding(er) til"
 
-#: mail/mail-callbacks.c:607
+#: mail/mail-callbacks.c:608
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3366,7 +3316,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:698
+#: mail/mail-callbacks.c:707
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3375,11 +3325,11 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:745 mail/message-list.c:1640
+#: mail/mail-callbacks.c:754 mail/message-list.c:1567
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:792
+#: mail/mail-callbacks.c:801
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
@@ -3675,249 +3625,264 @@ msgstr "Henter e-post fra %s"
 msgid "Fetch email from %s"
 msgstr "Hent e-post fra %s"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:173
+#, fuzzy, c-format
+msgid "Retrieving message %d of %d"
+msgstr "Henter melding %d av %d (uid \"%s\")"
+
+#: mail/mail-ops.c:237
+#, fuzzy, c-format
+msgid "Retrieving messages : %s"
+msgstr "Henter melding %d av %d (uid \"%s\")"
+
+#: mail/mail-ops.c:373
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ingen ny e-post på %s."
 
-#: mail/mail-ops.c:312
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtrering av post etter behov"
 
-#: mail/mail-ops.c:314
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Fi_ltrér e-post ved behov"
 
-#: mail/mail-ops.c:481
+#: mail/mail-ops.c:637
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:486
+#: mail/mail-ops.c:642
 msgid "Sending a message without a subject"
 msgstr "Sender en melding uten emne"
 
-#: mail/mail-ops.c:489
+#: mail/mail-ops.c:645
 #, c-format
 msgid "Send \"%s\""
 msgstr "Send \"%s\""
 
-#: mail/mail-ops.c:492
+#: mail/mail-ops.c:648
 msgid "Send a message without a subject"
 msgstr "Send en melding uten emne"
 
-#: mail/mail-ops.c:636
+#: mail/mail-ops.c:792
 msgid "Sending queue"
 msgstr "Sender kø"
 
-#: mail/mail-ops.c:638
+#: mail/mail-ops.c:794
 msgid "Send queue"
 msgstr "Send kø"
 
-#: mail/mail-ops.c:774 mail/mail-ops.c:781
+#: mail/mail-ops.c:930 mail/mail-ops.c:937
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Legger til \"%s\""
 
-#: mail/mail-ops.c:778 mail/mail-ops.c:784
+#: mail/mail-ops.c:934 mail/mail-ops.c:940
 msgid "Appending a message without a subject"
 msgstr "Legger til en melding uten emne"
 
-#: mail/mail-ops.c:856
+#: mail/mail-ops.c:1012
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Fjerner \"%s\""
 
-#: mail/mail-ops.c:858
+#: mail/mail-ops.c:1014
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Fjern \"%s\""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:1073
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flytter meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:1075
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierer meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:1078
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytt meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:924
+#: mail/mail-ops.c:1080
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiér meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:954
+#: mail/mail-ops.c:1111
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:957
+#: mail/mail-ops.c:1114
 msgid "Copying"
 msgstr "Kopiérer"
 
-#: mail/mail-ops.c:969
+#: mail/mail-ops.c:1134
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1046
+#: mail/mail-ops.c:1213
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Merker meldinger i mappe \"%s"
 
-#: mail/mail-ops.c:1049
+#: mail/mail-ops.c:1216
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Merk meldinger i mappe \"%s\""
 
-#: mail/mail-ops.c:1192
+#: mail/mail-ops.c:1247
+#, fuzzy, c-format
+msgid "Marking message %d of %d"
+msgstr "Merker meldinger i mappe \"%s"
+
+#: mail/mail-ops.c:1367
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1195
+#: mail/mail-ops.c:1370
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Skann foldere i \"%s\""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1441
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1501
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Legger ved meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:1325
+#: mail/mail-ops.c:1504
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Legg ved meldinger fra \"%s\""
 
-#: mail/mail-ops.c:1428
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Videresender meldinger \"%s\""
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1612
 msgid "Forwarding a message without a subject"
 msgstr "Videresender en melding uten emne"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1615
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Videresend meldingen \"%s\""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1620
 msgid "Forward a message without a subject"
 msgstr "Videresend en melding uten emne"
 
-#: mail/mail-ops.c:1470
+#: mail/mail-ops.c:1657
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1674
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "Kunne ikke generere MIME-del fra melding under generering av videresendt "
 "melding."
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1760
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Laster \"%s\""
 
-#: mail/mail-ops.c:1571
+#: mail/mail-ops.c:1762
 #, c-format
 msgid "Load \"%s\""
 msgstr "Last \"%s\""
 
-#: mail/mail-ops.c:1673
+#: mail/mail-ops.c:1864
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Oppretter \"%s\""
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1866
 #, c-format
 msgid "Create \"%s\""
 msgstr "Opprett \"%s\""
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1912
 msgid "Exception while reporting result to shell component listener."
 msgstr "Unntak under rapportering av resultat til skallkomponentens lytter."
 
-#: mail/mail-ops.c:1767
+#: mail/mail-ops.c:1958
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkroniserer \"%s\""
 
-#: mail/mail-ops.c:1769
+#: mail/mail-ops.c:1960
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synkronisér \"%s\""
 
-#: mail/mail-ops.c:1832
+#: mail/mail-ops.c:2023
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Viser melding-UID \"%s\""
 
-#: mail/mail-ops.c:1835
+#: mail/mail-ops.c:2026
 msgid "Clearing message display"
 msgstr "Tømmer meldingsvisning"
 
-#: mail/mail-ops.c:1838
+#: mail/mail-ops.c:2029
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Vis meldings-UID \"%s\""
 
-#: mail/mail-ops.c:1841
+#: mail/mail-ops.c:2032
 msgid "Clear message display"
 msgstr "Tøm meldingsvisning"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:2141
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Åpner meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:1953
+#: mail/mail-ops.c:2144
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Åpne meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2057
+#: mail/mail-ops.c:2248
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Laster %s-mappe"
 
-#: mail/mail-ops.c:2059
+#: mail/mail-ops.c:2250
 #, c-format
 msgid "Load %s Folder"
 msgstr "Last %s-mappe"
 
-#: mail/mail-ops.c:2124
+#: mail/mail-ops.c:2315
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Viser meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2318
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Vis meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2153
+#: mail/mail-ops.c:2344
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Henter melding %d av %d (uid \"%s\")"
 
-#: mail/mail-threads.c:274
+#: mail/mail-threads.c:299
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -3926,7 +3891,7 @@ msgstr ""
 "Feil under forberedelser til %s:\n"
 "%s"
 
-#: mail/mail-threads.c:623
+#: mail/mail-threads.c:648
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -3935,67 +3900,67 @@ msgstr ""
 "Feil under `%s':\n"
 "%s"
 
-#: mail/mail-threads.c:676
+#: mail/mail-threads.c:701
 msgid "Incomplete message written on pipe!"
 msgstr "Uferdig melding skrevet på rør!"
 
-#: mail/mail-threads.c:680
+#: mail/mail-threads.c:705
 msgid "Error reading commands from dispatching thread."
 msgstr "Feil under lesing av kommandoer fra utsender-tråd."
 
-#: mail/mail-threads.c:745
+#: mail/mail-threads.c:770
 msgid "Corrupted message from dispatching thread?"
 msgstr "Korrupt melding fra utsender-tråd?"
 
-#: mail/mail-threads.c:856
+#: mail/mail-threads.c:889
 msgid "Could not create dialog box."
 msgstr "Kan ikke opprette dialogboks."
 
-#: mail/mail-threads.c:865
+#: mail/mail-threads.c:899
 msgid "User cancelled query."
 msgstr "Spørring avbrutt av bruker."
 
-#: mail/mail-tools.c:206
+#: mail/mail-tools.c:207
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunne ikke opprette midlertidig mbox `%s': %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:291
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 "Kunne ikke lese bufferfil for UID \"%s\". Du kan motta dupliserte meldinger."
 
-#: mail/mail-tools.c:387
+#: mail/mail-tools.c:384
 #, c-format
 msgid "[%s] %s"
 msgstr "[%s] %s"
 
-#: mail/mail-tools.c:389
+#: mail/mail-tools.c:386
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (videresendt melding)"
 
-#: mail/mail-tools.c:398
+#: mail/mail-tools.c:395
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (uten emne)"
 
-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:432
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:434
 msgid "Forwarded message (no subject)"
 msgstr "Videresendt melding (uten emne)"
 
-#: mail/mail-tools.c:556
+#: mail/mail-tools.c:546
 #, c-format
 msgid "Don't know protocol to open URI `%s'"
 msgstr "Ingen protokoll for åpning av URI `%s'"
 
-#: mail/mail-tools.c:585
+#: mail/mail-tools.c:575
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4004,129 +3969,106 @@ msgstr ""
 "Kan ikk åpne lokasjon `%s':\n"
 "%s"
 
-#: mail/mail-vfolder.c:302
+#: mail/mail-vfolder.c:291
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:151
+#: mail/mail-view.c:151 ui/evolution-mail.h:47
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:151
+#: mail/mail-view.c:151 ui/evolution-mail.h:48
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/mail-view.c:154 mail/message-list.c:1643
+#: mail/mail-view.c:154 mail/message-list.c:1570 ui/evolution-mail.h:49
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/mail-view.c:154
+#: mail/mail-view.c:154 ui/evolution-mail.h:50
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/mail-view.c:157
+#: mail/mail-view.c:157 ui/evolution-mail.h:51
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/mail-view.c:157
+#: mail/mail-view.c:157 ui/evolution-mail.h:52
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/mail-view.c:161
+#: mail/mail-view.c:161 ui/evolution-addressbook.h:18
+#: ui/evolution-calendar.h:24 ui/evolution-mail.h:57
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/mail-view.c:161
+#: mail/mail-view.c:161 ui/evolution-mail.h:58
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/mail-view.c:163
+#: mail/mail-view.c:163 ui/evolution-mail.h:60
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:967
-msgid "From"
-msgstr "Fra"
-
-#: mail/message-list.c:974
-msgid "Subject"
-msgstr "Emne"
-
-#: mail/message-list.c:981
-msgid "Date"
-msgstr "Dato"
-
-#: mail/message-list.c:988
-msgid "Received"
-msgstr "Mottatt"
-
-#: mail/message-list.c:995
-msgid "To"
-msgstr "Til"
-
-#: mail/message-list.c:1002
-msgid "Size"
-msgstr "Størrelse"
-
-#: mail/message-list.c:1638
+#: mail/message-list.c:1565
 msgid "Open in New Window"
 msgstr "Åpne i nytt vindu"
 
-#: mail/message-list.c:1639
+#: mail/message-list.c:1566
 msgid "Edit Message"
 msgstr "Redigér melding"
 
-#: mail/message-list.c:1642
+#: mail/message-list.c:1569
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: mail/message-list.c:1644
+#: mail/message-list.c:1571
 msgid "Forward Message"
 msgstr "Videresend melding"
 
-#: mail/message-list.c:1646
+#: mail/message-list.c:1573
 msgid "Delete Message"
 msgstr "Slett melding"
 
-#: mail/message-list.c:1647
+#: mail/message-list.c:1574
 msgid "Move Message"
 msgstr "Flytt melding"
 
-#: mail/message-list.c:1648
+#: mail/message-list.c:1575
 msgid "Copy Message"
 msgstr "Kopiér melding"
 
-#: mail/message-list.c:1650
+#: mail/message-list.c:1577
 msgid "VFolder on Subject"
 msgstr "VFolder for emne"
 
-#: mail/message-list.c:1651
+#: mail/message-list.c:1578
 msgid "VFolder on Sender"
 msgstr "VFolder for sender"
 
-#: mail/message-list.c:1652
+#: mail/message-list.c:1579
 msgid "VFolder on Recipients"
 msgstr "VFolder for mottakere"
 
-#: mail/message-list.c:1654
+#: mail/message-list.c:1581
 msgid "Filter on Subject"
 msgstr "Filtrér etter emne"
 
-#: mail/message-list.c:1655
+#: mail/message-list.c:1582
 msgid "Filter on Sender"
 msgstr "Filtrér etter sender"
 
-#: mail/message-list.c:1656
+#: mail/message-list.c:1583
 msgid "Filter on Recipients"
 msgstr "Filtrér etter mottaker"
 
-#: mail/message-list.c:1657 mail/message-list.c:1680
+#: mail/message-list.c:1584 mail/message-list.c:1607
 msgid "Filter on Mailing List"
 msgstr "Filtrér etter e-postliste"
 
-#: mail/message-list.c:1682
+#: mail/message-list.c:1609
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrér etter e-postliste (%s)"
@@ -4248,24 +4190,31 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljøet."
 
-#: shell/e-shell-view-menu.c:325
+#: shell/e-shell-view-menu.c:331
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view.c:130
+#: shell/e-shell-view.c:134
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:409
+#: shell/e-shell-view.c:413
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:985
+#: shell/e-shell-view.c:996
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:331
+#: shell/e-shell-view.c:1136
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+
+#: shell/e-shell.c:334
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
@@ -4391,7 +4340,7 @@ msgstr "Spesifisert type er ikke støttet for dette lageret"
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: shell/e-storage-set-view.c:221
+#: shell/e-storage-set-view.c:222
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
@@ -4450,6 +4399,622 @@ msgstr "Kan ikke initialisere Evolution skallet."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
+#.
+#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
+#. *
+#. *  This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: ui/evolution-addressbook-ldap.h:9
+#, fuzzy
+msgid "_Actions"
+msgstr "Ha_ndlinger"
+
+#: ui/evolution-addressbook-ldap.h:10
+#, fuzzy
+msgid "N_ew Directory Server"
+msgstr "News-tjenere"
+
+#.
+#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
+#. *
+#. *  This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: ui/evolution-addressbook.h:9
+#, fuzzy
+msgid "_Print Contacts..."
+msgstr "_Kontakter..."
+
+#: ui/evolution-addressbook.h:11
+#, fuzzy
+msgid "_New Contact"
+msgstr "Slett kontakt?"
+
+#: ui/evolution-addressbook.h:13
+msgid "_Search for contacts"
+msgstr ""
+
+#: ui/evolution-addressbook.h:14 ui/evolution-calendar.h:22
+#, fuzzy
+msgid "New"
+msgstr "Ny..."
+
+#: ui/evolution-addressbook.h:15
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Opprett en ny snarveigruppe"
+
+#: ui/evolution-addressbook.h:16
+#, fuzzy
+msgid "Find"
+msgstr "Finn..."
+
+#: ui/evolution-addressbook.h:17
+msgid "Find a contact"
+msgstr ""
+
+#: ui/evolution-addressbook.h:19
+msgid "Print contacts"
+msgstr ""
+
+#: ui/evolution-addressbook.h:21
+#, fuzzy
+msgid "Delete a contact"
+msgstr "Slett kontakt?"
+
+#: ui/evolution-addressbook.h:22
+#, fuzzy
+msgid "View All"
+msgstr "Vis \"inline\""
+
+#: ui/evolution-addressbook.h:23
+msgid "View all contacts"
+msgstr ""
+
+#: ui/evolution-addressbook.h:24
+msgid "Stop"
+msgstr ""
+
+#: ui/evolution-addressbook.h:25
+#, fuzzy
+msgid "Stop Loading"
+msgstr "Skyggelegging"
+
+#.
+#. *  This file is autogenerated from evolution-calendar.xml, do not edit
+#. *
+#. *  This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: ui/evolution-calendar.h:9 ui/evolution.h:14
+#, fuzzy
+msgid "_New"
+msgstr "_Vis"
+
+#: ui/evolution-calendar.h:10
+#, fuzzy
+msgid "New Ca_lendar"
+msgstr "Åpne kalender"
+
+#: ui/evolution-calendar.h:11
+#, fuzzy
+msgid "Create a new calendar"
+msgstr "Åpne kalender"
+
+#: ui/evolution-calendar.h:12
+#, fuzzy
+msgid "_Open"
+msgstr "_Åpne..."
+
+#: ui/evolution-calendar.h:13
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "Åpne kalender"
+
+#: ui/evolution-calendar.h:14
+#, fuzzy
+msgid "Open a calendar"
+msgstr "Åpne kalender"
+
+#: ui/evolution-calendar.h:15
+#, fuzzy
+msgid "_Save Calendar As"
+msgstr "Lagre kalender"
+
+#: ui/evolution-calendar.h:16
+msgid "Save calendar As something else"
+msgstr ""
+
+#: ui/evolution-calendar.h:17
+#, fuzzy
+msgid "_Print this calendar"
+msgstr "Skriv ut kalender"
+
+#: ui/evolution-calendar.h:18
+#, fuzzy
+msgid "_New appointment..."
+msgstr "Ny avtale..."
+
+#: ui/evolution-calendar.h:19 ui/evolution-calendar.h:23
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "Slett denne avtalen"
+
+#: ui/evolution-calendar.h:20
+#, fuzzy
+msgid "Calendar Preferences..."
+msgstr "Brukervalg"
+
+#: ui/evolution-calendar.h:21
+#, fuzzy
+msgid "Alter preferences"
+msgstr "Brukervalg"
+
+#: ui/evolution-calendar.h:25
+#, fuzzy
+msgid "Print this calendar"
+msgstr "Skriv ut kalender"
+
+#: ui/evolution-calendar.h:26
+#, fuzzy
+msgid "Prev"
+msgstr "Forhåndsvis:"
+
+#: ui/evolution-calendar.h:27
+msgid "Go back in time"
+msgstr ""
+
+#: ui/evolution-calendar.h:28 widgets/misc/e-dateedit.c:331
+msgid "Today"
+msgstr "Idag"
+
+#: ui/evolution-calendar.h:29
+#, fuzzy
+msgid "Go to present time"
+msgstr "Gå til neste oppføring"
+
+#: ui/evolution-calendar.h:30
+#, fuzzy
+msgid "Next"
+msgstr "Nes_te"
+
+#: ui/evolution-calendar.h:31
+msgid "Go forward in time"
+msgstr ""
+
+#: ui/evolution-calendar.h:32
+#, fuzzy
+msgid "Go to"
+msgstr "Gå til dato"
+
+#: ui/evolution-calendar.h:33
+#, fuzzy
+msgid "Go to a specific date"
+msgstr "Gå til dato"
+
+#: ui/evolution-calendar.h:34
+msgid "Day"
+msgstr "Dag"
+
+#: ui/evolution-calendar.h:35
+msgid "Show 1 day"
+msgstr "Vis 1 dag"
+
+#: ui/evolution-calendar.h:36
+msgid "5 Days"
+msgstr "5 dager"
+
+#: ui/evolution-calendar.h:37
+msgid "Show the working week"
+msgstr "Vis arbeidsuken"
+
+#: ui/evolution-calendar.h:38
+msgid "Week"
+msgstr "Uke"
+
+#: ui/evolution-calendar.h:39
+msgid "Show 1 week"
+msgstr "Vis 1 uke"
+
+#: ui/evolution-calendar.h:40
+msgid "Month"
+msgstr "Måned"
+
+#: ui/evolution-calendar.h:41
+msgid "Show 1 month"
+msgstr "Vis 1 måned"
+
+#: ui/evolution-contact-editor.h:10
+#, fuzzy
+msgid "_Save"
+msgstr "Lagre"
+
+#: ui/evolution-contact-editor.h:11
+#, fuzzy
+msgid "Save _As"
+msgstr "L_agre som..."
+
+#: ui/evolution-contact-editor.h:13
+#, fuzzy
+msgid "_Print"
+msgstr "Skriv ut"
+
+#: ui/evolution-contact-editor.h:16
+#, fuzzy
+msgid "Save the contact and close the dialog box"
+msgstr "Lagre oppgaven og lukk dialogboksen"
+
+#: ui/evolution-contact-editor.h:17
+#, fuzzy
+msgid "Print..."
+msgstr "Skriv ut"
+
+#: ui/evolution-contact-editor.h:20
+#, fuzzy
+msgid "Delete this item"
+msgstr "Slett denne oppgaven"
+
+#.
+#. *  This file is autogenerated from evolution-mail.xml, do not edit
+#. *
+#. *  This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: ui/evolution-mail.h:9
+msgid "_Threaded"
+msgstr ""
+
+#: ui/evolution-mail.h:10
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Videresendt melding - %s"
+
+#: ui/evolution-mail.h:11
+#, fuzzy
+msgid "Print message..."
+msgstr "Skriv ut melding"
+
+#: ui/evolution-mail.h:12
+msgid "Print message to the printer"
+msgstr ""
+
+#: ui/evolution-mail.h:13
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "Forhåndsvisning av utskrift"
+
+#: ui/evolution-mail.h:14
+#, fuzzy
+msgid "Previews the message to be printed"
+msgstr "Send meldingen senere"
+
+#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:12
+#, fuzzy
+msgid "Select _All"
+msgstr "Velg mappe"
+
+#: ui/evolution-mail.h:16
+msgid "_Invert Selection"
+msgstr ""
+
+#: ui/evolution-mail.h:17
+#, fuzzy
+msgid "Mail _Filters..."
+msgstr "_Fil..."
+
+#: ui/evolution-mail.h:18
+msgid "_Virtual Folder Editor..."
+msgstr ""
+
+#: ui/evolution-mail.h:19
+#, fuzzy
+msgid "_Mail Configuration..."
+msgstr "E-post-konfigurasjon"
+
+#: ui/evolution-mail.h:20
+msgid "Manage Subscriptions..."
+msgstr ""
+
+#: ui/evolution-mail.h:21
+msgid "Forget _Passwords"
+msgstr ""
+
+#: ui/evolution-mail.h:22
+#, fuzzy
+msgid "_Message"
+msgstr "Redigér melding"
+
+#: ui/evolution-mail.h:23
+#, fuzzy
+msgid "_Open in New Window"
+msgstr "Åpne i nytt vindu"
+
+#: ui/evolution-mail.h:24
+#, fuzzy
+msgid "_Edit Message"
+msgstr "Redigér melding"
+
+#: ui/evolution-mail.h:25
+#, fuzzy
+msgid "_Print Message"
+msgstr "Skriv ut melding"
+
+#: ui/evolution-mail.h:26
+#, fuzzy
+msgid "Reply to _Sender"
+msgstr "Svar til sender"
+
+#: ui/evolution-mail.h:27
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Svar til alle"
+
+#: ui/evolution-mail.h:28
+#, fuzzy
+msgid "_Forward"
+msgstr "Videresend"
+
+#: ui/evolution-mail.h:29
+msgid "Mar_k As Read"
+msgstr ""
+
+#: ui/evolution-mail.h:30
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "Merk som ulest"
+
+#: ui/evolution-mail.h:32
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "_Flytt til mappe..."
+
+#: ui/evolution-mail.h:33
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Kopiér til mappe..."
+
+#: ui/evolution-mail.h:34
+#, fuzzy
+msgid "_VFolder on Subject"
+msgstr "VFolder for emne"
+
+#: ui/evolution-mail.h:35
+#, fuzzy
+msgid "VFolder on Se_nder"
+msgstr "VFolder for sender"
+
+#: ui/evolution-mail.h:36
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "VFolder for mottakere"
+
+#: ui/evolution-mail.h:37
+#, fuzzy
+msgid "_Filter on Subject"
+msgstr "Filtrér etter emne"
+
+#: ui/evolution-mail.h:38
+#, fuzzy
+msgid "Fi_lter on Sender"
+msgstr "Filtrér etter sender"
+
+#: ui/evolution-mail.h:39
+#, fuzzy
+msgid "Filter on Rec_ipients"
+msgstr "Filtrér etter mottaker"
+
+#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:14
+#, fuzzy
+msgid "F_older"
+msgstr "Mapper"
+
+#: ui/evolution-mail.h:41
+#, fuzzy
+msgid "_Expunge"
+msgstr "Fjern \"%s\""
+
+#: ui/evolution-mail.h:42
+msgid "_Configure Folder"
+msgstr ""
+
+#: ui/evolution-mail.h:43
+#, fuzzy
+msgid "Get Mail"
+msgstr "Detaljer"
+
+#: ui/evolution-mail.h:44
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
+
+#: ui/evolution-mail.h:45
+#, fuzzy
+msgid "Compose"
+msgstr "Lukk"
+
+#: ui/evolution-mail.h:46
+#, fuzzy
+msgid "Compose a new message"
+msgstr "Skriv en melding"
+
+#: ui/evolution-mail.h:53
+#, fuzzy
+msgid "Move"
+msgstr "Man"
+
+#: ui/evolution-mail.h:54
+#, fuzzy
+msgid "Move message to a new folder"
+msgstr "Lagre meldingen i en spesifisert mappe"
+
+#: ui/evolution-mail.h:56
+#, fuzzy
+msgid "Copy message to a new folder"
+msgstr "Kopiér melding(er) til"
+
+#: ui/evolution-subscribe.h:13
+msgid "_Unselect All"
+msgstr ""
+
+#: ui/evolution-subscribe.h:15 ui/evolution-subscribe.h:17
+msgid "Subscribe"
+msgstr ""
+
+#: ui/evolution-subscribe.h:16 ui/evolution-subscribe.h:19
+msgid "Unsubscribe"
+msgstr ""
+
+#: ui/evolution-subscribe.h:18
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.h:20
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.h:21
+msgid "Refresh List"
+msgstr ""
+
+#: ui/evolution-subscribe.h:22
+msgid "Refresh List of Folders"
+msgstr ""
+
+#.
+#. *  This file is autogenerated from evolution.xml, do not edit
+#. *
+#. *  This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: ui/evolution.h:9
+#, fuzzy
+msgid "Show the _Shortcut Bar"
+msgstr "Vis snarveier som store ikoner"
+
+#: ui/evolution.h:10
+#, fuzzy
+msgid "Toggle whether to show the shortcut bar"
+msgstr "Fjern denne snarveien fra snarveilinjen"
+
+#: ui/evolution.h:11
+msgid "Show the _Folder Bar"
+msgstr ""
+
+#: ui/evolution.h:12
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: ui/evolution.h:16
+#, fuzzy
+msgid "_Folder"
+msgstr "Mapper"
+
+#: ui/evolution.h:17
+#, fuzzy
+msgid "Evolution bar _shortcut"
+msgstr "Evolution - %s"
+
+#: ui/evolution.h:18
+msgid "_Mail message (FIXME)"
+msgstr ""
+
+#: ui/evolution.h:19
+#, fuzzy
+msgid "_Appointment (FIXME)"
+msgstr "Avtaler:"
+
+#: ui/evolution.h:20
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "Kontaktredigering"
+
+#: ui/evolution.h:21
+msgid "_Task (FIXME)"
+msgstr ""
+
+#: ui/evolution.h:22
+#, fuzzy
+msgid "_Go to Folder..."
+msgstr "Gå til mappe..."
+
+#: ui/evolution.h:23
+msgid "Display a different folder"
+msgstr ""
+
+#: ui/evolution.h:24
+#, fuzzy
+msgid "_Create New Folder..."
+msgstr "Ny VFolder"
+
+#: ui/evolution.h:25
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Evolution - Lag ny mappe"
+
+#: ui/evolution.h:26
+#, fuzzy
+msgid "E_xit"
+msgstr "Linje:"
+
+#: ui/evolution.h:27
+msgid "Exit the program"
+msgstr ""
+
+#: ui/evolution.h:30
+#, fuzzy
+msgid "_Settings"
+msgstr "Prøv ut innstillinger"
+
+#: ui/evolution.h:31
+#, fuzzy
+msgid "_Help"
+msgstr "_Hjemme"
+
+#: ui/evolution.h:32
+#, fuzzy
+msgid "_Index"
+msgstr "Sett _inn"
+
+#: ui/evolution.h:33
+#, fuzzy
+msgid "Getting _Started"
+msgstr "Ikke startet"
+
+#: ui/evolution.h:34
+msgid "Using the _Mailer"
+msgstr ""
+
+#: ui/evolution.h:35
+#, fuzzy
+msgid "Using the _Calendar"
+msgstr "Skriv ut kalender"
+
+#: ui/evolution.h:36
+msgid "Using the C_ontact Manager"
+msgstr ""
+
+#: ui/evolution.h:37
+msgid "_Submit Bug Report"
+msgstr ""
+
+#: ui/evolution.h:38
+msgid "Submit bug report using Bug Buddy"
+msgstr ""
+
+#: ui/evolution.h:39
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Evolution"
+
+#: ui/evolution.h:40
+msgid "Show information about Evolution"
+msgstr ""
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Tentativ"
@@ -4539,7 +5104,7 @@ msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2670
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -4547,23 +5112,21 @@ msgstr "%B %Y"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:320
+#: widgets/misc/e-dateedit.c:325
 msgid "Now"
 msgstr "nå"
 
-#: widgets/misc/e-dateedit.c:326
-msgid "Today"
-msgstr "Idag"
-
 #. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:636 widgets/misc/e-dateedit.c:726
-#: widgets/misc/e-dateedit.c:983
+#: widgets/misc/e-dateedit.c:641 widgets/misc/e-dateedit.c:731
+#: widgets/misc/e-dateedit.c:768 widgets/misc/e-dateedit.c:813
+#: widgets/misc/e-dateedit.c:1127
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:639 widgets/misc/e-dateedit.c:729
-#: widgets/misc/e-dateedit.c:986
+#: widgets/misc/e-dateedit.c:644 widgets/misc/e-dateedit.c:734
+#: widgets/misc/e-dateedit.c:771 widgets/misc/e-dateedit.c:816
+#: widgets/misc/e-dateedit.c:1130
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -4571,3 +5134,102 @@ msgstr "%I:%M %p"
 #, c-format
 msgid "Group %i"
 msgstr "Gruppe %i"
+
+#~ msgid "_Street Address:"
+#~ msgstr "_Gateadresse:"
+
+#~ msgid ""
+#~ "USA\n"
+#~ "Canada\n"
+#~ "Finland\n"
+#~ msgstr ""
+#~ "USA\n"
+#~ "Kanada\n"
+#~ "Finland\n"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Klikk her for å legge til en kontakt *"
+
+#~ msgid "Gpilotd calendar conduit"
+#~ msgstr "Gpilotd kalenderkomponent"
+
+#~ msgid "Configuration utility for the calendar conduit.\n"
+#~ msgstr "Konfigurasjonsverktøy for kalenderkomponenten.\n"
+
+#~ msgid "Could not start gnomecal server"
+#~ msgstr "Kunne ikke starte gnomecal-tjeneren"
+
+#~ msgid "Could not read pilot's DateBook application block"
+#~ msgstr "Kunne ikke lese pilotens DateBook applikasjonsblokk"
+
+#~ msgid "Year"
+#~ msgstr "År"
+
+#~ msgid "Show 1 year"
+#~ msgstr "Vis 1 år"
+
+#~ msgid "Categories"
+#~ msgstr "Kategorier"
+
+#~ msgid "Completion date"
+#~ msgstr "Fullført dato"
+
+#~ msgid "End date"
+#~ msgstr "Slutt-dato"
+
+#~ msgid "Start date"
+#~ msgstr "Start-dato"
+
+#~ msgid "Due date"
+#~ msgstr "Ferdig-dato"
+
+#~ msgid "Geographical position"
+#~ msgstr "Geografisk plassering"
+
+#~ msgid "Percent complete"
+#~ msgstr "Prosent fullført"
+
+#~ msgid "Summary"
+#~ msgstr "Sammendrag"
+
+#~ msgid "Transparency"
+#~ msgstr "Gjennomsiktighet"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "TODO Items"
+#~ msgstr "Oppgavelisteoppføringer"
+
+#~ msgid "%a"
+#~ msgstr "%a"
+
+#~ msgid "%b"
+#~ msgstr "%b"
+
+#~ msgid "Current week (%s %s %d - %s %s %d %d)"
+#~ msgstr "Denne uken (%s %s %d - %s %s %d %d)"
+
+#~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
+#~ msgstr "Denne uken (%s %s %d %d - %s %s %d %d)"
+
+#~ msgid "Add criterion"
+#~ msgstr "Legg til kriterie"
+
+#~ msgid "From"
+#~ msgstr "Fra"
+
+#~ msgid "Subject"
+#~ msgstr "Emne"
+
+#~ msgid "Date"
+#~ msgstr "Dato"
+
+#~ msgid "Received"
+#~ msgstr "Mottatt"
+
+#~ msgid "To"
+#~ msgstr "Til"
+
+#~ msgid "Size"
+#~ msgstr "Størrelse"