Update for 0.2.

svn path=/trunk/; revision=4086

1 files changed, 565 insertions, 598 deletions

diff --git a/po/no.po b/po/no.po
index 37e7162ce9..856908d4c5 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2000-06-28 00:43+0200\n"
+"POT-Creation-Date: 2000-07-10 21:51-0400\n"
 "PO-Revision-Date: 2000-06-28 00:50+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/gui/component/addressbook-factory.c:57
-#: calendar/gui/evolution-calendar-control.c:64 calendar/gui/main.c:68
+#: addressbook/gui/component/addressbook-factory.c:58
+#: calendar/gui/calendar-pilot-sync.c:138 calendar/gui/main.c:68
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -36,497 +36,477 @@ msgstr ""
 msgid "Available Categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:579
 #: calendar/gui/event-editor.c:1118
 #, fuzzy
 msgid "FIXME: _Appointment"
 msgstr "_Avtale"
 
-#: addressbook/contact-editor/e-contact-editor.c:579
+#: addressbook/contact-editor/e-contact-editor.c:580
 #: calendar/gui/event-editor.c:1119
 #, fuzzy
 msgid "FIXME: Meeting Re_quest"
 msgstr "Møteforesp_ørsel"
 
-#: addressbook/contact-editor/e-contact-editor.c:581
+#: addressbook/contact-editor/e-contact-editor.c:582
 #: calendar/gui/event-editor.c:1121
 #, fuzzy
 msgid "FIXME: _Mail Message"
 msgstr "E-post _melding"
 
-#: addressbook/contact-editor/e-contact-editor.c:582
+#: addressbook/contact-editor/e-contact-editor.c:583
 #: calendar/gui/event-editor.c:1122
 #, fuzzy
 msgid "FIXME: _Contact"
 msgstr "_Kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:583
+#: addressbook/contact-editor/e-contact-editor.c:584
 #: calendar/gui/event-editor.c:1123
 msgid "FIXME: _Task"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:584
+#: addressbook/contact-editor/e-contact-editor.c:585
 #: calendar/gui/event-editor.c:1124
 #, fuzzy
 msgid "FIXME: Task _Request"
 msgstr "Oppgavefo_respørsel"
 
-#: addressbook/contact-editor/e-contact-editor.c:585
+#: addressbook/contact-editor/e-contact-editor.c:586
 #: calendar/gui/event-editor.c:1125
 #, fuzzy
 msgid "FIXME: _Journal Entry"
 msgstr "_Journaloppføring"
 
-#: addressbook/contact-editor/e-contact-editor.c:586
+#: addressbook/contact-editor/e-contact-editor.c:587
 #: calendar/gui/event-editor.c:1126
 msgid "FIXME: _Note"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:588
-#: addressbook/contact-editor/e-contact-editor.c:693
+#: addressbook/contact-editor/e-contact-editor.c:589
+#: addressbook/contact-editor/e-contact-editor.c:694
 #: calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:593
+#: addressbook/contact-editor/e-contact-editor.c:594
 #: calendar/gui/event-editor.c:1133
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:595
+#: addressbook/contact-editor/e-contact-editor.c:596
 #: calendar/gui/event-editor.c:1135
 msgid "FIXME: Define Print _Styles..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:602
+#: addressbook/contact-editor/e-contact-editor.c:603
 #: calendar/gui/event-editor.c:1142
 msgid "FIXME: S_end"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:606
+#: addressbook/contact-editor/e-contact-editor.c:607
 #: calendar/gui/event-editor.c:1146
 #, fuzzy
 msgid "FIXME: Save Attac_hments..."
 msgstr "Legg til vedlegg..."
 
-#: addressbook/contact-editor/e-contact-editor.c:608
+#: addressbook/contact-editor/e-contact-editor.c:609
 #: calendar/gui/event-editor.c:1148
 #, fuzzy
 msgid "FIXME: _Delete"
 msgstr "_Slett"
 
-#: addressbook/contact-editor/e-contact-editor.c:609
+#: addressbook/contact-editor/e-contact-editor.c:610
 #: calendar/gui/event-editor.c:1149
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:610
+#: addressbook/contact-editor/e-contact-editor.c:611
 #: calendar/gui/event-editor.c:1150
 msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:612
+#: addressbook/contact-editor/e-contact-editor.c:613
 #: calendar/gui/event-editor.c:1152
 msgid "Page Set_up"
 msgstr "Sideoppsett"
 
-#: addressbook/contact-editor/e-contact-editor.c:613
+#: addressbook/contact-editor/e-contact-editor.c:614
 #: calendar/gui/event-editor.c:1153
 msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:634
+#: addressbook/contact-editor/e-contact-editor.c:635
 #: calendar/gui/event-editor.c:1174
 msgid "FIXME: Paste _Special..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:639
+#: addressbook/contact-editor/e-contact-editor.c:640
 #: calendar/gui/event-editor.c:1179
 msgid "FIXME: Mark as U_nread"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:643
+#: addressbook/contact-editor/e-contact-editor.c:644
 #: calendar/gui/event-editor.c:1183
 msgid "_Object"
 msgstr "_Objekt"
 
-#: addressbook/contact-editor/e-contact-editor.c:648
-#: addressbook/contact-editor/e-contact-editor.c:655
+#: addressbook/contact-editor/e-contact-editor.c:649
+#: addressbook/contact-editor/e-contact-editor.c:656
 #: calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
 msgid "FIXME: _Item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:649
-#: addressbook/contact-editor/e-contact-editor.c:656
+#: addressbook/contact-editor/e-contact-editor.c:650
+#: addressbook/contact-editor/e-contact-editor.c:657
 #: calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:650
+#: addressbook/contact-editor/e-contact-editor.c:651
 #: calendar/gui/event-editor.c:1190
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:657
+#: addressbook/contact-editor/e-contact-editor.c:658
 #: calendar/gui/event-editor.c:1197
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:662
+#: addressbook/contact-editor/e-contact-editor.c:663
 #: calendar/gui/event-editor.c:1202
 msgid "FIXME: _Standard"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:664
+#: addressbook/contact-editor/e-contact-editor.c:665
 #: calendar/gui/event-editor.c:1204
 msgid "FIXME: __Formatting"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:667
+#: addressbook/contact-editor/e-contact-editor.c:668
 #: calendar/gui/event-editor.c:1207
 msgid "FIXME: _Customize..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:672
+#: addressbook/contact-editor/e-contact-editor.c:673
 #: calendar/gui/event-editor.c:1212
 msgid "Pre_vious"
 msgstr "Forri_ge"
 
-#: addressbook/contact-editor/e-contact-editor.c:673
+#: addressbook/contact-editor/e-contact-editor.c:674
 #: calendar/gui/event-editor.c:1213
 msgid "Ne_xt"
 msgstr "Nes_te"
 
-#: addressbook/contact-editor/e-contact-editor.c:675
+#: addressbook/contact-editor/e-contact-editor.c:676
 #: calendar/gui/event-editor.c:1217
 msgid "_Toolbars"
 msgstr "Verk_tøylinjer"
 
-#: addressbook/contact-editor/e-contact-editor.c:680
+#: addressbook/contact-editor/e-contact-editor.c:681
 #: calendar/gui/event-editor.c:1222
 msgid "FIXME: _File..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:681
+#: addressbook/contact-editor/e-contact-editor.c:682
 #: calendar/gui/event-editor.c:1223
 msgid "FIXME: It_em..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:682
+#: addressbook/contact-editor/e-contact-editor.c:683
 #: calendar/gui/event-editor.c:1224
 msgid "FIXME: _Object..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:687
+#: addressbook/contact-editor/e-contact-editor.c:688
 #: calendar/gui/event-editor.c:1229
 msgid "FIXME: _Font..."
 msgstr "FIXME: Skri_fttyper..."
 
-#: addressbook/contact-editor/e-contact-editor.c:688
+#: addressbook/contact-editor/e-contact-editor.c:689
 #: calendar/gui/event-editor.c:1230
 msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:695
+#: addressbook/contact-editor/e-contact-editor.c:696
 #: calendar/gui/event-editor.c:1237
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:696
+#: addressbook/contact-editor/e-contact-editor.c:697
 #: calendar/gui/event-editor.c:1238
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:698
+#: addressbook/contact-editor/e-contact-editor.c:699
 #: calendar/gui/event-editor.c:1240
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:699
+#: addressbook/contact-editor/e-contact-editor.c:700
 #: calendar/gui/event-editor.c:1241
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:701
+#: addressbook/contact-editor/e-contact-editor.c:702
 #: calendar/gui/event-editor.c:1243
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:706
+#: addressbook/contact-editor/e-contact-editor.c:707
 #: calendar/gui/event-editor.c:1248
 msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:708
+#: addressbook/contact-editor/e-contact-editor.c:709
 #: calendar/gui/event-editor.c:1253
 msgid "_Forms"
 msgstr "Sk_jemaer"
 
-#: addressbook/contact-editor/e-contact-editor.c:713
+#: addressbook/contact-editor/e-contact-editor.c:714
 #, fuzzy
 msgid "FIXME: _New Contact"
 msgstr "_Kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:714
+#: addressbook/contact-editor/e-contact-editor.c:715
 msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:716
+#: addressbook/contact-editor/e-contact-editor.c:717
 #, fuzzy
 msgid "FIXME: New _Letter to Contact"
 msgstr "_Kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:717
+#: addressbook/contact-editor/e-contact-editor.c:718
 #, fuzzy
 msgid "FIXME: New _Message to Contact"
 msgstr "_Kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:718
+#: addressbook/contact-editor/e-contact-editor.c:719
 #, fuzzy
 msgid "FIXME: New Meetin_g with Contact"
 msgstr "_Kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:719
+#: addressbook/contact-editor/e-contact-editor.c:720
 #, fuzzy
 msgid "FIXME: _Plan a Meeting..."
 msgstr "Skrifttype..."
 
-#: addressbook/contact-editor/e-contact-editor.c:720
+#: addressbook/contact-editor/e-contact-editor.c:721
 #, fuzzy
 msgid "FIXME: New _Task for Contact"
 msgstr "_Kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:721
+#: addressbook/contact-editor/e-contact-editor.c:722
 #, fuzzy
 msgid "FIXME: New _Journal Entry for Contact"
 msgstr "_Journaloppføring"
 
-#: addressbook/contact-editor/e-contact-editor.c:723
+#: addressbook/contact-editor/e-contact-editor.c:724
 msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:724
+#: addressbook/contact-editor/e-contact-editor.c:725
 #, fuzzy
 msgid "FIXME: _Display Map of Address"
 msgstr "E-post _melding"
 
-#: addressbook/contact-editor/e-contact-editor.c:725
+#: addressbook/contact-editor/e-contact-editor.c:726
 #, fuzzy
 msgid "FIXME: _Open Web Page"
 msgstr "E-post _melding"
 
-#: addressbook/contact-editor/e-contact-editor.c:727
+#: addressbook/contact-editor/e-contact-editor.c:728
 #, fuzzy
 msgid "FIXME: Forward as _vCard"
 msgstr "Videresend"
 
-#: addressbook/contact-editor/e-contact-editor.c:728
+#: addressbook/contact-editor/e-contact-editor.c:729
 #: calendar/gui/event-editor.c:1266
 #, fuzzy
 msgid "FIXME: For_ward"
 msgstr "Videresend"
 
-#: addressbook/contact-editor/e-contact-editor.c:740
+#: addressbook/contact-editor/e-contact-editor.c:741
 #: calendar/gui/event-editor.c:1279
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: addressbook/contact-editor/e-contact-editor.c:741
+#: addressbook/contact-editor/e-contact-editor.c:742
 #: calendar/gui/event-editor.c:1280
 msgid "F_ormat"
 msgstr "F_ormat"
 
 #. FIXME: add Favorites here
-#: addressbook/contact-editor/e-contact-editor.c:742
-#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:468
+#: addressbook/contact-editor/e-contact-editor.c:743
+#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:473
 msgid "_Tools"
 msgstr "_Verktøy"
 
-#: addressbook/contact-editor/e-contact-editor.c:743
+#: addressbook/contact-editor/e-contact-editor.c:744
 #: calendar/gui/event-editor.c:1282
 msgid "Actio_ns"
 msgstr "Ha_ndlinger"
 
-#: addressbook/contact-editor/e-contact-editor.c:774
-#: calendar/gui/event-editor.c:1320
-msgid "FIXME: Save and Close"
-msgstr ""
-
 #: addressbook/contact-editor/e-contact-editor.c:775
+#, fuzzy
+msgid "Save and Close"
+msgstr "Lagre kalender som"
+
+#: addressbook/contact-editor/e-contact-editor.c:776
 #: calendar/gui/event-editor.c:1321
 msgid "Save the appointment and close the dialog box"
 msgstr "Lagre avtalen og lukk dialogboksen"
 
-#: addressbook/contact-editor/e-contact-editor.c:779
+#: addressbook/contact-editor/e-contact-editor.c:780
 #: calendar/gui/event-editor.c:1325
 msgid "FIXME: Print..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:780
+#: addressbook/contact-editor/e-contact-editor.c:781
 #: calendar/gui/event-editor.c:1326
 msgid "Print this item"
 msgstr "Skriv ut denne oppføringen"
 
-#: addressbook/contact-editor/e-contact-editor.c:781
+#: addressbook/contact-editor/e-contact-editor.c:782
 #: calendar/gui/event-editor.c:1327
 msgid "FIXME: Insert File..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:782
+#: addressbook/contact-editor/e-contact-editor.c:783
 #: calendar/gui/event-editor.c:1328
 msgid "Insert a file as an attachment"
 msgstr "Sett inn en fil som vedlegg"
 
-#: addressbook/contact-editor/e-contact-editor.c:784
-#: calendar/gui/event-editor.c:1330
-msgid "FIXME: Recurrence..."
-msgstr ""
-
 #: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/event-editor.c:1331
-msgid "Configure recurrence rules"
-msgstr "Konfigurér regler for gjenintrffelse"
-
-#: addressbook/contact-editor/e-contact-editor.c:787
-#: calendar/gui/event-editor.c:1333
-msgid "FIXME: Invite Attendees..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/event-editor.c:1334
-msgid "Invite attendees to a meeting"
-msgstr "Invitér deltakere til et møte"
-
-#: addressbook/contact-editor/e-contact-editor.c:790
 #: calendar/gui/event-editor.c:1336
 #, fuzzy
 msgid "FIXME: Delete"
 msgstr "Slett"
 
-#: addressbook/contact-editor/e-contact-editor.c:791
+#: addressbook/contact-editor/e-contact-editor.c:786
 #: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:326
 msgid "Delete this item"
 msgstr "Slett denne oppføringen"
 
-#: addressbook/contact-editor/e-contact-editor.c:793
+#: addressbook/contact-editor/e-contact-editor.c:788
 #: calendar/gui/event-editor.c:1339
 msgid "FIXME: Previous"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:794
+#: addressbook/contact-editor/e-contact-editor.c:789
 #: calendar/gui/event-editor.c:1340
 msgid "Go to the previous item"
 msgstr "Gå til forrige oppføring"
 
-#: addressbook/contact-editor/e-contact-editor.c:795
+#: addressbook/contact-editor/e-contact-editor.c:790
 #: calendar/gui/event-editor.c:1341
 msgid "FIXME: Next"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:796
+#: addressbook/contact-editor/e-contact-editor.c:791
 #: calendar/gui/event-editor.c:1342
 msgid "Go to the next item"
 msgstr "Gå til neste oppføring"
 
-#: addressbook/contact-editor/e-contact-editor.c:797
+#: addressbook/contact-editor/e-contact-editor.c:792
 #: calendar/gui/event-editor.c:1343
 msgid "FIXME: Help"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:798
+#: addressbook/contact-editor/e-contact-editor.c:793
 #: calendar/gui/event-editor.c:1344
 msgid "See online help"
 msgstr "Se hjelp"
 
-#: addressbook/contact-editor/e-contact-editor.c:1213
+#: addressbook/contact-editor/e-contact-editor.c:1208
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1214
-#: addressbook/contact-editor/e-contact-editor.c:1318
+#: addressbook/contact-editor/e-contact-editor.c:1209
+#: addressbook/contact-editor/e-contact-editor.c:1313
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1215
+#: addressbook/contact-editor/e-contact-editor.c:1210
 msgid "Business 2"
 msgstr "Arbeid 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1216
+#: addressbook/contact-editor/e-contact-editor.c:1211
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:1212
 msgid "Callback"
 msgstr "Tilbakering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
+#: addressbook/contact-editor/e-contact-editor.c:1213
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1219
+#: addressbook/contact-editor/e-contact-editor.c:1214
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1220
-#: addressbook/contact-editor/e-contact-editor.c:1319
+#: addressbook/contact-editor/e-contact-editor.c:1215
+#: addressbook/contact-editor/e-contact-editor.c:1314
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:1216
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:1217
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1218
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:1219
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1320 mail/mail-config.c:2039
+#: addressbook/contact-editor/e-contact-editor.c:1220
+#: addressbook/contact-editor/e-contact-editor.c:1315
 msgid "Other"
 msgstr "Annet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:1221
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1227
+#: addressbook/contact-editor/e-contact-editor.c:1222
 msgid "Pager"
 msgstr "Personsøker"
 
-#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1223
 msgid "Primary"
 msgstr "Primær"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:1224
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1225
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/contact-editor/e-contact-editor.c:1226
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1270
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1272
 msgid "Email 3"
 msgstr "E-post 3"
 
@@ -553,8 +533,7 @@ msgid "New phone type"
 msgstr "Ny telefontype"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:91 mail/mail-config.c:1847
-#: mail/mail-config.c:1943
+#: calendar/gui/event-editor-dialog.glade.h:91
 msgid "Add"
 msgstr "Legg til"
 
@@ -730,80 +709,62 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/gui/component/addressbook.c:417 mail/message-list.c:697
-msgid "To"
-msgstr "Til"
-
-#: addressbook/gui/component/addressbook.c:418 mail/message-list.c:669
-msgid "From"
-msgstr "Fra"
-
-#: addressbook/gui/component/addressbook.c:419
-msgid "Cc"
-msgstr "Cc"
-
-#: addressbook/gui/component/addressbook.c:424
-#: calendar/gui/calendar-commands.c:544 notes/component-factory.c:27
+#: addressbook/gui/component/addressbook.c:415
+#: calendar/gui/calendar-commands.c:544
 msgid "New"
 msgstr "Ny"
 
-#: addressbook/gui/component/addressbook.c:424
+#: addressbook/gui/component/addressbook.c:415
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: addressbook/gui/component/addressbook.c:428
-#: mail/folder-browser-factory.c:37
+#: addressbook/gui/component/addressbook.c:419
 msgid "Find"
 msgstr "Finn"
 
-#: addressbook/gui/component/addressbook.c:428
+#: addressbook/gui/component/addressbook.c:419
 msgid "Find a contact"
 msgstr "Finn en kontakt"
 
-#: addressbook/gui/component/addressbook.c:429
-#: addressbook/gui/component/addressbook.c:496
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:48
+#: addressbook/gui/component/addressbook.c:420
+#: addressbook/gui/component/addressbook.c:487
+#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/component/addressbook.c:429
+#: addressbook/gui/component/addressbook.c:420
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
 #. Delete
-#: addressbook/gui/component/addressbook.c:430
+#: addressbook/gui/component/addressbook.c:421
 #: calendar/gui/event-editor-dialog.glade.h:93 calendar/gui/gncal-todo.c:498
-#: mail/folder-browser-factory.c:50 mail/mail-config.c:1865
-#: mail/mail-config.c:1961
+#: mail/folder-browser-factory.c:45
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/component/addressbook.c:430
+#: addressbook/gui/component/addressbook.c:421
 msgid "Delete a contact"
 msgstr "Slett en kontakt"
 
-#: addressbook/gui/component/addressbook.c:503
-msgid "Test Select Names"
-msgstr "Prøv utvalgte navn"
-
-#: addressbook/gui/component/addressbook.c:510
-#: addressbook/gui/component/addressbook.c:1056
+#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:1034
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:517
+#: addressbook/gui/component/addressbook.c:501
 msgid "_New Contact"
 msgstr "_Ny kontakt"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:509
 msgid "N_ew Directory Server"
 msgstr "N_y katalogtjener"
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:588
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:609
+#: addressbook/gui/component/addressbook.c:593
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -824,20 +785,20 @@ msgstr ""
 "installere OpenLDAP, deretter må du kompilere og\n"
 "installere Evolution på nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:960
+#: addressbook/gui/component/addressbook.c:938
 #: addressbook/gui/minicard/e-minicard.c:329
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
-#: addressbook/gui/component/addressbook.c:1027
+#: addressbook/gui/component/addressbook.c:1005
 msgid "* Click here to add a contact *"
 msgstr "* Klikk her for å legge til en kontakt *"
 
-#: addressbook/gui/component/addressbook.c:1063
+#: addressbook/gui/component/addressbook.c:1041
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
-#: addressbook/gui/component/addressbook.c:1114
+#: addressbook/gui/component/addressbook.c:1092
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -981,26 +942,10 @@ msgstr "Portnummer:"
 msgid "Root DN:"
 msgstr "Rot DN:"
 
-#.
-#. * 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.glade.h:7
-msgid "Select Names"
-msgstr "Velg navn"
-
-#: addressbook/gui/component/select-names.glade.h:8
-msgid "Find..."
-msgstr "Finn..."
-
-#: addressbook/gui/component/select-names.glade.h:9
-msgid "T_ype name or select from List:"
-msgstr ""
-
-#: addressbook/gui/component/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "Meldingsmottakere"
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: composer/e-msg-composer-address-dialog.glade.h:8
+msgid "Name:"
+msgstr "Navn:"
 
 #: addressbook/gui/minicard/e-minicard-view.c:110
 msgid ""
@@ -1307,7 +1252,7 @@ msgstr "År"
 msgid "Show 1 year"
 msgstr "Vis 1 år"
 
-#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:690
+#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
@@ -1331,7 +1276,7 @@ msgstr "Idag"
 msgid "Go to present time"
 msgstr "Gå til nåtiden"
 
-#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:213
+#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
 msgid "Next"
 msgstr "Neste"
 
@@ -1372,192 +1317,76 @@ msgstr "Lagre kalender som"
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: calendar/gui/calendar-commands.c:679
-msgid "_Close Calendar"
-msgstr "Luk_k kalender"
-
-#: calendar/gui/calendar-commands.c:680
-msgid "Close current calendar"
-msgstr "Lukk aktiv kalender"
-
-#: calendar/gui/calendar-commands.c:690
+#: calendar/gui/calendar-commands.c:682
 msgid "_New appointment..."
 msgstr "_Ny avtale..."
 
-#: calendar/gui/calendar-commands.c:695
+#: calendar/gui/calendar-commands.c:687
 msgid "New appointment for _today..."
 msgstr "Ny av_tale for idag..."
 
-#: calendar/gui/calendar-commands.c:696
+#: calendar/gui/calendar-commands.c:688
 msgid "Create a new appointment for today"
 msgstr "Lag en ny avtale for idag"
 
-#: calendar/gui/calendar-commands.c:704 calendar/gui/prop.c:712
+#: calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
 msgid "Preferences"
 msgstr "Brukervalg"
 
-#: calendar/gui/calendar-commands.c:711 calendar/gui/calendar-commands.c:712
+#: calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704
 msgid "About Calendar"
 msgstr "Om kalender"
 
 #. i18n: This "%s%s" indicates possession. Languages where the order is
 #. * the inverse should translate it to "%2$s%1$s".
 #.
-#: calendar/gui/calendar-commands.c:754
+#: calendar/gui/calendar-commands.c:746
 #, c-format
 msgid "%s%s"
 msgstr "%s%s"
 
-#: calendar/gui/calendar-commands.c:754
+#: calendar/gui/calendar-commands.c:746
 msgid "'s calendar"
 msgstr "sin kalender"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: calendar/gui/calendar-conduit-control-applet.c:51
-msgid "Disabled"
-msgstr "Slått av"
-
-#: calendar/gui/calendar-conduit-control-applet.c:52
-msgid "Synchronize"
-msgstr "Synkroniser"
-
-#: calendar/gui/calendar-conduit-control-applet.c:53
-msgid "Copy From Pilot"
-msgstr "Kopier fra pilot"
-
-#: calendar/gui/calendar-conduit-control-applet.c:54
-msgid "Copy To Pilot"
-msgstr "Kopier til pilot"
-
-#: calendar/gui/calendar-conduit-control-applet.c:55
-msgid "Merge From Pilot"
-msgstr "Flett inn fra pilot"
-
-#: calendar/gui/calendar-conduit-control-applet.c:56
-msgid "Merge To Pilot"
-msgstr "Flett til pilot"
-
-#: calendar/gui/calendar-conduit-control-applet.c:142
-#: calendar/gui/todo-conduit-control-applet.c:110
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: calendar/gui/calendar-conduit-control-applet.c:144
-msgid "GnomeCalendar Conduit"
-msgstr "GnomeCalendar komponent"
-
-#: calendar/gui/calendar-conduit-control-applet.c:145
-msgid "(C) 1998"
-msgstr "© 1998"
-
-#: calendar/gui/calendar-conduit-control-applet.c:147
-msgid "Configuration utility for the calendar conduit.\n"
-msgstr "Konfigurasjonsverktøy for kalender komponenten.\n"
-
-#: calendar/gui/calendar-conduit-control-applet.c:148
-msgid "gnome-calendar-conduit.png"
-msgstr "gnome-kalender-komponent.png"
-
-#: calendar/gui/calendar-conduit-control-applet.c:190
-msgid "Synchronize Action"
-msgstr "Handling ved synkronisering"
-
-#: calendar/gui/calendar-conduit-control-applet.c:261
-#: calendar/gui/todo-conduit-control-applet.c:194
-msgid "Conduit state"
-msgstr "Komponenttilstand"
-
-#: calendar/gui/calendar-conduit-control-applet.c:305
-#: calendar/gui/calendar-conduit-control-applet.c:316
-#: calendar/gui/todo-conduit-control-applet.c:235
-#: calendar/gui/todo-conduit-control-applet.c:246
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Ingen pilot konfigurert, vennligst velg\n"
-"'Egenskaper for pilot link' cappleten først."
-
-#: calendar/gui/calendar-conduit-control-applet.c:332
-#: calendar/gui/calendar-conduit-control-applet.c:333
-#: calendar/gui/todo-conduit-control-applet.c:265
-#: calendar/gui/todo-conduit-control-applet.c:266
-msgid "Cannot initialze the GnomePilot Daemon"
-msgstr "Kan ikke initialisere GnomePilot daemonen"
-
-#: calendar/gui/calendar-conduit-control-applet.c:339
-#: calendar/gui/calendar-conduit-control-applet.c:340
-#: calendar/gui/todo-conduit-control-applet.c:272
-#: calendar/gui/todo-conduit-control-applet.c:273
-msgid "Cannot connect to the GnomePilot Daemon"
-msgstr "Kan ikke koble til GnomePilot daemonen"
-
-#: calendar/gui/calendar-conduit.c:116 calendar/gui/calendar-conduit.c:156
-#: calendar/gui/calendar-conduit.c:239 calendar/gui/calendar-conduit.c:279
-#: calendar/gui/calendar-conduit.c:501 calendar/gui/calendar-conduit.c:542
-#: calendar/gui/calendar-conduit.c:858 calendar/gui/calendar-conduit.c:910
-#: calendar/gui/calendar-conduit.c:1332
-msgid "Error while communicating with calendar server"
-msgstr "Feil under kommunikasjon med kalendertjeneren"
-
-#: calendar/gui/calendar-conduit.c:546
-#, c-format
-msgid "Calendar holds %d entries"
-msgstr "Kalenderen har %d oppføringer"
-
-#: calendar/gui/calendar-conduit.c:568 calendar/gui/calendar-conduit.c:570
-msgid "Could not start gnomecal server"
-msgstr "Kunne ikke starte gnomecal tjeneren"
-
-#: calendar/gui/calendar-conduit.c:598 calendar/gui/calendar-conduit.c:601
-msgid "Could not read pilot's DateBook application block"
-msgstr "Kunne ikke lese pilotens DateBook applikasjonsblokk"
-
-#: calendar/gui/calendar-pilot-sync.c:60
+#: calendar/gui/calendar-pilot-sync.c:68
 msgid "Specifies the port on which the Pilot is"
 msgstr "Spesifiserer porten piloten befinner seg på"
 
-#: calendar/gui/calendar-pilot-sync.c:60
+#: calendar/gui/calendar-pilot-sync.c:68
 msgid "PORT"
 msgstr "PORT"
 
-#: calendar/gui/calendar-pilot-sync.c:62
+#: calendar/gui/calendar-pilot-sync.c:70
 msgid "If you want to debug the attributes on records"
 msgstr "Skal feilsøking på postenes attributter slås på?"
 
-#: calendar/gui/calendar-pilot-sync.c:64
+#: calendar/gui/calendar-pilot-sync.c:72
 msgid "Only syncs from desktop to pilot"
 msgstr "Kun synkronsisering fra skrivebordet til piloten"
 
-#: calendar/gui/calendar-pilot-sync.c:66
+#: calendar/gui/calendar-pilot-sync.c:74
 msgid "Only syncs from pilot to desktop"
 msgstr "Kun synkronisering fra piloten til skrivebordet"
 
-#: calendar/gui/calendar-pilot-sync.c:89
+#: calendar/gui/calendar-pilot-sync.c:97
 msgid "Can not create Pilot socket\n"
 msgstr "Kan ikke opprette pilot socket\n"
 
-#: calendar/gui/calendar-pilot-sync.c:96
+#: calendar/gui/calendar-pilot-sync.c:104
 #, c-format
 msgid "Can not bind to device %s\n"
 msgstr "Kan ikke binde til enhet %s\n"
 
-#: calendar/gui/calendar-pilot-sync.c:99
+#: calendar/gui/calendar-pilot-sync.c:107
 msgid "Failed to get a connection from the Pilot device"
 msgstr "Klarte ikke å koble til pilot-enheten"
 
-#: calendar/gui/calendar-pilot-sync.c:102
+#: calendar/gui/calendar-pilot-sync.c:111
 msgid "pi_accept failed"
 msgstr "pi_accept feilet"
 
-#: calendar/gui/calendar-pilot-sync.c:167
-msgid "\tObject did not exist, creating a new one\n"
-msgstr "\tObjektet eksisterte ikke, opretter et nytt\n"
-
-#: calendar/gui/calendar-pilot-sync.c:174
+#: calendar/gui/calendar-pilot-sync.c:211
 msgid ""
 "\tObject has been modified on desktop and on the pilot, desktop takes "
 "precedence\n"
@@ -1565,28 +1394,23 @@ msgstr ""
 "Objektet er endret på skrivebordet og på piloten, skrivebordet tar "
 "presedens\n"
 
-#: calendar/gui/calendar-pilot-sync.c:475
+#: calendar/gui/calendar-pilot-sync.c:531
 msgid "No description"
 msgstr "Ingen beskrivelse"
 
-#: calendar/gui/calendar-pilot-sync.c:547
-msgid "Syncing with the pilot..."
-msgstr "Synkroniserer med piloten..."
-
-#: calendar/gui/calendar-pilot-sync.c:554
+#: calendar/gui/calendar-pilot-sync.c:692
 msgid "Could not open DatebookDB on the Pilot"
 msgstr "Kunne ikke åpne DatebokkDB på piloten"
 
-#: calendar/gui/calendar-pilot-sync.c:555
+#: calendar/gui/calendar-pilot-sync.c:693
 msgid "Unable to open DatebookDB"
 msgstr "Kunne ikke åpne DatebookDB"
 
-#: calendar/gui/calendar-pilot-sync.c:617
+#: calendar/gui/calendar-pilot-sync.c:728
 msgid "Synced DateBook from Pilot to GnomeCal"
 msgstr "Synkroniserte DateBook fra piloten til GnomeCal"
 
 #: calendar/gui/control-factory.c:136
-#: calendar/gui/evolution-calendar-control.c:131
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
@@ -1624,30 +1448,30 @@ msgstr "Utsett-tid (minutter)"
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
-#: calendar/gui/e-day-view.c:2271 calendar/gui/e-day-view.c:2278
-#: calendar/gui/e-day-view.c:2287 calendar/gui/e-week-view.c:2629
-#: calendar/gui/e-week-view.c:2636 calendar/gui/e-week-view.c:2645
+#: calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324
+#: calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643
+#: calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659
 msgid "New appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-day-view.c:2275 calendar/gui/e-day-view.c:2282
-#: calendar/gui/e-week-view.c:2633 calendar/gui/e-week-view.c:2640
+#: calendar/gui/e-day-view.c:2321 calendar/gui/e-day-view.c:2328
+#: calendar/gui/e-week-view.c:2647 calendar/gui/e-week-view.c:2654
 msgid "Edit this appointment..."
 msgstr "Redigér denne avtalen..."
 
-#: calendar/gui/e-day-view.c:2276 calendar/gui/e-week-view.c:2634
+#: calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
 msgid "Delete this appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:2283 calendar/gui/e-week-view.c:2641
+#: calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
 msgid "Make this appointment movable"
 msgstr "Gjør denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:2284 calendar/gui/e-week-view.c:2642
+#: calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
 msgid "Delete this occurrence"
 msgstr "Slett denne oppføringen"
 
-#: calendar/gui/e-day-view.c:2285 calendar/gui/e-week-view.c:2643
+#: calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
@@ -1712,6 +1536,26 @@ msgstr ""
 msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
+#: calendar/gui/event-editor.c:1320
+msgid "FIXME: Save and Close"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1330
+msgid "FIXME: Recurrence..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1331
+msgid "Configure recurrence rules"
+msgstr "Konfigurér regler for gjenintrffelse"
+
+#: calendar/gui/event-editor.c:1333
+msgid "FIXME: Invite Attendees..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1334
+msgid "Invite attendees to a meeting"
+msgstr "Invitér deltakere til et møte"
+
 #: calendar/gui/event-editor.c:1745
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
@@ -1825,7 +1669,7 @@ msgstr "_Konfidensiell"
 msgid "Recurrence rule"
 msgstr "Regel for gjenintreffelse"
 
-#: calendar/gui/event-editor-dialog.glade.h:43 shell/e-shell-view.c:575
+#: calendar/gui/event-editor-dialog.glade.h:43 shell/e-shell-view.c:596
 msgid "None"
 msgstr "Ingen"
 
@@ -2250,7 +2094,7 @@ msgid "Due Date"
 msgstr "Ferdig-dato"
 
 #: calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:605
-#: mail/message-list.c:655
+#: mail/message-list.c:474
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -2664,27 +2508,7 @@ msgstr "Slå på utsetting for "
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: calendar/gui/todo-conduit-control-applet.c:112
-msgid "Gpilotd todo conduit"
-msgstr "Gpilotd oppgavelistekomponent"
-
-#: calendar/gui/todo-conduit-control-applet.c:113
-msgid "(C) 1998 the Free Software Foundation"
-msgstr "(C) 1998 the Free Software Foundation"
-
-#: calendar/gui/todo-conduit-control-applet.c:115
-msgid "Configuration utility for the todo conduit.\n"
-msgstr "Konfigurasjonsverktøy for oppgavelistekomponenten.\n"
-
-#: calendar/gui/todo-conduit-control-applet.c:116
-msgid "gnome-unknown.xpm"
-msgstr "gnome-ukjent.xpm"
-
-#: calendar/gui/todo-conduit-control-applet.c:141
-msgid "Enabled"
-msgstr "På"
-
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:752
+#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:766
 msgid "Cut"
 msgstr "Klipp ut"
 
@@ -2692,7 +2516,7 @@ msgstr "Klipp ut"
 msgid "Cut selected item into clipboard"
 msgstr "Klipp ut valgt oppføring til utklippstavlen"
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:753
+#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:767
 msgid "Copy"
 msgstr "Kopiér"
 
@@ -2701,7 +2525,7 @@ msgid "Copy selected item into clipboard"
 msgstr "Kopiér valgt oppføring til utklippstavlen"
 
 #: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:754
+#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:768
 msgid "Paste"
 msgstr "Lim inn"
 
@@ -2723,19 +2547,15 @@ msgstr "Velg mottakerenes adresser"
 msgid "Recipient list:"
 msgstr "Mottakerliste:"
 
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-msgstr "Navn:"
-
 #: composer/e-msg-composer-address-dialog.glade.h:9
 msgid "Search..."
 msgstr "Søk..."
 
-#: composer/e-msg-composer-address-dialog.glade.h:10 mail/mail-config.c:1716
+#: composer/e-msg-composer-address-dialog.glade.h:10
 msgid "Name"
 msgstr "Navn"
 
-#: composer/e-msg-composer-address-dialog.glade.h:11 mail/mail-config.c:1716
+#: composer/e-msg-composer-address-dialog.glade.h:11
 msgid "Address"
 msgstr "Adresse"
 
@@ -2828,31 +2648,31 @@ msgstr "MIME-type:"
 msgid "File name:"
 msgstr "Filnavn:"
 
-#: composer/e-msg-composer-hdrs.c:89
+#: composer/e-msg-composer-hdrs.c:174
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: composer/e-msg-composer-hdrs.c:124
+#: composer/e-msg-composer-hdrs.c:216
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:125
+#: composer/e-msg-composer-hdrs.c:217
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:129
+#: composer/e-msg-composer-hdrs.c:221
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:130
+#: composer/e-msg-composer-hdrs.c:222
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:135
+#: composer/e-msg-composer-hdrs.c:227
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:136
+#: composer/e-msg-composer-hdrs.c:228
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2860,200 +2680,215 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
 "syne i mottakerlisten for meldingen."
 
-#: composer/e-msg-composer-hdrs.c:142
+#: composer/e-msg-composer-hdrs.c:234
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:143
+#: composer/e-msg-composer-hdrs.c:235
 msgid "Enter the subject of the mail"
 msgstr "Skriv inn emnet for meldingen"
 
-#: composer/e-msg-composer.c:459
+#: composer/e-msg-composer.c:463
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:470
+#: composer/e-msg-composer.c:474
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:490
+#: composer/e-msg-composer.c:494
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:539
-msgid "Open file"
-msgstr "Åpne fil"
-
-#: composer/e-msg-composer.c:605
+#: composer/e-msg-composer.c:513
 msgid "Discard this message?"
 msgstr "Forkast denne meldingen?"
 
-#: composer/e-msg-composer.c:710
+#: composer/e-msg-composer.c:561
+msgid "Open file"
+msgstr "Åpne fil"
+
+#: composer/e-msg-composer.c:718
 msgid "Save in _folder..."
 msgstr "Lagre i _mappe..."
 
-#: composer/e-msg-composer.c:710
+#: composer/e-msg-composer.c:718
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: composer/e-msg-composer.c:713 composer/e-msg-composer.c:750
-#: mail/folder-browser-factory.c:36
+#: composer/e-msg-composer.c:721 composer/e-msg-composer.c:763
 msgid "Send"
 msgstr "Send"
 
-#: composer/e-msg-composer.c:713
+#: composer/e-msg-composer.c:721
 msgid "Send the message"
 msgstr "Send meldingen"
 
-#: composer/e-msg-composer.c:721
+#: composer/e-msg-composer.c:733
 msgid "View _attachments"
 msgstr "Vis _vedlegg"
 
-#: composer/e-msg-composer.c:721
+#: composer/e-msg-composer.c:733
 msgid "View/hide attachments"
 msgstr "Vis/skjul vedlegg"
 
-#: composer/e-msg-composer.c:750
+#: composer/e-msg-composer.c:763
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: composer/e-msg-composer.c:752
+#: composer/e-msg-composer.c:766
 msgid "Cut selected region into the clipboard"
 msgstr "Klipp ut valgt område til utklippstavlen"
 
-#: composer/e-msg-composer.c:753
+#: composer/e-msg-composer.c:767
 msgid "Copy selected region into the clipboard"
 msgstr "Kopiér valgt område til utklippstavlen"
 
-#: composer/e-msg-composer.c:754
+#: composer/e-msg-composer.c:768
 msgid "Paste selected region into the clipboard"
 msgstr "Lim inn valgt område til utklippstavlen"
 
-#: composer/e-msg-composer.c:755
+#: composer/e-msg-composer.c:769
 msgid "Undo"
 msgstr "Angre"
 
-#: composer/e-msg-composer.c:755
+#: composer/e-msg-composer.c:769
 msgid "Undo last operation"
 msgstr "Angre siste operasjon"
 
-#: composer/e-msg-composer.c:757
+#: composer/e-msg-composer.c:772
 msgid "Attach"
 msgstr "Legg ved"
 
-#: composer/e-msg-composer.c:757
+#: composer/e-msg-composer.c:772
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:948
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: filter/filter-editor.c:201
+#: filter/filter-editor.c:198
 msgid "Edit Filter"
 msgstr "Rediger filter"
 
-#: filter/filter-editor.c:201
+#: filter/filter-editor.c:198
 msgid "Create filter"
 msgstr "Opprett filter"
 
-#: filter/filter-editor.c:212
+#: filter/filter-editor.c:209
 msgid "Back"
 msgstr "Tilbake"
 
-#: filter/filter-editor.c:214
+#: filter/filter-editor.c:211
 msgid "Finish"
 msgstr "Fullfør"
 
-#: filter/filter-editor.c:215
+#: filter/filter-editor.c:212
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: filter/filter-editor.c:219
+#: filter/filter-editor.c:216
 msgid "Apply"
 msgstr "Bruk"
 
-#: filter/filter-editor.c:236
+#: filter/filter-editor.c:233
 msgid ""
 "<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
 "continue forwards to customise it.</p>"
 msgstr ""
 
-#: mail/component-factory.c:184
+#: mail/component-factory.c:196
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:29
 msgid "Get mail"
 msgstr "Hent e-post"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:29
 msgid "Check for new mail"
 msgstr "Sjekk etter ny e-post"
 
-#: mail/folder-browser-factory.c:36
-msgid "Send a new message"
-msgstr "Send en ny melding"
+#: mail/folder-browser-factory.c:30
+#, fuzzy
+msgid "Compose"
+msgstr "Lukk"
 
-#: mail/folder-browser-factory.c:37
-msgid "Find messages"
-msgstr "Finn meldinger"
+#: mail/folder-browser-factory.c:30
+#, fuzzy
+msgid "Compose a new message"
+msgstr "Skriv en melding"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:34
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:34
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/folder-browser-factory.c:42
+#: mail/folder-browser-factory.c:35
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/folder-browser-factory.c:42
+#: mail/folder-browser-factory.c:35
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser-factory.c:37
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser-factory.c:37
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/folder-browser-factory.c:48
+#: mail/folder-browser-factory.c:41
+#, fuzzy
+msgid "Refile"
+msgstr "Åpne fil"
+
+#: mail/folder-browser-factory.c:41
+#, fuzzy
+msgid "Move message to a new folder"
+msgstr "Lagre meldingen i en spesifisert mappe"
+
+#: mail/folder-browser-factory.c:43
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/folder-browser-factory.c:50
+#: mail/folder-browser-factory.c:45
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/folder-browser-factory.c:69
+#: mail/folder-browser-factory.c:65
+msgid "_Threaded Message List"
+msgstr ""
+
+#: mail/folder-browser-factory.c:77
 msgid "_Expunge"
 msgstr "_Fjern"
 
-#: mail/folder-browser-factory.c:75
+#: mail/folder-browser-factory.c:83
 msgid "_Filter Druid ..."
 msgstr "_Filter-druide ..."
 
-#: mail/folder-browser-factory.c:81
+#: mail/folder-browser-factory.c:89
 msgid "_Virtual Folder Druid ..."
 msgstr "_Virtuell folder druide ..."
 
-#: mail/folder-browser-factory.c:87
+#: mail/folder-browser-factory.c:95
 msgid "_Mail Configuration ..."
 msgstr "_E-post konfigurasjon ..."
 
-#: mail/folder-browser-factory.c:93
+#: mail/folder-browser-factory.c:101
 msgid "Forget _Passwords"
 msgstr "Glem _passord"
 
-#: mail/mail-config.c:258
+#: mail/mail-config.c:259
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -3062,51 +2897,51 @@ msgstr ""
 "Skriv inn ditt navn og din e-post adresse for bruk i utgående post. Du kan "
 "også skrive inn navnet på din organisasjon, og navnet på en signaturfil."
 
-#: mail/mail-config.c:273
+#: mail/mail-config.c:274
 msgid "Full name:"
 msgstr "Fullt navn:"
 
-#: mail/mail-config.c:301
+#: mail/mail-config.c:302
 msgid "Email address:"
 msgstr "E-post adresse:"
 
-#: mail/mail-config.c:324
+#: mail/mail-config.c:325
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.c:336
+#: mail/mail-config.c:337
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.c:341
+#: mail/mail-config.c:342
 msgid "Signature File"
 msgstr "Signaturfil"
 
-#: mail/mail-config.c:698 mail/mail-config.c:789
+#: mail/mail-config.c:699 mail/mail-config.c:790
 msgid "Server:"
 msgstr "Tjener:"
 
-#: mail/mail-config.c:704
+#: mail/mail-config.c:705
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: mail/mail-config.c:710
+#: mail/mail-config.c:711
 msgid "Path:"
 msgstr "Sti:"
 
-#: mail/mail-config.c:716 mail/mail-config.c:795
+#: mail/mail-config.c:717 mail/mail-config.c:796
 msgid "Authentication:"
 msgstr "Autentisering:"
 
-#: mail/mail-config.c:728 mail/mail-config.c:807
+#: mail/mail-config.c:729 mail/mail-config.c:808
 msgid "Detect supported types..."
 msgstr "Søk etter støttede typer..."
 
-#: mail/mail-config.c:754 mail/mail-config.c:829
+#: mail/mail-config.c:755 mail/mail-config.c:830
 msgid "Test these values before continuing"
 msgstr "Test disse verdiene før du går videre"
 
-#: mail/mail-config.c:936
+#: mail/mail-config.c:937
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3120,86 +2955,50 @@ msgstr ""
 "Hvis tjeneren trenger autentisering, kan du klikke på \"Søk etter støttede "
 "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
 
-#: mail/mail-config.c:954
+#: mail/mail-config.c:955
 msgid "Select the method you would like to use to deliver your mail."
 msgstr "Velg leveringsmetode for din e-post."
 
-#: mail/mail-config.c:1128 mail/mail-config.c:1207
+#: mail/mail-config.c:1129 mail/mail-config.c:1208
 msgid "Mail Configuration"
 msgstr "E-post konfigurasjon"
 
 #. Identity page
-#: mail/mail-config.c:1145 mail/mail-config.c:1874
+#: mail/mail-config.c:1146
 msgid "Identity"
 msgstr "Identitet"
 
 #. Source page
-#: mail/mail-config.c:1164
+#: mail/mail-config.c:1165
 msgid "Mail Source"
 msgstr "E-postkilde"
 
 #. Transport page
-#: mail/mail-config.c:1185
+#: mail/mail-config.c:1186
 msgid "Mail Transport"
 msgstr "E-post transport"
 
-#: mail/mail-config.c:1307
+#: mail/mail-config.c:1308
 msgid "Edit Identity"
 msgstr "Rediger identitet"
 
-#: mail/mail-config.c:1309
+#: mail/mail-config.c:1310
 msgid "Add Identity"
 msgstr "Legg til identitet"
 
-#: mail/mail-config.c:1452
+#: mail/mail-config.c:1453
 msgid "Edit Source"
 msgstr "Rediger kilde"
 
-#: mail/mail-config.c:1454
+#: mail/mail-config.c:1455
 msgid "Add Source"
 msgstr "Legg til kilde"
 
-#: mail/mail-config.c:1716
-msgid "Organization"
-msgstr "Organisasjon"
-
-#: mail/mail-config.c:1716
-msgid "Signature file"
-msgstr "Signaturfil"
-
-#: mail/mail-config.c:1742
-msgid "Camel Providers Configuration"
-msgstr "Konfigurasjon av Camel tilbyder"
-
-#: mail/mail-config.c:1831
-msgid "Identities"
-msgstr "Identiteter"
-
-#: mail/mail-config.c:1856 mail/mail-config.c:1952
-msgid "Edit"
-msgstr "Rediger"
-
-#: mail/mail-config.c:1927
-msgid "Mail sources"
-msgstr "E-post kilder"
-
-#: mail/mail-config.c:1970
-msgid "Sources"
-msgstr "Kilder"
-
-#: mail/mail-config.c:2009
-msgid "Transports"
-msgstr "Transporter"
-
-#: mail/mail-config.c:2030
-msgid "Send messages in HTML format"
-msgstr "Send meldinger i HTML-format"
-
-#: mail/mail-ops.c:334
+#: mail/mail-ops.c:372
 msgid "Fetching mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:346
+#: mail/mail-ops.c:384
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3207,6 +3006,11 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
+#: mail/mail-ops.c:732
+#, fuzzy
+msgid "Refile message(s) to"
+msgstr "Finn meldinger"
+
 #: mail/mail-threads.c:483
 msgid "Currently pending operations:"
 msgstr ""
@@ -3231,42 +3035,38 @@ msgstr "Kan ikke opprette dialogboks."
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/main.c:58
+#: mail/main.c:62
 msgid "Mail Component: I could not initialize Bonobo"
 msgstr "E-post komponent: Kunne ikke initialisere Bonobo"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:460
 msgid "Online Status"
 msgstr "Tilkoblet status"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:488
+msgid "From"
+msgstr "Fra"
+
+#: mail/message-list.c:495
 msgid "Subject"
 msgstr "Emne"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:502
 msgid "Date"
 msgstr "Dato"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:509
 msgid "Received"
 msgstr "Mottatt"
 
-#: mail/message-list.c:704
+#: mail/message-list.c:516
+msgid "To"
+msgstr "Til"
+
+#: mail/message-list.c:523
 msgid "Size"
 msgstr "Størrelse"
 
-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr "Opprett et nytt notat"
-
-#: notes/component-factory.c:147
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Kan ikke initialisere Evolutions notatkomponent."
-
-#: notes/main.c:30
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Notatkomponent: Kunne ikke initialisere Bonobo"
-
 #: shell/e-init.c:25
 msgid "Evolution can not create its local folders"
 msgstr "Evolution kan ikke opprette sine lokale mapper"
@@ -3335,11 +3135,17 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Lag ny mappe"
 
-#: shell/e-shell-folder-selection-dialog.c:155
+#: shell/e-shell-folder-selection-dialog.c:95
+msgid ""
+"The type of the selected folder is not valid for\n"
+"the requested operation."
+msgstr ""
+
+#: shell/e-shell-folder-selection-dialog.c:236
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:353
+#: shell/e-shell-folder-title-bar.c:355
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
@@ -3373,145 +3179,136 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljøet."
 
-#: shell/e-shell-view-menu.c:302 shell/e-shell-view-menu.c:399
+#: shell/e-shell-view-menu.c:301
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view-menu.c:343
+#: shell/e-shell-view-menu.c:365
 msgid "_Folder"
 msgstr "_Mappe"
 
-#: shell/e-shell-view-menu.c:347
+#: shell/e-shell-view-menu.c:369
 msgid "Evolution _Bar Shortcut"
 msgstr "Evolution s_narveilinje"
 
-#: shell/e-shell-view-menu.c:353
-msgid "_Mail message"
+#: shell/e-shell-view-menu.c:375
+#, fuzzy
+msgid "_Mail message (FIXME)"
 msgstr "E-post _melding"
 
-#: shell/e-shell-view-menu.c:354 shell/e-shell-view-menu.c:357
+#: shell/e-shell-view-menu.c:376 shell/e-shell-view-menu.c:379
 msgid "Composes a new mail message"
 msgstr "Lager en ny e-post melding"
 
-#: shell/e-shell-view-menu.c:356
-msgid "_Appointment"
+#: shell/e-shell-view-menu.c:378
+#, fuzzy
+msgid "_Appointment (FIXME)"
 msgstr "_Avtale"
 
-#: shell/e-shell-view-menu.c:359
-msgid "Meeting Re_quest"
-msgstr "Møteforesp_ørsel"
-
-#: shell/e-shell-view-menu.c:362
-msgid "_Contact"
+#: shell/e-shell-view-menu.c:381
+#, fuzzy
+msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
-#: shell/e-shell-view-menu.c:365
-msgid "_Task"
-msgstr "_Oppgave"
+#: shell/e-shell-view-menu.c:384
+msgid "_Task (FIXME)"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:368
-msgid "Task _Request"
+#: shell/e-shell-view-menu.c:387
+#, fuzzy
+msgid "Task _Request (FIXME)"
 msgstr "Oppgavefo_respørsel"
 
-#: shell/e-shell-view-menu.c:371
-msgid "_Journal Entry"
+#: shell/e-shell-view-menu.c:390
+#, fuzzy
+msgid "_Journal Entry (FIXME)"
 msgstr "_Journaloppføring"
 
-#: shell/e-shell-view-menu.c:374
-msgid "_Note"
-msgstr "_Notat"
-
-#: shell/e-shell-view-menu.c:384
-msgid "_Selected Items"
-msgstr "_Valgte oppføringer"
-
-#: shell/e-shell-view-menu.c:392
+#: shell/e-shell-view-menu.c:398
 msgid "_New"
 msgstr "_Ny"
 
-#: shell/e-shell-view-menu.c:393
-msgid "_Open"
-msgstr "_Åpne"
-
-#: shell/e-shell-view-menu.c:395
-msgid "Clos_e All Items"
-msgstr "Lukk all_e oppføringer"
-
-#: shell/e-shell-view-menu.c:395
-msgid "Closes all the open items"
-msgstr "Lukker alle åpne oppføringer"
+#: shell/e-shell-view-menu.c:402
+#, fuzzy
+msgid "_Go to folder..."
+msgstr "Gå til mappe..."
 
-#: shell/e-shell-view-menu.c:399
+#: shell/e-shell-view-menu.c:402
 msgid "Display a different folder"
 msgstr "Vis en annen mappe"
 
-#: shell/e-shell-view-menu.c:414
+#: shell/e-shell-view-menu.c:404
+#, fuzzy
+msgid "_Create new folder..."
+msgstr "Lagre i _mappe..."
+
+#: shell/e-shell-view-menu.c:404
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Opprett et nytt notat"
+
+#: shell/e-shell-view-menu.c:419
 msgid "Show _shortcut bar"
 msgstr "Vis _snarveilinje"
 
-#: shell/e-shell-view-menu.c:415
+#: shell/e-shell-view-menu.c:420
 msgid "Show the shortcut bar"
 msgstr "Viser snarveilinjen"
 
-#: shell/e-shell-view-menu.c:417
+#: shell/e-shell-view-menu.c:422
 msgid "Show _folder bar"
 msgstr "Vis _folderlinje"
 
-#: shell/e-shell-view-menu.c:418
+#: shell/e-shell-view-menu.c:423
 msgid "Show the folder bar"
 msgstr "Viser folderlinjen"
 
-#: shell/e-shell-view-menu.c:435
+#: shell/e-shell-view-menu.c:440
 msgid "Help _Index"
 msgstr "Hjelp _indeks"
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:443
 msgid "Getting _Started"
 msgstr "Kom _igang"
 
-#: shell/e-shell-view-menu.c:441
+#: shell/e-shell-view-menu.c:446
 msgid "Using the _Mailer"
 msgstr "Bruk av _e-post"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:449
 msgid "Using the _Calendar"
 msgstr "Bruk av _kalenderen"
 
-#: shell/e-shell-view-menu.c:447
+#: shell/e-shell-view-menu.c:452
 msgid "Using the Cont_act Manager"
 msgstr "Bruk av kont_aktlisten"
 
-#: shell/e-shell-view-menu.c:452
+#: shell/e-shell-view-menu.c:457
 msgid "_Submit bug report"
 msgstr "_Send feilrapport"
 
-#: shell/e-shell-view-menu.c:453
+#: shell/e-shell-view-menu.c:458
 msgid "Submit bug-report via bug-buddy"
 msgstr "Send feilrapport med bug-buddy"
 
-#: shell/e-shell-view-menu.c:469
+#: shell/e-shell-view-menu.c:474
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: shell/e-shell-view.c:112
+#: shell/e-shell-view.c:113
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:207
+#: shell/e-shell-view.c:208
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:579
+#: shell/e-shell-view.c:600
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:647
-#, c-format
-msgid "Cannot open location: %s"
-msgstr "Kan ikke åpne lokasjon: %s"
-
-#: shell/e-shell.c:256
+#: shell/e-shell.c:299
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
@@ -3605,24 +3402,23 @@ msgid "Unknown error"
 msgstr "Ukjent feil"
 
 #: shell/main.c:99
+#, fuzzy
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release of\n"
-"the Evolution groupware suite.\n"
-"\n"
-"The Evolution team has worked hard to make Evolution as robust,\n"
-"extensible, pretty, fast and well-suited to heavy internet users as\n"
-"possible.  And we're very tired.  But we're not done -- not yet.\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"As you explore Evolution, please understand that most of our work has\n"
-"been focused on the backend engine which drives the entire system and\n"
-"not on the user interface.  We are just cresting the hill now, though,\n"
-"and will be pouring most of our love and attention into the UI from\n"
-"here out.  But at least you know that you're not using demoware.\n"
+"Over the last month and a half, our focus has been on making\n"
+"Evolution usable. Many of the Evolution developers are now using\n"
+"Evolution to read their mail full time. You could too. (Just\n"
+"be sure to keep a backup.)\n"
 "\n"
-"So, time for the nerdy disclaimer.  Evolution will: crash, lose your\n"
-"mail, leave stray processes running, consume 100% CPU, race, lock,\n"
-"send HTML mail to random mailing lists, and embarass you in front of\n"
-"your friends and co-workers.  Use at your own risk.\n"
+"But while we have fixed many bugs affecting its stability and\n"
+"security, you still get the disclaimer:  Evolution will: crash,\n"
+"lose your mail when you don't want it to, refuse to delete your\n"
+"mail when you do want it to, leave stray processes running,\n"
+"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
+"lists, and embarass you in front of your friends and co-workers.\n"
+"Use only as directed.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we eagerly\n"
 "await your contributions!\n"
@@ -3648,7 +3444,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:128
+#: shell/main.c:126
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -3656,11 +3452,16 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: shell/main.c:169
+#: shell/main.c:172
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan ikke initialisere Evolution skallet."
 
-#: shell/main.c:205
+#: shell/main.c:214
+#, fuzzy
+msgid "Cannot initialize the configuration system."
+msgstr "Kan ikke initialisere Evolution skallet."
+
+#: shell/main.c:220
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
@@ -3813,7 +3614,173 @@ msgstr "Alle deltakere"
 msgid "..."
 msgstr "..."
 
-#: widgets/shortcut-bar/e-group-bar.c:631
+#: widgets/shortcut-bar/e-group-bar.c:633
 #, c-format
 msgid "Group %i"
 msgstr "Gruppe %i"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Test Select Names"
+#~ msgstr "Prøv utvalgte navn"
+
+#~ msgid "Select Names"
+#~ msgstr "Velg navn"
+
+#~ msgid "Find..."
+#~ msgstr "Finn..."
+
+#~ msgid "Message Recipients"
+#~ msgstr "Meldingsmottakere"
+
+#~ msgid "_Close Calendar"
+#~ msgstr "Luk_k kalender"
+
+#~ msgid "Close current calendar"
+#~ msgstr "Lukk aktiv kalender"
+
+#~ msgid "Disabled"
+#~ msgstr "Slått av"
+
+#~ msgid "Synchronize"
+#~ msgstr "Synkroniser"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Kopier fra pilot"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Kopier til pilot"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Flett inn fra pilot"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Flett til pilot"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "GnomeCalendar Conduit"
+#~ msgstr "GnomeCalendar komponent"
+
+#~ msgid "(C) 1998"
+#~ msgstr "© 1998"
+
+#~ msgid "Configuration utility for the calendar conduit.\n"
+#~ msgstr "Konfigurasjonsverktøy for kalender komponenten.\n"
+
+#~ msgid "gnome-calendar-conduit.png"
+#~ msgstr "gnome-kalender-komponent.png"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Handling ved synkronisering"
+
+#~ msgid "Conduit state"
+#~ msgstr "Komponenttilstand"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Ingen pilot konfigurert, vennligst velg\n"
+#~ "'Egenskaper for pilot link' cappleten først."
+
+#~ msgid "Cannot initialze the GnomePilot Daemon"
+#~ msgstr "Kan ikke initialisere GnomePilot daemonen"
+
+#~ msgid "Cannot connect to the GnomePilot Daemon"
+#~ msgstr "Kan ikke koble til GnomePilot daemonen"
+
+#~ msgid "Error while communicating with calendar server"
+#~ msgstr "Feil under kommunikasjon med kalendertjeneren"
+
+#~ msgid "Calendar holds %d entries"
+#~ msgstr "Kalenderen har %d oppføringer"
+
+#~ msgid "Could not start gnomecal server"
+#~ msgstr "Kunne ikke starte gnomecal tjeneren"
+
+#~ msgid "Could not read pilot's DateBook application block"
+#~ msgstr "Kunne ikke lese pilotens DateBook applikasjonsblokk"
+
+#~ msgid "\tObject did not exist, creating a new one\n"
+#~ msgstr "\tObjektet eksisterte ikke, opretter et nytt\n"
+
+#~ msgid "Syncing with the pilot..."
+#~ msgstr "Synkroniserer med piloten..."
+
+#~ msgid "Gpilotd todo conduit"
+#~ msgstr "Gpilotd oppgavelistekomponent"
+
+#~ msgid "(C) 1998 the Free Software Foundation"
+#~ msgstr "(C) 1998 the Free Software Foundation"
+
+#~ msgid "Configuration utility for the todo conduit.\n"
+#~ msgstr "Konfigurasjonsverktøy for oppgavelistekomponenten.\n"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-ukjent.xpm"
+
+#~ msgid "Enabled"
+#~ msgstr "På"
+
+#~ msgid "Send a new message"
+#~ msgstr "Send en ny melding"
+
+#~ msgid "Organization"
+#~ msgstr "Organisasjon"
+
+#~ msgid "Signature file"
+#~ msgstr "Signaturfil"
+
+#~ msgid "Camel Providers Configuration"
+#~ msgstr "Konfigurasjon av Camel tilbyder"
+
+#~ msgid "Identities"
+#~ msgstr "Identiteter"
+
+#~ msgid "Edit"
+#~ msgstr "Rediger"
+
+#~ msgid "Mail sources"
+#~ msgstr "E-post kilder"
+
+#~ msgid "Sources"
+#~ msgstr "Kilder"
+
+#~ msgid "Transports"
+#~ msgstr "Transporter"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Send meldinger i HTML-format"
+
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "Kan ikke initialisere Evolutions notatkomponent."
+
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "Notatkomponent: Kunne ikke initialisere Bonobo"
+
+#~ msgid "Meeting Re_quest"
+#~ msgstr "Møteforesp_ørsel"
+
+#~ msgid "_Task"
+#~ msgstr "_Oppgave"
+
+#~ msgid "_Note"
+#~ msgstr "_Notat"
+
+#~ msgid "_Selected Items"
+#~ msgstr "_Valgte oppføringer"
+
+#~ msgid "_Open"
+#~ msgstr "_Åpne"
+
+#~ msgid "Clos_e All Items"
+#~ msgstr "Lukk all_e oppføringer"
+
+#~ msgid "Closes all the open items"
+#~ msgstr "Lukker alle åpne oppføringer"
+
+#~ msgid "Cannot open location: %s"
+#~ msgstr "Kan ikke åpne lokasjon: %s"