Updated Norwegian translation.

2000-09-19  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian translation.

svn path=/trunk/; revision=5509

3 files changed, 891 insertions, 1147 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 7dc1af0347..f5a5f863ba 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-19  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+	
 2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
 
 	* POTFILES.in: Removed files that have been moved to gal.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0c66261967..4a5beef98b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,12 +8,14 @@ addressbook/contact-editor/categories-strings.h
 addressbook/contact-editor/e-contact-editor.c
 addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h
 addressbook/contact-editor/e-contact-editor-strings.h
+addressbook/contact-editor/fulladdr.glade.h
 addressbook/contact-editor/fullname-strings.h
 addressbook/gui/component/addressbook-factory.c
 addressbook/gui/component/addressbook.c
 addressbook/gui/component/e-ldap-storage.c
 addressbook/gui/component/ldap-server-dialog.glade.h
 addressbook/gui/component/select-names/select-names.glade.h
+addressbook/gui/widgets/e-addressbook-view.c
 addressbook/gui/widgets/e-minicard-control.c
 addressbook/gui/widgets/e-minicard-view.c
 addressbook/gui/widgets/e-minicard.c
@@ -37,6 +39,7 @@ calendar/gui/e-day-view-time-item.c
 calendar/gui/e-day-view.c
 calendar/gui/e-week-view.c
 calendar/gui/event-editor.c
+calendar/gui/event-editor-dialog.glade.h
 calendar/gui/getdate.y
 calendar/gui/gncal-todo.c
 calendar/gui/gnome-cal.c
@@ -60,17 +63,23 @@ filter/filter-folder.c
 filter/filter-part.c
 filter/filter-rule.c
 filter/score-editor.c
+filter/score-rule.c
 filter/vfolder-editor.c
 filter/vfolder-rule.c
 libversit/vobject.c
 mail/component-factory.c
 mail/folder-browser-factory.c
 mail/folder-browser.c
+mail/mail-autofilter.c
 mail/mail-callbacks.c
 mail/mail-config-gui.c
+mail/mail-config-druid.glade.h
+mail/mail-config.glade.h
 mail/mail-config.c
 mail/mail-crypto.c
+mail/mail-display.c
 mail/mail-local.c
+mail/mail-local-storage.c
 mail/mail-ops.c
 mail/mail-threads.c
 mail/mail-tools.c
@@ -91,6 +100,8 @@ shell/e-storage.c
 shell/e-storage-set-view.c
 shell/main.c
 widgets/meeting-time-sel/e-meeting-time-sel.c
+widgets/misc/e-calendar.c
 widgets/misc/e-calendar-item.c
 widgets/misc/e-clipped-label.c
+widgets/misc/e-dateedit.c
 widgets/shortcut-bar/e-group-bar.c
diff --git a/po/no.po b/po/no.po
index 835267bb95..733974e12c 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.4\n"
-"POT-Creation-Date: 2000-09-11 10:04+0200\n"
-"PO-Revision-Date: 2000-09-11 10:05+02:00\n"
+"POT-Creation-Date: 2000-09-19 22:20+0200\n"
+"PO-Revision-Date: 2000-09-19 23:00+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,10 +18,9 @@ msgstr ""
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1215
-#: addressbook/gui/component/addressbook-factory.c:37
-#: addressbook/gui/minicard/test-minicard-view.c:45
+#: addressbook/gui/component/addressbook-factory.c:38
 #: calendar/conduits/calendar/calendar-conduit.c:1673
-#: calendar/conduits/todo/todo-conduit.c:1129 calendar/gui/main.c:55
+#: calendar/conduits/todo/todo-conduit.c:1196 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -31,43 +30,43 @@ msgstr "Kunne ikke initialisere Bonobo"
 #.
 #: addressbook/conduit/address-conduit-control-applet.c:54
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
-#: calendar/conduits/todo/todo-conduit-control-applet.c:51
+#: 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/todo/todo-conduit-control-applet.c:52
+#: 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/todo/todo-conduit-control-applet.c:53
+#: 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/todo/todo-conduit-control-applet.c:54
+#: 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/todo/todo-conduit-control-applet.c:55
+#: 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/todo/todo-conduit-control-applet.c:56
+#: 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/todo/todo-conduit-control-applet.c:94
+#: calendar/conduits/todo/todo-conduit-control-applet.c:116
 msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
@@ -77,7 +76,6 @@ msgstr "Gpilotd addressekomponent"
 
 #: addressbook/conduit/address-conduit-control-applet.c:146
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
-#: calendar/conduits/todo/todo-conduit-control-applet.c:97
 msgid "(C) 1998 the Free Software Foundation"
 msgstr "(C) 1998 the Free Software Foundation"
 
@@ -87,19 +85,19 @@ 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/todo/todo-conduit-control-applet.c:100
+#: 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/todo/todo-conduit-control-applet.c:131
+#: 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/todo/todo-conduit-control-applet.c:190
+#: calendar/conduits/todo/todo-conduit-control-applet.c:214
 msgid "Conduit state"
 msgstr "Komponent-tilstand"
 
@@ -107,8 +105,8 @@ msgstr "Komponent-tilstand"
 #: 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/todo/todo-conduit-control-applet.c:242
-#: calendar/conduits/todo/todo-conduit-control-applet.c:255
+#: calendar/conduits/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:279
 msgid ""
 "No pilot configured, please choose the\n"
 "'Pilot Link Properties' capplet first."
@@ -118,13 +116,13 @@ msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:334
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
-#: calendar/conduits/todo/todo-conduit-control-applet.c:261
+#: 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/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:290
 msgid ""
 "An error occured when trying to fetch\n"
 "pilot list from the gnome-pilot daemon"
@@ -173,471 +171,468 @@ msgstr "Oppføring(er) hører til disse kategoriene:"
 msgid "Available Categories:"
 msgstr "Tilgjengelige kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:665
-#: calendar/gui/dialogs/task-editor.c:411 calendar/gui/event-editor.c:1155
+#: addressbook/contact-editor/e-contact-editor.c:706
+#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1155
 msgid "FIXME: _Appointment"
 msgstr "_Avtale"
 
-#: addressbook/contact-editor/e-contact-editor.c:666
-#: calendar/gui/dialogs/task-editor.c:412 calendar/gui/event-editor.c:1156
+#: addressbook/contact-editor/e-contact-editor.c:707
+#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1156
 msgid "FIXME: Meeting Re_quest"
 msgstr "Møteforesp_ørsel"
 
-#: addressbook/contact-editor/e-contact-editor.c:668
-#: calendar/gui/dialogs/task-editor.c:410 calendar/gui/event-editor.c:1158
+#: addressbook/contact-editor/e-contact-editor.c:709
+#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1158
 msgid "FIXME: _Mail Message"
 msgstr "Send _melding"
 
-#: addressbook/contact-editor/e-contact-editor.c:669
-#: calendar/gui/dialogs/task-editor.c:413 calendar/gui/event-editor.c:1159
+#: addressbook/contact-editor/e-contact-editor.c:710
+#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1159
 msgid "FIXME: _Contact"
 msgstr "_Kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:670
-#: calendar/gui/dialogs/task-editor.c:407
-#: calendar/gui/dialogs/task-editor.c:414 calendar/gui/event-editor.c:1160
+#: addressbook/contact-editor/e-contact-editor.c:711
+#: calendar/gui/dialogs/task-editor.c:427
+#: calendar/gui/dialogs/task-editor.c:434 calendar/gui/event-editor.c:1160
 msgid "FIXME: _Task"
 msgstr "_Oppgave"
 
-#: addressbook/contact-editor/e-contact-editor.c:671
-#: calendar/gui/dialogs/task-editor.c:408
-#: calendar/gui/dialogs/task-editor.c:415 calendar/gui/event-editor.c:1161
+#: addressbook/contact-editor/e-contact-editor.c:712
+#: calendar/gui/dialogs/task-editor.c:428
+#: calendar/gui/dialogs/task-editor.c:435 calendar/gui/event-editor.c:1161
 msgid "FIXME: Task _Request"
 msgstr "Oppgavefo_respørsel"
 
-#: addressbook/contact-editor/e-contact-editor.c:672
-#: calendar/gui/dialogs/task-editor.c:416 calendar/gui/event-editor.c:1162
+#: addressbook/contact-editor/e-contact-editor.c:713
+#: calendar/gui/dialogs/task-editor.c:436 calendar/gui/event-editor.c:1162
 msgid "FIXME: _Journal Entry"
 msgstr "_Journaloppføring"
 
-#: addressbook/contact-editor/e-contact-editor.c:673
-#: calendar/gui/dialogs/task-editor.c:417 calendar/gui/event-editor.c:1163
+#: addressbook/contact-editor/e-contact-editor.c:714
+#: calendar/gui/dialogs/task-editor.c:437 calendar/gui/event-editor.c:1163
 msgid "FIXME: _Note"
 msgstr "_Notis"
 
-#: addressbook/contact-editor/e-contact-editor.c:675
-#: addressbook/contact-editor/e-contact-editor.c:780
-#: calendar/gui/dialogs/task-editor.c:419
-#: calendar/gui/dialogs/task-editor.c:527 calendar/gui/event-editor.c:1165
+#: addressbook/contact-editor/e-contact-editor.c:716
+#: addressbook/contact-editor/e-contact-editor.c:821
+#: calendar/gui/dialogs/task-editor.c:439
+#: calendar/gui/dialogs/task-editor.c:547 calendar/gui/event-editor.c:1165
 #: calendar/gui/event-editor.c:1273
 msgid "FIXME: Ch_oose Form..."
 msgstr "Velg skjema..."
 
-#: addressbook/contact-editor/e-contact-editor.c:680
-#: calendar/gui/dialogs/task-editor.c:424 calendar/gui/event-editor.c:1170
+#: addressbook/contact-editor/e-contact-editor.c:721
+#: calendar/gui/dialogs/task-editor.c:444 calendar/gui/event-editor.c:1170
 msgid "FIXME: _Memo Style"
 msgstr "_Notis-stil"
 
-#: addressbook/contact-editor/e-contact-editor.c:682
-#: calendar/gui/dialogs/task-editor.c:426 calendar/gui/event-editor.c:1172
+#: addressbook/contact-editor/e-contact-editor.c:723
+#: calendar/gui/dialogs/task-editor.c:446 calendar/gui/event-editor.c:1172
 msgid "FIXME: Define Print _Styles..."
 msgstr "Definér utskriftstiler..."
 
-#: addressbook/contact-editor/e-contact-editor.c:689
-#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1179
+#: addressbook/contact-editor/e-contact-editor.c:730
+#: calendar/gui/dialogs/task-editor.c:453 calendar/gui/event-editor.c:1179
 msgid "FIXME: S_end"
 msgstr "_Send"
 
-#: addressbook/contact-editor/e-contact-editor.c:693
-#: calendar/gui/dialogs/task-editor.c:437 calendar/gui/event-editor.c:1183
+#: addressbook/contact-editor/e-contact-editor.c:734
+#: calendar/gui/dialogs/task-editor.c:457 calendar/gui/event-editor.c:1183
 msgid "FIXME: Save Attac_hments..."
 msgstr "Lagre vedlegg..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: addressbook/contact-editor/e-contact-editor.c:695
-#: calendar/gui/dialogs/task-editor.c:439 calendar/gui/event-editor.c:1185
+#: addressbook/contact-editor/e-contact-editor.c:736
+#: calendar/gui/dialogs/task-editor.c:459 calendar/gui/event-editor.c:1185
 msgid "_Delete"
 msgstr "_Slett"
 
-#: addressbook/contact-editor/e-contact-editor.c:696
-#: calendar/gui/dialogs/task-editor.c:441 calendar/gui/event-editor.c:1187
+#: addressbook/contact-editor/e-contact-editor.c:737
+#: calendar/gui/dialogs/task-editor.c:461 calendar/gui/event-editor.c:1187
 msgid "FIXME: _Move to Folder..."
 msgstr "_Flytt til mappe..."
 
-#: addressbook/contact-editor/e-contact-editor.c:697
-#: calendar/gui/dialogs/task-editor.c:442 calendar/gui/event-editor.c:1188
+#: addressbook/contact-editor/e-contact-editor.c:738
+#: calendar/gui/dialogs/task-editor.c:462 calendar/gui/event-editor.c:1188
 msgid "FIXME: Cop_y to Folder..."
 msgstr "Kopiér til mappe..."
 
-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/dialogs/task-editor.c:444 calendar/gui/event-editor.c:1190
+#: addressbook/contact-editor/e-contact-editor.c:740
+#: calendar/gui/dialogs/task-editor.c:464 calendar/gui/event-editor.c:1190
 msgid "Page Set_up"
 msgstr "Sideoppsett"
 
-#: addressbook/contact-editor/e-contact-editor.c:700
-#: calendar/gui/dialogs/task-editor.c:445 calendar/gui/event-editor.c:1191
+#: addressbook/contact-editor/e-contact-editor.c:741
+#: calendar/gui/dialogs/task-editor.c:465 calendar/gui/event-editor.c:1191
 msgid "FIXME: Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/dialogs/task-editor.c:466 calendar/gui/event-editor.c:1212
+#: addressbook/contact-editor/e-contact-editor.c:762
+#: calendar/gui/dialogs/task-editor.c:486 calendar/gui/event-editor.c:1212
 msgid "FIXME: Paste _Special..."
 msgstr "Lim inn _spesial..."
 
-#: addressbook/contact-editor/e-contact-editor.c:726
-#: calendar/gui/dialogs/task-editor.c:471 calendar/gui/event-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:767
+#: calendar/gui/dialogs/task-editor.c:491 calendar/gui/event-editor.c:1217
 msgid "FIXME: Mark as U_nread"
 msgstr "Merk som ulest"
 
-#: addressbook/contact-editor/e-contact-editor.c:730
-#: calendar/gui/dialogs/task-editor.c:475 calendar/gui/event-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:771
+#: calendar/gui/dialogs/task-editor.c:495 calendar/gui/event-editor.c:1221
 msgid "_Object"
 msgstr "_Objekt"
 
-#: addressbook/contact-editor/e-contact-editor.c:735
-#: addressbook/contact-editor/e-contact-editor.c:742
-#: calendar/gui/dialogs/task-editor.c:480
-#: calendar/gui/dialogs/task-editor.c:488 calendar/gui/event-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:776
+#: addressbook/contact-editor/e-contact-editor.c:783
+#: calendar/gui/dialogs/task-editor.c:500
+#: calendar/gui/dialogs/task-editor.c:508 calendar/gui/event-editor.c:1226
 #: calendar/gui/event-editor.c:1233
 msgid "FIXME: _Item"
 msgstr "_Oppføring"
 
-#: addressbook/contact-editor/e-contact-editor.c:736
-#: addressbook/contact-editor/e-contact-editor.c:743
-#: calendar/gui/dialogs/task-editor.c:481
-#: calendar/gui/dialogs/task-editor.c:489 calendar/gui/event-editor.c:1227
+#: addressbook/contact-editor/e-contact-editor.c:777
+#: addressbook/contact-editor/e-contact-editor.c:784
+#: calendar/gui/dialogs/task-editor.c:501
+#: calendar/gui/dialogs/task-editor.c:509 calendar/gui/event-editor.c:1227
 #: calendar/gui/event-editor.c:1234
 msgid "FIXME: _Unread Item"
 msgstr "_Ulest oppføring"
 
-#: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/dialogs/task-editor.c:483 calendar/gui/event-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:778
+#: calendar/gui/dialogs/task-editor.c:503 calendar/gui/event-editor.c:1228
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "Fø_rste oppføring i mappe"
 
-#: addressbook/contact-editor/e-contact-editor.c:744
-#: calendar/gui/dialogs/task-editor.c:491 calendar/gui/event-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:785
+#: calendar/gui/dialogs/task-editor.c:511 calendar/gui/event-editor.c:1235
 msgid "FIXME: _Last Item in Folder"
 msgstr "_Siste oppføring i mappe"
 
-#: addressbook/contact-editor/e-contact-editor.c:749
-#: calendar/gui/dialogs/task-editor.c:496 calendar/gui/event-editor.c:1240
+#: addressbook/contact-editor/e-contact-editor.c:790
+#: calendar/gui/dialogs/task-editor.c:516 calendar/gui/event-editor.c:1240
 msgid "FIXME: _Standard"
 msgstr "_Standard"
 
-#: addressbook/contact-editor/e-contact-editor.c:751
-#: calendar/gui/dialogs/task-editor.c:498 calendar/gui/event-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:792
+#: calendar/gui/dialogs/task-editor.c:518 calendar/gui/event-editor.c:1242
 msgid "FIXME: __Formatting"
 msgstr "_Formatering"
 
-#: addressbook/contact-editor/e-contact-editor.c:754
-#: calendar/gui/dialogs/task-editor.c:501 calendar/gui/event-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:795
+#: calendar/gui/dialogs/task-editor.c:521 calendar/gui/event-editor.c:1245
 msgid "FIXME: _Customize..."
 msgstr "_Tilpass..."
 
-#: addressbook/contact-editor/e-contact-editor.c:759
-#: calendar/gui/dialogs/task-editor.c:506 calendar/gui/event-editor.c:1250
+#: addressbook/contact-editor/e-contact-editor.c:800
+#: calendar/gui/dialogs/task-editor.c:526 calendar/gui/event-editor.c:1250
 msgid "Pre_vious"
 msgstr "Forri_ge"
 
-#: addressbook/contact-editor/e-contact-editor.c:760
-#: calendar/gui/dialogs/task-editor.c:507 calendar/gui/event-editor.c:1251
+#: addressbook/contact-editor/e-contact-editor.c:801
+#: calendar/gui/dialogs/task-editor.c:527 calendar/gui/event-editor.c:1251
 msgid "Ne_xt"
 msgstr "Nes_te"
 
-#: addressbook/contact-editor/e-contact-editor.c:762
-#: calendar/gui/dialogs/task-editor.c:509 calendar/gui/event-editor.c:1255
+#: addressbook/contact-editor/e-contact-editor.c:803
+#: calendar/gui/dialogs/task-editor.c:529 calendar/gui/event-editor.c:1255
 msgid "_Toolbars"
 msgstr "Verk_tøylinjer"
 
-#: addressbook/contact-editor/e-contact-editor.c:767
-#: calendar/gui/dialogs/task-editor.c:514 calendar/gui/event-editor.c:1260
+#: addressbook/contact-editor/e-contact-editor.c:808
+#: calendar/gui/dialogs/task-editor.c:534 calendar/gui/event-editor.c:1260
 msgid "FIXME: _File..."
 msgstr "_Fil..."
 
-#: addressbook/contact-editor/e-contact-editor.c:768
-#: calendar/gui/dialogs/task-editor.c:515 calendar/gui/event-editor.c:1261
+#: addressbook/contact-editor/e-contact-editor.c:809
+#: calendar/gui/dialogs/task-editor.c:535 calendar/gui/event-editor.c:1261
 msgid "FIXME: It_em..."
 msgstr "Opp_føring"
 
-#: addressbook/contact-editor/e-contact-editor.c:769
-#: calendar/gui/dialogs/task-editor.c:516 calendar/gui/event-editor.c:1262
+#: addressbook/contact-editor/e-contact-editor.c:810
+#: calendar/gui/dialogs/task-editor.c:536 calendar/gui/event-editor.c:1262
 msgid "FIXME: _Object..."
 msgstr "_Objekt..."
 
-#: addressbook/contact-editor/e-contact-editor.c:774
-#: calendar/gui/dialogs/task-editor.c:521 calendar/gui/event-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:815
+#: calendar/gui/dialogs/task-editor.c:541 calendar/gui/event-editor.c:1267
 msgid "FIXME: _Font..."
 msgstr "FIXME: Skri_fttyper..."
 
-#: addressbook/contact-editor/e-contact-editor.c:775
-#: calendar/gui/dialogs/task-editor.c:522 calendar/gui/event-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:816
+#: calendar/gui/dialogs/task-editor.c:542 calendar/gui/event-editor.c:1268
 msgid "FIXME: _Paragraph..."
 msgstr "_Avsnitt..."
 
-#: addressbook/contact-editor/e-contact-editor.c:782
-#: calendar/gui/dialogs/task-editor.c:529 calendar/gui/event-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:823
+#: calendar/gui/dialogs/task-editor.c:549 calendar/gui/event-editor.c:1275
 msgid "FIXME: Desi_gn This Form"
 msgstr "_Utform dette skjemaet"
 
-#: addressbook/contact-editor/e-contact-editor.c:783
-#: calendar/gui/dialogs/task-editor.c:530 calendar/gui/event-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:824
+#: calendar/gui/dialogs/task-editor.c:550 calendar/gui/event-editor.c:1276
 msgid "FIXME: D_esign a Form..."
 msgstr "U_tform et skjema..."
 
-#: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/dialogs/task-editor.c:532 calendar/gui/event-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:826
+#: calendar/gui/dialogs/task-editor.c:552 calendar/gui/event-editor.c:1278
 msgid "FIXME: Publish _Form..."
 msgstr "Publisér skjema..."
 
-#: addressbook/contact-editor/e-contact-editor.c:786
-#: calendar/gui/dialogs/task-editor.c:533 calendar/gui/event-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:827
+#: calendar/gui/dialogs/task-editor.c:553 calendar/gui/event-editor.c:1279
 msgid "FIXME: Pu_blish Form As..."
 msgstr "Pu_blisér skjema som..."
 
-#: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/dialogs/task-editor.c:535 calendar/gui/event-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:829
+#: calendar/gui/dialogs/task-editor.c:555 calendar/gui/event-editor.c:1281
 msgid "FIXME: Script _Debugger"
 msgstr "Feilsøking i skript"
 
-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/dialogs/task-editor.c:540 calendar/gui/event-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:834
+#: calendar/gui/dialogs/task-editor.c:560 calendar/gui/event-editor.c:1286
 msgid "FIXME: _Spelling..."
 msgstr "_Stavekontroll..."
 
-#: addressbook/contact-editor/e-contact-editor.c:795
-#: calendar/gui/dialogs/task-editor.c:545 calendar/gui/event-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:836
+#: calendar/gui/dialogs/task-editor.c:565 calendar/gui/event-editor.c:1291
 msgid "_Forms"
 msgstr "Sk_jemaer"
 
-#: addressbook/contact-editor/e-contact-editor.c:800
+#: addressbook/contact-editor/e-contact-editor.c:841
 msgid "FIXME: _New Contact"
 msgstr "_Ny kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:801
+#: addressbook/contact-editor/e-contact-editor.c:842
 msgid "FIXME: New _Contact from Same Company"
 msgstr "Ny _kontakt fra samme firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:803
+#: addressbook/contact-editor/e-contact-editor.c:844
 msgid "FIXME: New _Letter to Contact"
 msgstr "Nytt brev ti_l kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:804
+#: addressbook/contact-editor/e-contact-editor.c:845
 msgid "FIXME: New _Message to Contact"
 msgstr "Ny _melding til kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:805
+#: addressbook/contact-editor/e-contact-editor.c:846
 msgid "FIXME: New Meetin_g with Contact"
 msgstr "Nytt m_øte med kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:806
+#: addressbook/contact-editor/e-contact-editor.c:847
 msgid "FIXME: _Plan a Meeting..."
 msgstr "_Planlegg et møte..."
 
-#: addressbook/contact-editor/e-contact-editor.c:807
+#: addressbook/contact-editor/e-contact-editor.c:848
 msgid "FIXME: New _Task for Contact"
 msgstr "Ny opp_gave for kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:808
+#: addressbook/contact-editor/e-contact-editor.c:849
 msgid "FIXME: New _Journal Entry for Contact"
 msgstr "Ny _journaloppføring for kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:810
+#: addressbook/contact-editor/e-contact-editor.c:851
 msgid "FIXME: _Flag for Follow Up..."
 msgstr "Merk _for oppfølging..."
 
-#: addressbook/contact-editor/e-contact-editor.c:811
+#: addressbook/contact-editor/e-contact-editor.c:852
 msgid "FIXME: _Display Map of Address"
 msgstr "_Vis kart med adresse"
 
-#: addressbook/contact-editor/e-contact-editor.c:812
+#: addressbook/contact-editor/e-contact-editor.c:853
 msgid "FIXME: _Open Web Page"
 msgstr "_Åpne webside"
 
-#: addressbook/contact-editor/e-contact-editor.c:814
+#: addressbook/contact-editor/e-contact-editor.c:855
 msgid "FIXME: Forward as _vCard"
 msgstr "Videresend som _vCard"
 
-#: addressbook/contact-editor/e-contact-editor.c:815
-#: calendar/gui/dialogs/task-editor.c:562 calendar/gui/event-editor.c:1304
+#: addressbook/contact-editor/e-contact-editor.c:856
+#: calendar/gui/dialogs/task-editor.c:582 calendar/gui/event-editor.c:1304
 msgid "FIXME: For_ward"
 msgstr "_Videresend"
 
-#: addressbook/contact-editor/e-contact-editor.c:827
-#: calendar/gui/dialogs/task-editor.c:575 calendar/gui/event-editor.c:1317
+#: addressbook/contact-editor/e-contact-editor.c:868
+#: calendar/gui/dialogs/task-editor.c:595 calendar/gui/event-editor.c:1317
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: addressbook/contact-editor/e-contact-editor.c:828
-#: calendar/gui/dialogs/task-editor.c:576 calendar/gui/event-editor.c:1318
-#: composer/e-msg-composer.c:1020
+#: addressbook/contact-editor/e-contact-editor.c:869
+#: calendar/gui/dialogs/task-editor.c:596 calendar/gui/event-editor.c:1318
+#: composer/e-msg-composer.c:1005
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: addressbook/contact-editor/e-contact-editor.c:829
-#: addressbook/gui/component/addressbook.c:544
-#: calendar/gui/dialogs/task-editor.c:577 calendar/gui/event-editor.c:1319
+#: addressbook/contact-editor/e-contact-editor.c:870
+#: calendar/gui/dialogs/task-editor.c:597 calendar/gui/event-editor.c:1319
 msgid "_Tools"
 msgstr "_Verktøy"
 
-#: addressbook/contact-editor/e-contact-editor.c:830
-#: calendar/gui/dialogs/task-editor.c:578 calendar/gui/event-editor.c:1320
+#: addressbook/contact-editor/e-contact-editor.c:871
+#: calendar/gui/dialogs/task-editor.c:598 calendar/gui/event-editor.c:1320
 msgid "Actio_ns"
 msgstr "Ha_ndlinger"
 
-#: addressbook/contact-editor/e-contact-editor.c:861
-#: calendar/gui/dialogs/task-editor.c:604 calendar/gui/event-editor.c:1345
+#: addressbook/contact-editor/e-contact-editor.c:902
+#: calendar/gui/dialogs/task-editor.c:624 calendar/gui/event-editor.c:1345
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
-#: addressbook/contact-editor/e-contact-editor.c:862
+#: addressbook/contact-editor/e-contact-editor.c:903
 msgid "Save the appointment and close the dialog box"
 msgstr "Lagre avtalen og lukk dialogboksen"
 
-#: addressbook/contact-editor/e-contact-editor.c:866
-#: calendar/gui/calendar-commands.c:633
+#: addressbook/contact-editor/e-contact-editor.c:907
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: addressbook/contact-editor/e-contact-editor.c:867
-#: calendar/gui/dialogs/task-editor.c:610 calendar/gui/event-editor.c:1363
+#: addressbook/contact-editor/e-contact-editor.c:908
+#: calendar/gui/dialogs/task-editor.c:630 calendar/gui/event-editor.c:1363
 msgid "Print this item"
 msgstr "Skriv ut denne oppføringen"
 
-#: addressbook/contact-editor/e-contact-editor.c:870
-#: calendar/gui/dialogs/task-editor.c:613 calendar/gui/event-editor.c:1368
+#: addressbook/contact-editor/e-contact-editor.c:911
+#: calendar/gui/dialogs/task-editor.c:633 calendar/gui/event-editor.c:1368
 msgid "FIXME: Insert File..."
 msgstr "Sett inn fil..."
 
-#: addressbook/contact-editor/e-contact-editor.c:871
-#: calendar/gui/dialogs/task-editor.c:614 calendar/gui/event-editor.c:1369
+#: addressbook/contact-editor/e-contact-editor.c:912
+#: calendar/gui/dialogs/task-editor.c:634 calendar/gui/event-editor.c:1369
 msgid "Insert a file as an attachment"
 msgstr "Sett inn en fil som vedlegg"
 
-#: addressbook/contact-editor/e-contact-editor.c:874
-#: addressbook/gui/component/addressbook.c:442
-#: calendar/gui/dialogs/task-editor.c:624 calendar/gui/e-calendar-table.c:324
+#: addressbook/contact-editor/e-contact-editor.c:915
+#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:324
 #: calendar/gui/event-editor-dialog.glade.h:92
-#: calendar/gui/event-editor.c:1350 mail/folder-browser-factory.c:51
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:160
+#: calendar/gui/event-editor.c:1350 mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
+#: mail/mail-view.c:163
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/contact-editor/e-contact-editor.c:875
+#: addressbook/contact-editor/e-contact-editor.c:916
 msgid "Delete this item"
 msgstr "Slett denne oppføringen"
 
-#: addressbook/contact-editor/e-contact-editor.c:879
-#: calendar/gui/dialogs/task-editor.c:629 calendar/gui/event-editor.c:1379
+#: addressbook/contact-editor/e-contact-editor.c:920
+#: calendar/gui/dialogs/task-editor.c:649 calendar/gui/event-editor.c:1379
 msgid "FIXME: Previous"
 msgstr "Forrige"
 
-#: addressbook/contact-editor/e-contact-editor.c:880
-#: calendar/gui/dialogs/task-editor.c:630 calendar/gui/event-editor.c:1380
+#: addressbook/contact-editor/e-contact-editor.c:921
+#: calendar/gui/dialogs/task-editor.c:650 calendar/gui/event-editor.c:1380
 msgid "Go to the previous item"
 msgstr "Gå til forrige oppføring"
 
-#: addressbook/contact-editor/e-contact-editor.c:882
-#: calendar/gui/dialogs/task-editor.c:633 calendar/gui/event-editor.c:1382
+#: addressbook/contact-editor/e-contact-editor.c:923
+#: calendar/gui/dialogs/task-editor.c:653 calendar/gui/event-editor.c:1382
 msgid "FIXME: Next"
 msgstr "Neste"
 
-#: addressbook/contact-editor/e-contact-editor.c:883
-#: calendar/gui/dialogs/task-editor.c:634 calendar/gui/event-editor.c:1383
+#: addressbook/contact-editor/e-contact-editor.c:924
+#: calendar/gui/dialogs/task-editor.c:654 calendar/gui/event-editor.c:1383
 msgid "Go to the next item"
 msgstr "Gå til neste oppføring"
 
-#: addressbook/contact-editor/e-contact-editor.c:886
-#: calendar/gui/dialogs/task-editor.c:637 calendar/gui/event-editor.c:1385
+#: addressbook/contact-editor/e-contact-editor.c:927
+#: calendar/gui/dialogs/task-editor.c:657 calendar/gui/event-editor.c:1385
 msgid "FIXME: Help"
 msgstr "Hjelp"
 
-#: addressbook/contact-editor/e-contact-editor.c:887
-#: calendar/gui/dialogs/task-editor.c:638 calendar/gui/event-editor.c:1386
+#: addressbook/contact-editor/e-contact-editor.c:928
+#: calendar/gui/dialogs/task-editor.c:658 calendar/gui/event-editor.c:1386
 msgid "See online help"
 msgstr "Se hjelp"
 
-#: addressbook/contact-editor/e-contact-editor.c:1343
+#: addressbook/contact-editor/e-contact-editor.c:1419
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1344
-#: addressbook/contact-editor/e-contact-editor.c:1448
+#: addressbook/contact-editor/e-contact-editor.c:1420
+#: addressbook/contact-editor/e-contact-editor.c:1524
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1345
+#: addressbook/contact-editor/e-contact-editor.c:1421
 msgid "Business 2"
 msgstr "Arbeid 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1346
+#: addressbook/contact-editor/e-contact-editor.c:1422
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1347
+#: addressbook/contact-editor/e-contact-editor.c:1423
 msgid "Callback"
 msgstr "Tilbakering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1348
+#: addressbook/contact-editor/e-contact-editor.c:1424
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1349
+#: addressbook/contact-editor/e-contact-editor.c:1425
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1350
-#: addressbook/contact-editor/e-contact-editor.c:1449
+#: addressbook/contact-editor/e-contact-editor.c:1426
+#: addressbook/contact-editor/e-contact-editor.c:1525
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1351
+#: addressbook/contact-editor/e-contact-editor.c:1427
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1352
+#: addressbook/contact-editor/e-contact-editor.c:1428
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1353
+#: addressbook/contact-editor/e-contact-editor.c:1429
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1354
+#: addressbook/contact-editor/e-contact-editor.c:1430
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1355
-#: addressbook/contact-editor/e-contact-editor.c:1450
+#: addressbook/contact-editor/e-contact-editor.c:1431
+#: addressbook/contact-editor/e-contact-editor.c:1526
 #: mail/mail-config.glade.h:28
 msgid "Other"
 msgstr "Annet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1356
+#: addressbook/contact-editor/e-contact-editor.c:1432
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1357
+#: addressbook/contact-editor/e-contact-editor.c:1433
 msgid "Pager"
 msgstr "Personsøker"
 
-#: addressbook/contact-editor/e-contact-editor.c:1358
+#: addressbook/contact-editor/e-contact-editor.c:1434
 msgid "Primary"
 msgstr "Primær"
 
-#: addressbook/contact-editor/e-contact-editor.c:1359
+#: addressbook/contact-editor/e-contact-editor.c:1435
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1360
+#: addressbook/contact-editor/e-contact-editor.c:1436
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1361
+#: addressbook/contact-editor/e-contact-editor.c:1437
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1405
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1481
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/contact-editor/e-contact-editor.c:1406
+#: addressbook/contact-editor/e-contact-editor.c:1482
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1407
+#: addressbook/contact-editor/e-contact-editor.c:1483
 msgid "Email 3"
 msgstr "E-post 3"
 
@@ -703,50 +698,50 @@ msgid "Wants to receive _HTML mail"
 msgstr "Vil motta _HTML e-post"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "Address:"
-msgstr "Adresse:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Business"
 msgstr "Ar_beid"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Home"
 msgstr "_Hjemme"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
 msgid "Business _Fax"
 msgstr "_Faks på arbeid"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "A_rbeid"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
 msgid "_This is the mailing address"
 msgstr "De_tte er postadressen"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
 msgid "C_ontacts..."
 msgstr "K_ontakter..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
+#: addressbook/contact-editor/e-contact-editor-strings.h:26
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
 msgid "_Job title:"
 msgstr "_Jobbtittel:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
 msgid "_Company:"
 msgstr "_Firma:"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
+msgid "_Address..."
+msgstr "_Adresse..."
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
 #: calendar/gui/event-editor-dialog.glade.h:17
 msgid "General"
@@ -802,31 +797,58 @@ msgstr "Detaljer"
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "Sjekk fullt navn:"
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "Check Address"
+msgstr "Sjekk adresse"
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid "_Title:"
-msgstr "_Tittel:"
+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_Street Address:"
+msgstr "_Gateadresse:"
 
-#: addressbook/contact-editor/fullname-strings.h:9
-msgid "_First:"
-msgstr "_Fornavn:"
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "City:"
+msgstr "By:"
 
-#: addressbook/contact-editor/fullname-strings.h:10
-msgid "_Middle:"
-msgstr "_Mellomnavn:"
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "State/Province:"
+msgstr "Stat/Provins:"
 
-#: addressbook/contact-editor/fullname-strings.h:11
-msgid "_Last:"
-msgstr "_Etternavn:"
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "Country:"
+msgstr "Land:"
 
-#: addressbook/contact-editor/fullname-strings.h:12
-msgid "_Suffix:"
-msgstr "_Suffiks:"
+#: addressbook/contact-editor/fulladdr.glade.h:12
+msgid "ZIP/Postal Code:"
+msgstr "ZIP/Postnummer:"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
+msgid "E_xt:"
+msgstr "Linje:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:14
+msgid ""
+"USA\n"
+"Canada\n"
+"Finland\n"
+msgstr ""
+"USA\n"
+"Kanada\n"
+"Finland\n"
+
+#: addressbook/contact-editor/fulladdr.glade.h:18
+msgid "PO Box:"
+msgstr "Postboks:"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/contact-editor/fullname-strings.h:7
+msgid "Check Full Name"
+msgstr "Sjekk fullt navn:"
+
+#: addressbook/contact-editor/fullname-strings.h:8
 msgid ""
 "\n"
 "Mr.\n"
@@ -838,7 +860,7 @@ msgstr ""
 "Fru.\n"
 "Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:18
+#: addressbook/contact-editor/fullname-strings.h:13
 msgid ""
 "\n"
 "Sr.\n"
@@ -856,63 +878,35 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/gui/component/addressbook.c:436
-#: calendar/gui/calendar-commands.c:506 notes/component-factory.c:27
-msgid "New"
-msgstr "Ny"
-
-#: addressbook/gui/component/addressbook.c:436
-msgid "Create a new contact"
-msgstr "Opprett en ny kontakt"
-
-#: addressbook/gui/component/addressbook.c:440
-msgid "Find"
-msgstr "Finn"
-
-#: addressbook/gui/component/addressbook.c:440
-msgid "Find a contact"
-msgstr "Finn en kontakt"
-
-#: addressbook/gui/component/addressbook.c:441
-#: calendar/gui/calendar-commands.c:511 mail/folder-browser-factory.c:49
-#: mail/mail-view.c:158
-msgid "Print"
-msgstr "Skriv ut"
-
-#: addressbook/gui/component/addressbook.c:441
-msgid "Print contacts"
-msgstr "Skriv ut kontakter"
+#: addressbook/contact-editor/fullname-strings.h:21
+msgid "_First:"
+msgstr "_Fornavn:"
 
-#: addressbook/gui/component/addressbook.c:442
-msgid "Delete a contact"
-msgstr "Slett en kontakt"
+#: addressbook/contact-editor/fullname-strings.h:22
+msgid "_Title:"
+msgstr "_Tittel:"
 
-#: addressbook/gui/component/addressbook.c:511
-msgid "_Print Contacts..."
-msgstr "_Skriv ut kontakter..."
+#: addressbook/contact-editor/fullname-strings.h:23
+msgid "_Middle:"
+msgstr "_Mellomnavn:"
 
-#: addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:1052
-msgid "As _Table"
-msgstr "Som _tabell"
+#: addressbook/contact-editor/fullname-strings.h:24
+msgid "_Last:"
+msgstr "_Etternavn:"
 
-#: addressbook/gui/component/addressbook.c:528
-msgid "_New Contact"
-msgstr "_Ny kontakt"
+#: addressbook/contact-editor/fullname-strings.h:25
+msgid "_Suffix:"
+msgstr "_Suffiks:"
 
-#: addressbook/gui/component/addressbook.c:536
+#: addressbook/gui/component/addressbook.c:345
 msgid "N_ew Directory Server"
 msgstr "N_y katalogtjener"
 
-#: addressbook/gui/component/addressbook.c:550
-msgid "_Search for contacts"
-msgstr "_Søk etter kontakter"
-
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:425
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:637
+#: addressbook/gui/component/addressbook.c:430
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -933,225 +927,217 @@ msgstr ""
 "installere OpenLDAP, deretter må du kompilere og\n"
 "installere Evolution på nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:920
-#: addressbook/gui/minicard/e-minicard.c:334
+#: addressbook/gui/component/addressbook.c:547
+msgid "As _Minicards"
+msgstr "Som _minikort"
+
+#: addressbook/gui/component/addressbook.c:552
+msgid "As _Table"
+msgstr "Som _tabell"
+
+#: addressbook/gui/component/addressbook.c:592
+msgid "The URI that the Folder Browser will display"
+msgstr "URIen som mappeutforskeren vil vise"
+
+#: addressbook/gui/component/e-ldap-storage.c:88
+msgid "External Directories"
+msgstr "Eksterne kataloger"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/gui/component/ldap-server-dialog.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:9
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+msgid "LDAP Server:"
+msgstr "LDAP-tjener:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
+msgstr "Portnummer:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
+msgstr "Rot DN:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: composer/e-msg-composer-address-dialog.glade.h:8
+msgid "Name:"
+msgstr "Navn:"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+msgid "Select Names"
+msgstr "Velg navn"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "Find..."
+msgstr "Finn..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+msgid "Select name from List:"
+msgstr "Velg navn fra liste:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:10
+msgid "Message Recipients"
+msgstr "Meldingsmottakere:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:334
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
-#: addressbook/gui/component/addressbook.c:1022
+#: addressbook/gui/widgets/e-addressbook-view.c:542
 msgid "* Click here to add a contact *"
 msgstr "* Klikk her for å legge til en kontakt *"
 
-#: addressbook/gui/component/addressbook.c:1059
-msgid "As _Minicards"
-msgstr "Som _minikort"
+#: addressbook/gui/widgets/e-minicard-control.c:278
+msgid "Save in addressbook"
+msgstr "Lagre i adressebok"
 
-#: addressbook/gui/component/addressbook.c:1110
-msgid "The URI that the Folder Browser will display"
-msgstr "URIen som mappeutforskeren vil vise"
+#: addressbook/gui/widgets/e-minicard-view.c:110
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Ingen oppføringer i denne visningen\n"
+"\n"
+"Dobbelklikk her for å opprette en ny kontakt."
 
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
-#: addressbook/gui/component/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "window2"
 msgstr "vindu2"
 
-#: addressbook/gui/component/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/component/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/component/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/component/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/component/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/component/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/component/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/component/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/component/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 #: calendar/cal-util/timeutil.c:100
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/component/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/component/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/component/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/component/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/component/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/component/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/component/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/component/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/component/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/component/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/component/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/component/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/component/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/component/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/component/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/component/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/component/alphabet.glade.h:33
+#: addressbook/gui/widgets/alphabet.glade.h:33
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/component/alphabet.glade.h:34
+#: addressbook/gui/widgets/alphabet.glade.h:34
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Eksterne kataloger"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
-msgid "LDAP Server:"
-msgstr "LDAP-tjener:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Portnummer:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
-msgstr "Rot DN:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-msgstr "Navn:"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Velg navn"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Find..."
-msgstr "Finn..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr "Velg navn fra liste:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "Meldingsmottakere:"
-
-#: addressbook/gui/minicard/e-minicard-control.c:278
-msgid "Save in addressbook"
-msgstr "Lagre i adressebok"
-
-#: addressbook/gui/minicard/e-minicard-view.c:110
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Ingen oppføringer i denne visningen\n"
-"\n"
-"Dobbelklikk her for å opprette en ny kontakt."
-
-#: addressbook/gui/minicard/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr "Test av \"reflow\""
-
-#: addressbook/gui/minicard/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright (C) 2000, Helix Code, Inc."
-
-#: addressbook/gui/minicard/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr "Dette tester \"canvas-funksjonen \"reflow\""
-
 #. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
 #: mail/folder-browser.c:404
 msgid "Search"
 msgstr "Søk"
@@ -1356,15 +1342,15 @@ 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:357
-#: calendar/conduits/todo/todo-conduit.c:855
+#: calendar/conduits/todo/todo-conduit.c:428
+#: calendar/conduits/todo/todo-conduit.c:922
 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
-#: calendar/conduits/todo/todo-conduit.c:556
-#: calendar/conduits/todo/todo-conduit.c:558
+#: calendar/conduits/todo/todo-conduit.c:627
+#: calendar/conduits/todo/todo-conduit.c:629
 msgid "Could not start gnomecal server"
 msgstr "Kunne ikke starte gnomecal-tjeneren"
 
@@ -1373,16 +1359,28 @@ msgstr "Kunne ikke starte gnomecal-tjeneren"
 msgid "Could not read pilot's DateBook application block"
 msgstr "Kunne ikke lese pilotens DateBook applikasjonsblokk"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:96
-msgid "Gpilotd todo conduit"
-msgstr "Gpilotd oppgavelistekomponent"
+#: calendar/conduits/todo/todo-conduit-control-applet.c:114
+msgid "JP Rosevear <jpr@helixcode.com>"
+msgstr "JP Rosevar <jpr@helixcode.com>"
+
+#: 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"
+msgstr "Evolution oppgaveliste-komponent"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:99
-msgid "Configuration utility for the todo conduit.\n"
-msgstr "Konfigurasjonsverktøy for oppgavelistekomponenten.\n"
+#: 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.c:581
-#: calendar/conduits/todo/todo-conduit.c:584
+#: 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:650
+#: calendar/conduits/todo/todo-conduit.c:653
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
@@ -1434,7 +1432,7 @@ msgstr "GNOME kalender"
 msgid "The GNOME personal calendar and schedule manager."
 msgstr "GNOME's personlige kalender og tidsplanlegger."
 
-#: calendar/gui/calendar-commands.c:392 tests/ui-tests/message-browser.c:676
+#: calendar/gui/calendar-commands.c:392
 msgid "File not found"
 msgstr "Fil ikke funnet"
 
@@ -1446,119 +1444,46 @@ msgstr "Åpne kalender"
 msgid "Save calendar"
 msgstr "Lagre kalender"
 
-#: calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:486
 msgid "Day"
 msgstr "Dag"
 
-#: calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:486
 msgid "Show 1 day"
 msgstr "Vis 1 dag"
 
-#: calendar/gui/calendar-commands.c:487
+#: calendar/gui/calendar-commands.c:489
 msgid "5 Days"
 msgstr "5 dager"
 
-#: calendar/gui/calendar-commands.c:487
+#: calendar/gui/calendar-commands.c:489
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: calendar/gui/calendar-commands.c:490
+#: calendar/gui/calendar-commands.c:492
 msgid "Week"
 msgstr "Uke"
 
-#: calendar/gui/calendar-commands.c:490
+#: calendar/gui/calendar-commands.c:492
 msgid "Show 1 week"
 msgstr "Vis 1 uke"
 
-#: calendar/gui/calendar-commands.c:493
+#: calendar/gui/calendar-commands.c:495
 msgid "Month"
 msgstr "Måned"
 
-#: calendar/gui/calendar-commands.c:493
+#: calendar/gui/calendar-commands.c:495
 msgid "Show 1 month"
 msgstr "Vis 1 måned"
 
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:499
 msgid "Year"
 msgstr "År"
 
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:499
 msgid "Show 1 year"
 msgstr "Vis 1 år"
 
-#: calendar/gui/calendar-commands.c:506 calendar/gui/calendar-commands.c:642
-msgid "Create a new appointment"
-msgstr "Opprett en ny avtale"
-
-#: calendar/gui/calendar-commands.c:511 calendar/gui/calendar-commands.c:634
-msgid "Print this calendar"
-msgstr "Skriv ut denne kalenderen"
-
-#: calendar/gui/calendar-commands.c:515
-msgid "Prev"
-msgstr "Forrige"
-
-#: calendar/gui/calendar-commands.c:515
-msgid "Go back in time"
-msgstr "Gå tilbake i tid"
-
-#: calendar/gui/calendar-commands.c:516
-msgid "Today"
-msgstr "Idag"
-
-#: calendar/gui/calendar-commands.c:516
-msgid "Go to present time"
-msgstr "Gå til nåtiden"
-
-#: calendar/gui/calendar-commands.c:517
-msgid "Next"
-msgstr "Neste"
-
-#: calendar/gui/calendar-commands.c:517
-msgid "Go forward in time"
-msgstr "Gå frem i tid"
-
-#: calendar/gui/calendar-commands.c:521
-msgid "Go to"
-msgstr "Gå til"
-
-#: calendar/gui/calendar-commands.c:521
-msgid "Go to a specific date"
-msgstr "Gå til en spesifikk dato"
-
-#. file menu
-#: calendar/gui/calendar-commands.c:619
-msgid "New Ca_lendar"
-msgstr "Ny ka_lenderen"
-
-#: calendar/gui/calendar-commands.c:620
-msgid "Create a new calendar"
-msgstr "Opprett en ny kalender"
-
-#: calendar/gui/calendar-commands.c:623
-msgid "Open Ca_lendar"
-msgstr "Åpne ka_lender"
-
-#: calendar/gui/calendar-commands.c:624
-msgid "Open a calendar"
-msgstr "Åpne en kalender"
-
-#: calendar/gui/calendar-commands.c:628 calendar/gui/calendar-commands.c:629
-msgid "Save Calendar As"
-msgstr "Lagre kalender som"
-
-#: calendar/gui/calendar-commands.c:642
-msgid "_New appointment..."
-msgstr "_Ny avtale..."
-
-#: calendar/gui/calendar-commands.c:650 calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Brukervalg"
-
-#: calendar/gui/calendar-commands.c:657 calendar/gui/calendar-commands.c:658
-msgid "About Calendar"
-msgstr "Om kalender"
-
 #: calendar/gui/calendar-model.c:330
 msgid "Public"
 msgstr "Offentlig"
@@ -1654,7 +1579,7 @@ msgstr "Ingen sammendrag tilgjengelig."
 msgid "Close"
 msgstr "Lukk"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1463
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1427
 msgid "Snooze"
 msgstr "Utsett"
 
@@ -1666,90 +1591,90 @@ msgstr "Rediger avtale:"
 msgid "Snooze time (minutes)"
 msgstr "Utsett-tid (minutter)"
 
-#: calendar/gui/dialogs/task-editor.c:482
-#: calendar/gui/dialogs/task-editor.c:490
+#: calendar/gui/dialogs/task-editor.c:502
+#: calendar/gui/dialogs/task-editor.c:510
 msgid "FIXME: In_complete Task"
 msgstr "U_komplett oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:542 calendar/gui/event-editor.c:1288
+#: calendar/gui/dialogs/task-editor.c:562 calendar/gui/event-editor.c:1288
 msgid "FIXME: Chec_k Names"
 msgstr "Sjek_k navn"
 
-#: calendar/gui/dialogs/task-editor.c:543 calendar/gui/event-editor.c:1289
+#: calendar/gui/dialogs/task-editor.c:563 calendar/gui/event-editor.c:1289
 msgid "FIXME: Address _Book..."
 msgstr "Addresse_bok..."
 
-#: calendar/gui/dialogs/task-editor.c:550
+#: calendar/gui/dialogs/task-editor.c:570
 msgid "FIXME: _New Task"
 msgstr "_Ny oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:552
+#: calendar/gui/dialogs/task-editor.c:572
 msgid "FIXME: S_end Status Report"
 msgstr "S_end statusrapport"
 
-#: calendar/gui/dialogs/task-editor.c:553
+#: calendar/gui/dialogs/task-editor.c:573
 msgid "FIXME: _Mark Complete"
 msgstr "_Merk som fullført"
 
-#: calendar/gui/dialogs/task-editor.c:555 calendar/gui/event-editor.c:1298
+#: calendar/gui/dialogs/task-editor.c:575 calendar/gui/event-editor.c:1298
 msgid "FIXME: Rec_urrence..."
 msgstr "Gjentakelse..."
 
-#: calendar/gui/dialogs/task-editor.c:556
+#: calendar/gui/dialogs/task-editor.c:576
 msgid "FIXME: S_kip Occurrence"
 msgstr "Hopp over gjenta_kelse"
 
-#: calendar/gui/dialogs/task-editor.c:558
+#: calendar/gui/dialogs/task-editor.c:578
 msgid "FIXME: Assig_n Task"
 msgstr "Tildel o_ppgave"
 
-#: calendar/gui/dialogs/task-editor.c:560
+#: calendar/gui/dialogs/task-editor.c:580
 msgid "FIXME: _Reply"
 msgstr "Sva_r"
 
-#: calendar/gui/dialogs/task-editor.c:561
+#: calendar/gui/dialogs/task-editor.c:581
 msgid "FIXME: Reply to A_ll"
 msgstr "Svar til a_lle"
 
-#: calendar/gui/dialogs/task-editor.c:605
+#: calendar/gui/dialogs/task-editor.c:625
 msgid "Save the task and close the dialog box"
 msgstr "Lagre oppgaven og lukk dialogboksen"
 
-#: calendar/gui/dialogs/task-editor.c:609 calendar/gui/event-editor.c:1362
+#: calendar/gui/dialogs/task-editor.c:629 calendar/gui/event-editor.c:1362
 msgid "FIXME: Print..."
 msgstr "Skriv ut..."
 
-#: calendar/gui/dialogs/task-editor.c:619
+#: calendar/gui/dialogs/task-editor.c:639
 msgid "FIXME: Assign Task..."
 msgstr "Tildel oppgave..."
 
-#: calendar/gui/dialogs/task-editor.c:620
+#: calendar/gui/dialogs/task-editor.c:640
 msgid "Assign the task to someone"
 msgstr "Tildel oppgaven til noen"
 
-#: calendar/gui/dialogs/task-editor.c:625
+#: calendar/gui/dialogs/task-editor.c:645
 msgid "Delete this task"
 msgstr "Slett denne oppgaven"
 
-#: calendar/gui/dialogs/task-editor.c:891
+#: calendar/gui/dialogs/task-editor.c:913
 msgid "Edit Task"
 msgstr "Redigér oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:897 calendar/gui/event-editor.c:284
+#: calendar/gui/dialogs/task-editor.c:919 calendar/gui/event-editor.c:284
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:903 calendar/gui/event-editor.c:290
+#: calendar/gui/dialogs/task-editor.c:925 calendar/gui/event-editor.c:290
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:906 calendar/gui/event-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:928 calendar/gui/event-editor.c:293
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:909 calendar/gui/event-editor.c:296
+#: calendar/gui/dialogs/task-editor.c:931 calendar/gui/event-editor.c:296
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
@@ -1876,7 +1801,6 @@ msgid "Percent complete"
 msgstr "Prosent fullført"
 
 #: calendar/gui/e-calendar-table.c:204 calendar/gui/prop.c:611
-#: mail/message-list.c:659
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -1989,7 +1913,7 @@ msgstr "Invitér deltakere..."
 msgid "Invite attendees to a meeting"
 msgstr "Invitér deltakere til et møte"
 
-#: calendar/gui/event-editor.c:1926
+#: calendar/gui/event-editor.c:1930
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -2094,7 +2018,9 @@ msgstr "Påminnelse"
 msgid "Recurrence rule"
 msgstr "Regel for gjenintreffelse"
 
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:938
+#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:977
+#: widgets/misc/e-calendar.c:166 widgets/misc/e-dateedit.c:329
+#: widgets/misc/e-dateedit.c:670 widgets/misc/e-dateedit.c:951
 msgid "None"
 msgstr "Ingen"
 
@@ -2503,28 +2429,28 @@ msgstr "Prioritet:"
 msgid "Item Comments:"
 msgstr "Kommentarer for oppføring:"
 
-#: calendar/gui/gnome-cal.c:689 calendar/gui/gnome-cal.c:1471
-#: calendar/gui/gnome-cal.c:1527
+#: calendar/gui/gnome-cal.c:697 calendar/gui/gnome-cal.c:1435
+#: calendar/gui/gnome-cal.c:1491
 msgid "Reminder of your appointment at "
 msgstr "Påminnelse om din avtale "
 
-#: calendar/gui/gnome-cal.c:1169
+#: calendar/gui/gnome-cal.c:1131
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Kunne ikke laste kalenderen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1180
+#: calendar/gui/gnome-cal.c:1142
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Kunne ikke opprette kalender i `%s'"
 
-#: calendar/gui/gnome-cal.c:1191
+#: calendar/gui/gnome-cal.c:1153
 #, 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:1476 calendar/gui/gnome-cal.c:1531
+#: calendar/gui/gnome-cal.c:1440 calendar/gui/gnome-cal.c:1495
 msgid "Ok"
 msgstr "Ok"
 
@@ -2854,6 +2780,10 @@ msgstr "Egenskaper for oppgaveliste"
 msgid "To Do List"
 msgstr "Oppgaveliste"
 
+#: calendar/gui/prop.c:718
+msgid "Preferences"
+msgstr "Brukervalg"
+
 #. build miscellaneous box
 #: calendar/gui/prop.c:789
 msgid "Alarm Properties"
@@ -2889,7 +2819,6 @@ msgid "Cut selected item into clipboard"
 msgstr "Klipp ut valgt oppføring til utklippstavlen"
 
 #: composer/e-msg-composer-address-dialog.c:190
-#: mail/folder-browser-factory.c:47
 msgid "Copy"
 msgstr "Kopiér"
 
@@ -2965,47 +2894,47 @@ msgstr "etikett7"
 msgid "label8"
 msgstr "etikett8"
 
-#: composer/e-msg-composer-attachment-bar.c:76
+#: composer/e-msg-composer-attachment-bar.c:77
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:78
+#: composer/e-msg-composer-attachment-bar.c:79
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:86
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:90
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:93
+#: composer/e-msg-composer-attachment-bar.c:94
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:299
+#: composer/e-msg-composer-attachment-bar.c:303
 msgid "Add attachment"
 msgstr "Legg til vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
+#: composer/e-msg-composer-attachment-bar.c:366 shell/e-shortcuts-view.c:333
 msgid "Remove"
 msgstr "Fjern"
 
-#: composer/e-msg-composer-attachment-bar.c:363
+#: composer/e-msg-composer-attachment-bar.c:367
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte oppføringer fra vedleggslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:394
+#: composer/e-msg-composer-attachment-bar.c:398
 msgid "Add attachment..."
 msgstr "Legg til vedlegg..."
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:399
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
@@ -3074,33 +3003,33 @@ msgstr "Emne:"
 msgid "Enter the subject of the mail"
 msgstr "Skriv inn emnet for meldingen"
 
-#: composer/e-msg-composer.c:466
+#: composer/e-msg-composer.c:451
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:477
+#: composer/e-msg-composer.c:462
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:482
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:519
+#: composer/e-msg-composer.c:504
 msgid "Saving changes to message..."
 msgstr "Lagre endringer i meldingen..."
 
-#: composer/e-msg-composer.c:521
+#: composer/e-msg-composer.c:506
 msgid "About to save changes to message..."
 msgstr "Lagrer endringer til meldingen..."
 
-#: composer/e-msg-composer.c:606 shell/e-shell-view-menu.c:165
+#: composer/e-msg-composer.c:591 shell/e-shell-view-menu.c:166
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:612
+#: composer/e-msg-composer.c:597
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3110,27 +3039,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:634
+#: composer/e-msg-composer.c:619
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:753
+#: composer/e-msg-composer.c:738
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:763
+#: composer/e-msg-composer.c:748
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:773
+#: composer/e-msg-composer.c:758
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:768
 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:805
+#: composer/e-msg-composer.c:790
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3138,123 +3067,126 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker på at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:826
+#: composer/e-msg-composer.c:811
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:922 shell/e-shell-view-menu.c:434
+#: composer/e-msg-composer.c:907
 msgid "_File"
 msgstr "_Fil"
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:913
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:914
 msgid "Load a previously saved message"
 msgstr "Les en tidligere lagret melding"
 
-#: composer/e-msg-composer.c:937
+#: composer/e-msg-composer.c:922
 msgid "_Save..."
 msgstr "_Lagre..."
 
-#: composer/e-msg-composer.c:938
+#: composer/e-msg-composer.c:923
 msgid "Save message"
 msgstr "Send melding"
 
-#: composer/e-msg-composer.c:946
+#: composer/e-msg-composer.c:931
 msgid "_Save as..."
 msgstr "Lagre _som..."
 
-#: composer/e-msg-composer.c:947
+#: composer/e-msg-composer.c:932
 msgid "Save message with a different name"
 msgstr "Lagre meldingen med et nytt navn"
 
-#: composer/e-msg-composer.c:955
+#: composer/e-msg-composer.c:940
 msgid "Save in _folder..."
 msgstr "Lagre i _mappe..."
 
-#: composer/e-msg-composer.c:956
+#: composer/e-msg-composer.c:941
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:950
 msgid "_Insert text file... (FIXME)"
 msgstr "Sett _inn tekstfil..."
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:951
 msgid "Insert a file as text into the message"
 msgstr "Sett inn en tekstfil i meldingen"
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:960
 msgid "Send _Now"
 msgstr "Send _nå"
 
-#: composer/e-msg-composer.c:976
+#: composer/e-msg-composer.c:961
 msgid "Send the message now"
 msgstr "Send meldingen nå"
 
-#: composer/e-msg-composer.c:984
+#: composer/e-msg-composer.c:969
 msgid "Send _Later"
 msgstr "Send se_nere"
 
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:970
 msgid "Send the message later"
 msgstr "Send meldingen senere"
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:980
 msgid "_Close..."
 msgstr "L_ukk..."
 
-#: composer/e-msg-composer.c:996
+#: composer/e-msg-composer.c:981
 msgid "Quit the message composer"
 msgstr "Avslutt meldingsredigering"
 
-#: composer/e-msg-composer.c:1009 shell/e-shell-view-menu.c:478
+#: composer/e-msg-composer.c:994
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1011
 msgid "HTML"
 msgstr "HTML"
 
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1012
 msgid "Send the mail in HTML format"
 msgstr "Send meldingen i HTML-format"
 
-#: composer/e-msg-composer.c:1040 shell/e-shell-view-menu.c:383
-#: shell/e-shell-view-menu.c:489 shell/e-storage-set-view.c:221
+#: composer/e-msg-composer.c:1025 shell/e-storage-set-view.c:223
 msgid "_View"
 msgstr "_Vis"
 
-#: composer/e-msg-composer.c:1046
+#: composer/e-msg-composer.c:1031
 msgid "Show _attachments"
 msgstr "Vis _vedlegg"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1032
 msgid "Show/hide attachments"
 msgstr "Vis/skjul vedlegg"
 
-#: composer/e-msg-composer.c:1080
+#: composer/e-msg-composer.c:1065
 msgid "Send"
 msgstr "Send"
 
-#: composer/e-msg-composer.c:1081
+#: composer/e-msg-composer.c:1066
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: composer/e-msg-composer.c:1090
+#: composer/e-msg-composer.c:1075
 msgid "Attach"
 msgstr "Legg ved"
 
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1076
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1263
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
+#: composer/e-msg-composer.c:1334
+msgid "Could not create composer window."
+msgstr "Kan ikke opprette komponeringsvinduet."
+
 #: filter/filter-datespec.c:61
 msgid "years"
 msgstr "år"
@@ -3333,22 +3265,27 @@ msgstr "Sammenligne med"
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: filter/filter-editor.c:157 filter/score-editor.c:127
+#: filter/filter-editor.c:158 filter/score-editor.c:127
 #: filter/vfolder-editor.c:153
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/filter-editor.c:191
+#: filter/filter-editor.c:199
 msgid "Edit Rule"
 msgstr "Redigér kilde"
 
-#: filter/filter-filter.c:401 filter/filter-rule.c:539
-msgid "Less"
-msgstr "Mindre"
+#. and now for the action area
+#: filter/filter-filter.c:396
+msgid "Then"
+msgstr "Så"
+
+#: filter/filter-filter.c:409
+msgid "Add action"
+msgstr "Legg til handling"
 
-#: filter/filter-filter.c:404 filter/filter-rule.c:542
-msgid "More"
-msgstr "Mer"
+#: filter/filter-filter.c:415
+msgid "Remove action"
+msgstr "Fjern handling"
 
 #: filter/filter-folder.c:186 filter/vfolder-rule.c:271
 msgid "Select Folder"
@@ -3366,202 +3303,95 @@ msgstr "<klikk her for å velge en mappe>"
 msgid "Test"
 msgstr "Test"
 
-#: filter/score-editor.c:165
-msgid "Edit Score Rule"
-msgstr "Rediger poengregel"
-
-#: filter/vfolder-editor.c:192
-msgid "Edit VFolder Rule"
-msgstr "Redigér VFolder regel"
-
-#: mail/component-factory.c:195
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Kan ikke initialisere Evolutions e-postkomponent."
+#: filter/filter-rule.c:504
+msgid "Rule name: "
+msgstr "Regelnavn: "
 
-#: mail/folder-browser-factory.c:33
-msgid "Get Mail"
-msgstr "Hent e-post"
+#: filter/filter-rule.c:508
+msgid "untitled"
+msgstr "uten navn"
 
-#: mail/folder-browser-factory.c:33
-msgid "Send queued mail and retrieve new mail"
-msgstr "Send e-post som er lagt i kø og hent ny e-post"
-
-#: mail/folder-browser-factory.c:35
-msgid "Compose"
-msgstr "Skriv"
-
-#: mail/folder-browser-factory.c:35
-msgid "Compose a new message"
-msgstr "Skriv en ny melding"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:148
-msgid "Reply"
-msgstr "Svar"
-
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:148
-msgid "Reply to the sender of this message"
-msgstr "Svar til avsender av denne meldingen"
+#: filter/filter-rule.c:519
+msgid "If"
+msgstr "Hvis"
 
-#: mail/folder-browser-factory.c:40 mail/mail-view.c:151
-msgid "Reply to All"
-msgstr "Svar til alle"
+#: filter/filter-rule.c:536
+msgid "Execute actions"
+msgstr "Utfør handlinger"
 
-#: mail/folder-browser-factory.c:40 mail/mail-view.c:151
-msgid "Reply to all recipients of this message"
-msgstr "Svar til alle mottakere av denne meldingen"
+#: filter/filter-rule.c:540
+msgid "if all criteria are met"
+msgstr "hvis alle kriterier er møtt"
 
-#: mail/folder-browser-factory.c:42 mail/mail-view.c:154
-msgid "Forward"
-msgstr "Videresend"
+#: filter/filter-rule.c:547
+msgid "if any criteria are met"
+msgstr "hvis et kriterie er møtt"
 
-#: mail/folder-browser-factory.c:42 mail/mail-view.c:154
-msgid "Forward this message"
-msgstr "Videresend denne meldingen"
+#: filter/filter-rule.c:561
+msgid "Add criterion"
+msgstr "Legg til kriterie"
 
-#: mail/folder-browser-factory.c:46
-msgid "Move"
-msgstr "Flytt"
+#: filter/filter-rule.c:567
+msgid "Remove criterion"
+msgstr "Fjern kriterie"
 
-#: mail/folder-browser-factory.c:46
-msgid "Move message to a new folder"
-msgstr "Flytt meldingen til en ny mappe"
+#: filter/score-editor.c:165
+msgid "Edit Score Rule"
+msgstr "Rediger poengregel"
 
-#: mail/folder-browser-factory.c:47
-msgid "Copy message to a new folder"
-msgstr "Kopiér melding til en ny mappe"
+#: filter/score-rule.c:192 filter/score-rule.c:194
+msgid "Score"
+msgstr "Poenggi"
 
-#: mail/folder-browser-factory.c:49 mail/mail-view.c:158
-msgid "Print the selected message"
-msgstr "Skriv ut den valgte meldingen"
+#: filter/vfolder-editor.c:192
+msgid "Edit VFolder Rule"
+msgstr "Redigér VFolder regel"
 
-#: mail/folder-browser-factory.c:51 mail/mail-view.c:160
-msgid "Delete this message"
-msgstr "Slett denne meldingen"
+#: mail/component-factory.c:198
+msgid "Cannot initialize Evolution's mail component."
+msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: mail/folder-browser-factory.c:72
+#: mail/folder-browser-factory.c:50
 #, c-format
 msgid "Run filter \"%s\""
 msgstr "Kjør filter \"%s\""
 
-#: mail/folder-browser-factory.c:130 mail/folder-browser-factory.c:189
-msgid "_Print Message"
-msgstr "Skriv _ut melding"
-
-#: mail/folder-browser-factory.c:140
-msgid "_Threaded Message List"
-msgstr "Meldingsliste med _tråder"
-
-#: mail/folder-browser-factory.c:151
-msgid "Mail _Filters..."
-msgstr "E-post _filtre..."
-
-#: mail/folder-browser-factory.c:156
-msgid "_Virtual Folder Editor..."
-msgstr "Redigering av _virtuelle mapper..."
-
-#: mail/folder-browser-factory.c:161
-msgid "_Mail Configuration..."
-msgstr "_E-post konfigurasjon..."
-
-#: mail/folder-browser-factory.c:166
-msgid "Forget _Passwords"
-msgstr "Glem _passord"
-
-#: mail/folder-browser-factory.c:174
-msgid "_Message"
-msgstr "_Melding"
-
-#: mail/folder-browser-factory.c:178
-msgid "_Open in New Window"
-msgstr "_Åpne i nytt vindu"
-
-#: mail/folder-browser-factory.c:184
-msgid "_Edit Message"
-msgstr "R_edigér melding"
-
-#: mail/folder-browser-factory.c:196
-msgid "Reply to _Sender"
-msgstr "Svar til _sender"
-
-#: mail/folder-browser-factory.c:201
-msgid "Reply to _All"
-msgstr "Svar til _alle"
-
-#: mail/folder-browser-factory.c:206
-msgid "_Forward"
-msgstr "_Videresend"
-
-#: mail/folder-browser-factory.c:213
-msgid "_Delete Message"
-msgstr "_Slett melding"
-
-#: mail/folder-browser-factory.c:218
-msgid "_Move Message"
-msgstr "_Flytt melding"
-
-#: mail/folder-browser-factory.c:223
-msgid "_Copy Message"
-msgstr "_Kopiér melding"
-
-#: mail/folder-browser-factory.c:230
-msgid "_VFolder on Subject"
-msgstr "_VFolder for emne"
-
-#: mail/folder-browser-factory.c:235
-msgid "VFolder on Se_nder"
-msgstr "VFolder for se_nder"
-
-#: mail/folder-browser-factory.c:240
-msgid "VFolder on _Recipients"
-msgstr "VFolder for mottake_re"
-
-#: mail/folder-browser-factory.c:247
-msgid "_Filter on Subject"
-msgstr "_Filter for emne"
-
-#: mail/folder-browser-factory.c:252
-msgid "Fi_lter on Sender"
-msgstr "Fi_lter for sender"
-
-#: mail/folder-browser-factory.c:257
-msgid "Filter on Rec_ipients"
-msgstr "F_ilter for mottakere"
-
-#: mail/folder-browser-factory.c:264
-msgid "F_older"
-msgstr "_Mappe"
-
-#: mail/folder-browser-factory.c:268
-msgid "_Mark all as Read"
-msgstr "_Merk alle som lest"
+#: mail/folder-browser.c:407
+msgid "Save"
+msgstr "Lagre"
 
-#: mail/folder-browser-factory.c:273
-msgid "_Delete all"
-msgstr "_Slett alle"
+#: mail/mail-autofilter.c:75
+#, c-format
+msgid "Mail to %s"
+msgstr "Send til %s"
 
-#: mail/folder-browser-factory.c:278
-msgid "_Expunge"
-msgstr "_Fjern"
+#: mail/mail-autofilter.c:229
+#, c-format
+msgid "Mail from %s"
+msgstr "E-post fra %s"
 
-#: mail/folder-browser-factory.c:283
-msgid "_Configure Folder"
-msgstr "_Konfigurér mappe"
+#: mail/mail-autofilter.c:283 mail/mail-autofilter.c:332
+msgid "Add Filter Rule"
+msgstr "Legg til filterregel"
 
-#: mail/folder-browser.c:407
-msgid "Save"
-msgstr "Lagre"
+#: mail/mail-autofilter.c:328
+#, c-format
+msgid "%s mailing list"
+msgstr "%s e-postliste"
 
-#: mail/mail-callbacks.c:84
+#: mail/mail-callbacks.c:70
 msgid ""
-"You need to configure the mail client\n"
-"before you can compose mail."
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
 msgstr ""
-"Du må konfigurere e-post klienten\n"
-"før du kan skrive e-post."
+"Du har ikke konfigurert e-postklienten.\n"
+"Du må gjøre dette før du kan sende,\n"
+"motta eller skrive meldinger.\n"
+"Vil du konfigurere den nå?"
 
-#: mail/mail-callbacks.c:97
+#: mail/mail-callbacks.c:110
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -3569,7 +3399,7 @@ msgstr ""
 "Du må konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:111
+#: mail/mail-callbacks.c:124
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -3577,7 +3407,7 @@ msgstr ""
 "Du må konfigurere en e-post-transport\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:239
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3585,15 +3415,15 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:477
+#: mail/mail-callbacks.c:492
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:479
+#: mail/mail-callbacks.c:494
 msgid "Copy message(s) to"
 msgstr "Kopiér melding(er) til"
 
-#: mail/mail-callbacks.c:548
+#: mail/mail-callbacks.c:563
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3601,7 +3431,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:639
+#: mail/mail-callbacks.c:654
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3750,6 +3580,48 @@ msgstr "Spør etter autorisasjon hos \"%s\""
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
+#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
+#: mail/mail-config-druid.glade.h:16
+msgid "Mail Configuration"
+msgstr "E-post-konfigurasjon"
+
+#: mail/mail-config-druid.glade.h:9
+msgid ""
+"Welcome to the Evolution Mail configuration wizard!\n"
+"By filling in some information about your email\n"
+"settings, you can start sending and receiving email\n"
+"right away. Click Next to continue."
+msgstr ""
+"Velkommen til Evolution E-post-konfigurasjonsdruiden!\n"
+"Ved å fylle ut litt informasjon om dine e-post-\n"
+"innstillinger kan du begynne å sende og motta e-post\n"
+"med én gang. Klikk neste for å fortsette."
+
+#: mail/mail-config-druid.glade.h:13
+msgid "Identity"
+msgstr "Identitet"
+
+#: mail/mail-config-druid.glade.h:14
+msgid "Mail Source"
+msgstr "E-post-kilde"
+
+#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
+msgid "Mail Transport"
+msgstr "E-post-transport"
+
+#: mail/mail-config-druid.glade.h:17
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"Din e-post-konfigurasjon er nå komplett.\n"
+"Klikk \"Fullfør\" for å lagre dine nye innstillinger"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
 #: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
 msgid "Identities"
 msgstr "Identiteter"
@@ -3771,10 +3643,6 @@ msgstr "Kilder"
 msgid "Mail Sources"
 msgstr "E-post-kilder"
 
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "E-post-transport"
-
 #: mail/mail-config.glade.h:21
 msgid "News Servers"
 msgstr "News-tjenere"
@@ -3791,44 +3659,6 @@ msgstr "Send meldinger i HTML-format"
 msgid "Mark message as seen [ms]: "
 msgstr "Merk melding som sett [ms]: "
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "E-post-konfigurasjon"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"Velkommen til Evolution E-post-konfigurasjonsdruiden!\n"
-"Ved å fylle ut litt informasjon om dine e-post-\n"
-"innstillinger kan du begynne å sende og motta e-post\n"
-"med én gang. Klikk neste for å fortsette."
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "E-post-kilde"
-
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-"Din e-post-konfigurasjon er nå komplett.\n"
-"Klikk \"Fullfør\" for å lagre dine nye innstillinger"
-
 #: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Vennligst skriv inn din PGP/GPG passphrase."
@@ -3846,6 +3676,44 @@ msgstr "Kunne ikke opprette rør til GPG/PGP: %s"
 msgid "No GPG/PGP program available."
 msgstr "Ingen GPG/PGP-program tilgjengelig."
 
+#: mail/mail-display.c:54
+msgid "Overwrite file?"
+msgstr "Overskriv fil?"
+
+#: mail/mail-display.c:58
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"En fil med samme navn eksisterer allerede.\n"
+"Overskriv den?"
+
+#: mail/mail-display.c:260
+msgid "Save to Disk..."
+msgstr "Lagre til disk..."
+
+#: mail/mail-display.c:262
+#, c-format
+msgid "Open in %s..."
+msgstr "Åpne i %s..."
+
+#: mail/mail-display.c:264
+msgid "View Inline"
+msgstr "Vis \"inline\""
+
+#: mail/mail-display.c:285
+msgid "External Viewer"
+msgstr "Ekstern visning"
+
+#: mail/mail-display.c:308
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "Vis \"inline\" (via %s)"
+
+#: mail/mail-display.c:312
+msgid "Hide"
+msgstr "Skjul"
+
 #: mail/mail-local.c:257
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
@@ -3856,6 +3724,12 @@ msgstr "Endrer mappe \"%s\" til \"%s\"-format"
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Endre mappe \"%s\" til \"%s\"-format"
 
+#. This is how we could do to display extra information about the
+#. folder.
+#: mail/mail-local-storage.c:97
+msgid " (XXX unread)"
+msgstr " (XXX ulest)"
+
 #: mail/mail-ops.c:75
 #, c-format
 msgid "Fetching email from %s"
@@ -3874,261 +3748,261 @@ msgstr "Du har ikke konfigurert en ekstern e-post-kilde å hente e-post fra."
 msgid "Bad folder passed to fetch_mail"
 msgstr "Ugyldig mappe sendt til fetch_mail"
 
-#: mail/mail-ops.c:263
+#: mail/mail-ops.c:266
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ingen ny e-post på %s."
 
-#: mail/mail-ops.c:327
+#: mail/mail-ops.c:330
 msgid "Filtering email on demand"
 msgstr "Filtrering av post etter behov"
 
-#: mail/mail-ops.c:329
+#: mail/mail-ops.c:332
 msgid "Filter email on demand"
 msgstr "Fi_ltrér e-post ved behov"
 
-#: mail/mail-ops.c:340
-msgid "Bad filter driver specified"
-msgstr "Ugyldig filter driver spesifisert"
+#: mail/mail-ops.c:343
+msgid "Bad filter context specified"
+msgstr "Ugyldig filterkontekst spesifisert"
 
-#: mail/mail-ops.c:349
+#: mail/mail-ops.c:352
 msgid "Bad input source defined for filtering"
 msgstr "Ugyldig inndatakilde definert for filtrering"
 
-#: mail/mail-ops.c:358
+#: mail/mail-ops.c:361
 msgid "Bad default destination folder"
 msgstr "Ugyldig standard målmappe"
 
-#: mail/mail-ops.c:505
+#: mail/mail-ops.c:514
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:510
+#: mail/mail-ops.c:519
 msgid "Sending a message without a subject"
 msgstr "Sender en melding uten emne"
 
-#: mail/mail-ops.c:513
+#: mail/mail-ops.c:522
 #, c-format
 msgid "Send \"%s\""
 msgstr "Send \"%s\""
 
-#: mail/mail-ops.c:516
+#: mail/mail-ops.c:525
 msgid "Send a message without a subject"
 msgstr "Send en melding uten emne"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:707
 msgid "Sending queue"
 msgstr "Sender kø"
 
-#: mail/mail-ops.c:699
+#: mail/mail-ops.c:709
 msgid "Send queue"
 msgstr "Send kø"
 
-#: mail/mail-ops.c:853 mail/mail-ops.c:860
+#: mail/mail-ops.c:863 mail/mail-ops.c:870
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Legger til \"%s\""
 
-#: mail/mail-ops.c:857 mail/mail-ops.c:863
+#: mail/mail-ops.c:867 mail/mail-ops.c:873
 msgid "Appending a message without a subject"
 msgstr "Legger til en melding uten emne"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:962
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Fjerner \"%s\""
 
-#: mail/mail-ops.c:960
+#: mail/mail-ops.c:964
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Fjern \"%s\""
 
-#: mail/mail-ops.c:1032
+#: mail/mail-ops.c:1036
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flytter meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1038
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierer meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1037
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytt meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:1043
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiér meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1097
+#: mail/mail-ops.c:1101
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:1100
+#: mail/mail-ops.c:1104
 msgid "Copying"
 msgstr "Kopiérer"
 
-#: mail/mail-ops.c:1112
+#: mail/mail-ops.c:1116
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1193
+#: mail/mail-ops.c:1197
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Merker meldinger i mappe \"%s"
 
-#: mail/mail-ops.c:1196
+#: mail/mail-ops.c:1200
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Merk meldinger i mappe \"%s\""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1358
+#: mail/mail-ops.c:1362
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Skann foldere i \"%s\""
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1419
 #, c-format
 msgid "Found subfolder \"%s\""
 msgstr "Fant underfolder i \"%s\""
 
-#: mail/mail-ops.c:1447
+#: mail/mail-ops.c:1453
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1510
+#: mail/mail-ops.c:1516
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Legger ved meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1519
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Legg ved meldinger fra \"%s\""
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1645
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Videresender meldinger \"%s\""
 
-#: mail/mail-ops.c:1644
+#: mail/mail-ops.c:1650
 msgid "Forwarding a message without a subject"
 msgstr "Videresender en melding uten emne"
 
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Videresend meldingen \"%s\""
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1658
 msgid "Forward a message without a subject"
 msgstr "Videresend en melding uten emne"
 
-#: mail/mail-ops.c:1706
+#: mail/mail-ops.c:1712
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1719
+#: mail/mail-ops.c:1725
 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:1808
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Laster \"%s\""
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1816
 #, c-format
 msgid "Load \"%s\""
 msgstr "Last \"%s\""
 
-#: mail/mail-ops.c:1930
+#: mail/mail-ops.c:1936
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Oppretter \"%s\""
 
-#: mail/mail-ops.c:1932
+#: mail/mail-ops.c:1938
 #, c-format
 msgid "Create \"%s\""
 msgstr "Opprett \"%s\""
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2009
 msgid "Exception while reporting result to shell component listener."
 msgstr "Unntak under rapportering av resultat til skallkomponentens lytter."
 
-#: mail/mail-ops.c:2056
+#: mail/mail-ops.c:2062
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkroniserer \"%s\""
 
-#: mail/mail-ops.c:2058
+#: mail/mail-ops.c:2064
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synkronisér \"%s\""
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Viser melding-UID \"%s\""
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2143
 msgid "Clearing message display"
 msgstr "Tømmer meldingsvisning"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Vis meldings-UID \"%s\""
 
-#: mail/mail-ops.c:2143
+#: mail/mail-ops.c:2149
 msgid "Clear message display"
 msgstr "Tøm meldingsvisning"
 
-#: mail/mail-ops.c:2270
+#: mail/mail-ops.c:2276
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Åpner meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2273
+#: mail/mail-ops.c:2279
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Åpne meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2394
+#: mail/mail-ops.c:2401
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Laster %s-mappe"
 
-#: mail/mail-ops.c:2396
+#: mail/mail-ops.c:2403
 #, c-format
 msgid "Load %s Folder"
 msgstr "Last %s-mappe"
 
-#: mail/mail-ops.c:2471
+#: mail/mail-ops.c:2478
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Viser meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:2481
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Vis meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2520
+#: mail/mail-ops.c:2527
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Henter melding %d av %d (uid \"%s\")"
@@ -4224,45 +4098,132 @@ msgstr ""
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
-#: mail/message-list.c:641
-msgid "Online Status"
-msgstr "Tilkoblet status"
+#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
+#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
+#: mail/mail-view.c:151
+msgid "Reply"
+msgstr "Svar"
+
+#: mail/mail-view.c:151
+msgid "Reply to the sender of this message"
+msgstr "Svar til avsender av denne meldingen"
+
+#: mail/mail-view.c:154 mail/message-list.c:1281
+msgid "Reply to All"
+msgstr "Svar til alle"
+
+#: mail/mail-view.c:154
+msgid "Reply to all recipients of this message"
+msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/message-list.c:677
+#: mail/mail-view.c:157
+msgid "Forward"
+msgstr "Videresend"
+
+#: mail/mail-view.c:157
+msgid "Forward this message"
+msgstr "Videresend denne meldingen"
+
+#: mail/mail-view.c:161
+msgid "Print"
+msgstr "Skriv ut"
+
+#: mail/mail-view.c:161
+msgid "Print the selected message"
+msgstr "Skriv ut den valgte meldingen"
+
+#: mail/mail-view.c:163
+msgid "Delete this message"
+msgstr "Slett denne meldingen"
+
+#: mail/message-list.c:722
 msgid "From"
 msgstr "Fra"
 
-#: mail/message-list.c:684
+#: mail/message-list.c:729
 msgid "Subject"
 msgstr "Emne"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:736
 msgid "Date"
 msgstr "Dato"
 
-#: mail/message-list.c:698
+#: mail/message-list.c:743
 msgid "Received"
 msgstr "Mottatt"
 
-#: mail/message-list.c:705
+#: mail/message-list.c:750
 msgid "To"
 msgstr "Til"
 
-#: mail/message-list.c:712
+#: mail/message-list.c:757
 msgid "Size"
 msgstr "Størrelse"
 
-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr "Opprett en ny notis"
+#: mail/message-list.c:1276
+msgid "Open in New Window"
+msgstr "Åpne i nytt vindu"
+
+#: mail/message-list.c:1277
+msgid "Edit Message"
+msgstr "Redigér melding"
+
+#: mail/message-list.c:1278
+msgid "Print Message"
+msgstr "Skriv ut melding"
+
+#: mail/message-list.c:1280
+msgid "Reply to Sender"
+msgstr "Svar til sender"
+
+#: mail/message-list.c:1282
+msgid "Forward Message"
+msgstr "Videresend melding"
 
-#: notes/component-factory.c:148
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Kan ikke initialisere Evolutions notiskomponent."
+#: mail/message-list.c:1284
+msgid "Delete Message"
+msgstr "Slett melding"
 
-#: notes/main.c:30
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Notiskomponent: Kunne ikke initialisere Bonobo"
+#: mail/message-list.c:1285
+msgid "Move Message"
+msgstr "Flytt melding"
+
+#: mail/message-list.c:1286
+msgid "Copy Message"
+msgstr "Kopiér melding"
+
+#: mail/message-list.c:1288
+msgid "VFolder on Subject"
+msgstr "VFolder for emne"
+
+#: mail/message-list.c:1289
+msgid "VFolder on Sender"
+msgstr "VFolder for sender"
+
+#: mail/message-list.c:1290
+msgid "VFolder on Recipients"
+msgstr "VFolder for mottakere"
+
+#: mail/message-list.c:1292
+msgid "Filter on Subject"
+msgstr "Filtrér etter emne"
+
+#: mail/message-list.c:1293
+msgid "Filter on Sender"
+msgstr "Filtrér etter sender"
+
+#: mail/message-list.c:1294
+msgid "Filter on Recipients"
+msgstr "Filtrér etter mottaker"
+
+#: mail/message-list.c:1295 mail/message-list.c:1318
+msgid "Filter on Mailing List"
+msgstr "Filtrér etter e-postliste"
+
+#: mail/message-list.c:1320
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr "Filtrér etter e-postliste (%s)"
 
 #: shell/e-setup.c:47
 msgid "Evolution installation"
@@ -4347,31 +4308,31 @@ msgstr ""
 "Typen for valgt mappe er ikke gyldig for den\n"
 "forespurte operasjonen."
 
-#: shell/e-shell-folder-selection-dialog.c:272
+#: shell/e-shell-folder-selection-dialog.c:274
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:452 shell/e-shell-folder-title-bar.c:453
+#: shell/e-shell-folder-title-bar.c:448 shell/e-shell-folder-title-bar.c:449
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
 #. you might have to call gnome_dialog_run() on the
 #. * dialog returned here, I don't remember...
 #.
-#: shell/e-shell-view-menu.c:113
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
 #. same as above
-#: shell/e-shell-view-menu.c:119
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-view-menu.c:167
+#: shell/e-shell-view-menu.c:168
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:170
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -4381,127 +4342,19 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljøet."
 
-#: shell/e-shell-view-menu.c:319
+#: shell/e-shell-view-menu.c:325
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view-menu.c:377
-msgid "_New"
-msgstr "_Ny"
-
-#: shell/e-shell-view-menu.c:389
-msgid "_Folder"
-msgstr "_Mappe"
-
-#: shell/e-shell-view-menu.c:395
-msgid "Evolution bar _shortcut"
-msgstr "_Snarvei til Evolution-linje"
-
-#: shell/e-shell-view-menu.c:404
-msgid "_Mail message (FIXME)"
-msgstr "E-post _melding"
-
-#: shell/e-shell-view-menu.c:410
-msgid "_Appointment (FIXME)"
-msgstr "_Avtale"
-
-#: shell/e-shell-view-menu.c:416
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt"
-
-#: shell/e-shell-view-menu.c:422
-msgid "_Task (FIXME)"
-msgstr "_Oppgave"
-
-#: shell/e-shell-view-menu.c:444
-msgid "_Go to Folder..."
-msgstr "_Gå til mappe..."
-
-#: shell/e-shell-view-menu.c:445
-msgid "Display a different folder"
-msgstr "Vis en annen mappe"
-
-#: shell/e-shell-view-menu.c:452
-msgid "_Create New Folder..."
-msgstr "_Opprett ny mappe..."
-
-#: shell/e-shell-view-menu.c:453 shell/e-shell-view-menu.c:465
-msgid "Create a new folder"
-msgstr "Opprett en ny mappe"
-
-#: shell/e-shell-view-menu.c:464
-msgid "E_xit..."
-msgstr "A_vslutt..."
-
-#: shell/e-shell-view-menu.c:495
-msgid "Show _Shortcut Bar"
-msgstr "Vis _snarveilinje"
-
-#: shell/e-shell-view-menu.c:496
-msgid "Show the shortcut bar"
-msgstr "Viser snarveilinjen"
-
-#: shell/e-shell-view-menu.c:501
-msgid "Show _Folder Bar"
-msgstr "Vis _mappelinje"
-
-#: shell/e-shell-view-menu.c:502
-msgid "Show the folder bar"
-msgstr "Viser folderlinjen"
-
-#: shell/e-shell-view-menu.c:513
-msgid "_Settings"
-msgstr "Inn_stillinger"
-
-#: shell/e-shell-view-menu.c:524
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: shell/e-shell-view-menu.c:530
-msgid "Help _Index"
-msgstr "Hjelp _indeks"
-
-#: shell/e-shell-view-menu.c:537
-msgid "Getting _Started"
-msgstr "Kom _igang"
-
-#: shell/e-shell-view-menu.c:544
-msgid "Using the _Mailer"
-msgstr "Bruk av _e-postleseren"
-
-#: shell/e-shell-view-menu.c:551
-msgid "Using the _Calendar"
-msgstr "Bruk av _kalenderen"
-
-#: shell/e-shell-view-menu.c:558
-msgid "Using the C_ontact Manager"
-msgstr "Bruk av k_ontaktlisten"
-
-#: shell/e-shell-view-menu.c:568
-msgid "_Submit Bug Report"
-msgstr "_Send feilrapport"
-
-#: shell/e-shell-view-menu.c:569
-msgid "Submit bug report using Bug Buddy"
-msgstr "Send feilrapport med bug-buddy"
-
-#: shell/e-shell-view-menu.c:578
-msgid "_About Evolution..."
-msgstr "_Om Evolution..."
-
-#: shell/e-shell-view-menu.c:579
-msgid "Show information about Evolution"
-msgstr "Vis informasjon om Evolution"
-
-#: shell/e-shell-view.c:128
+#: shell/e-shell-view.c:127
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:396
+#: shell/e-shell-view.c:406
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:942
+#: shell/e-shell-view.c:981
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
@@ -4543,63 +4396,63 @@ msgstr "Fjern denne snarveien fra snarveilinjen"
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-storage.c:146
+#: shell/e-storage.c:127
 msgid "(No name)"
 msgstr "(Uten navn)"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:318
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:320
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:322
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:324
 msgid "The specified folder type is not valid"
 msgstr "Spesifisert mappetype er ikke gyldig"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:326
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:328
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plass til å opprette mappen"
 
-#: shell/e-storage.c:349
+#: shell/e-storage.c:330
 msgid "The specified folder was not found"
 msgstr "Spesifisert mappe ble ikke funnet"
 
-#: shell/e-storage.c:351
+#: shell/e-storage.c:332
 msgid "Function not implemented in this storage"
 msgstr "Funksjonen er ikke implementert i dette lageret"
 
-#: shell/e-storage.c:353
+#: shell/e-storage.c:334
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: shell/e-storage.c:355
+#: shell/e-storage.c:336
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke støttet"
 
-#: shell/e-storage.c:357
+#: shell/e-storage.c:338
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
-#: shell/e-storage.c:359
+#: shell/e-storage.c:340
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: shell/e-storage-set-view.c:221
+#: shell/e-storage-set-view.c:223
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
-#: shell/main.c:67
+#: shell/main.c:68
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -4638,7 +4491,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: shell/main.c:94
+#: shell/main.c:95
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -4646,147 +4499,14 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: shell/main.c:122
+#: shell/main.c:123
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan ikke initialisere Evolution skallet."
 
-#: shell/main.c:159
+#: shell/main.c:160
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
-#: tests/ui-tests/message-browser.c:360
-msgid "The component now claims that it doesn't support PersistStream!"
-msgstr "Komponenten hevder nå at den ikke støtter PersistStream!"
-
-#: tests/ui-tests/message-browser.c:378
-msgid ""
-"An exception occured while trying to load data into the component with "
-"PersistStream"
-msgstr ""
-"Et unntak oppsto under forsøk på å laste data inn i komponenten med "
-"PersistStream"
-
-#: tests/ui-tests/message-browser.c:471
-#, c-format
-msgid "The %s component doesn't support PersistStream!\n"
-msgstr "Komponenten %s støtter ikke PersistStream!\n"
-
-#: tests/ui-tests/message-browser.c:710
-msgid "Open Mime Message"
-msgstr "Åpne MIME-melding"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: widgets/e-table/e-table-config.glade.h:7
-msgid "Fields"
-msgstr "Felt"
-
-#: widgets/e-table/e-table-config.glade.h:8
-msgid "Grouping"
-msgstr "Gruppering"
-
-#: widgets/e-table/e-table-config.glade.h:9
-msgid "Sort"
-msgstr "Sorter"
-
-#: widgets/e-table/e-table-config.glade.h:10
-msgid "Filter"
-msgstr "Filter"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: widgets/e-table/e-table-field-chooser.glade.h:7
-#: widgets/e-table/e-table-header-item.c:1164
-msgid "Field Chooser"
-msgstr "Feltvelger"
-
-#: widgets/e-table/e-table-field-chooser.glade.h:8
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
-msgstr ""
-"For å legge til en kolonne i tabellen, dra den til\n"
-"plasseringen du ønsker å ha den."
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: widgets/e-table/e-table-group.glade.h:7
-msgid "window1"
-msgstr "vindu1"
-
-#: widgets/e-table/e-table-group.glade.h:8
-msgid "Available fields"
-msgstr "Tilgjengelige felter"
-
-#: widgets/e-table/e-table-group.glade.h:9
-msgid "label1"
-msgstr "etikett1"
-
-#: widgets/e-table/e-table-group.glade.h:10
-msgid "Show in this order"
-msgstr "Vis i denne rekkefølgen"
-
-#: widgets/e-table/e-table-group.glade.h:11
-msgid "label2"
-msgstr "etikett2"
-
-#: widgets/e-table/e-table-group.glade.h:12
-msgid "Add >>"
-msgstr "Legg til >>"
-
-#: widgets/e-table/e-table-group.glade.h:13
-msgid "<< Remove"
-msgstr "<< Fjern"
-
-#: widgets/e-table/e-table-header-item.c:1156
-msgid "Sort Ascending"
-msgstr "Sortér stigende"
-
-#: widgets/e-table/e-table-header-item.c:1157
-msgid "Sort Descending"
-msgstr "Sortér synkende"
-
-#: widgets/e-table/e-table-header-item.c:1158
-msgid "Unsort"
-msgstr "Ikke sortér"
-
-#: widgets/e-table/e-table-header-item.c:1160
-msgid "Group By This Field"
-msgstr "Gruppér etter dette feltet"
-
-#: widgets/e-table/e-table-header-item.c:1161
-msgid "Group By Box"
-msgstr "Gruppér etter boks"
-
-#: widgets/e-table/e-table-header-item.c:1163
-msgid "Remove This Column"
-msgstr "Fjern denne kolonnen"
-
-#: widgets/e-table/e-table-header-item.c:1166
-msgid "Alignment"
-msgstr "Justering"
-
-#: widgets/e-table/e-table-header-item.c:1167
-msgid "Best Fit"
-msgstr "Beste tilpasning"
-
-#: widgets/e-table/e-table-header-item.c:1168
-msgid "Format Columns..."
-msgstr "Formatér kolonner..."
-
-#: widgets/e-table/e-table-header-item.c:1170
-msgid "Customize Current View..."
-msgstr "Tilpass aktiv visning..."
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Tentativ"
@@ -4863,6 +4583,11 @@ msgstr "Tid for møtets slutt:"
 msgid "All Attendees"
 msgstr "Alle deltakere"
 
+#. Create the 'Today' and 'None' buttons but don't show them.
+#: widgets/misc/e-calendar.c:158 widgets/misc/e-dateedit.c:323
+msgid "Today"
+msgstr "Idag"
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:422
@@ -4873,6 +4598,10 @@ msgstr "MTWTFSS"
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:317
+msgid "Now"
+msgstr "nå"
+
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"