Updated Swedish translation.

svn path=/trunk/; revision=4987

2 files changed, 2321 insertions, 813 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index a41d60cc96..2beed55d6d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-23  Richard Hult  <rhult@hem.passagen.se>
+
+	* sv.po: Updated Swedish translation.
+
 2000-08-19  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian translation.
diff --git a/po/sv.po b/po/sv.po
index 087eb8b077..869627a3d1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,11 +1,12 @@
 # Swedish translation of evolution.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Andreas Hyden <a.hyden@cyberpoint.se>, 2000.
+# Richard Hult <rhult@hem.passagen.se>, 2000.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2000-07-19 02:01+0000\n"
+"Project-Id-Version: evolution 0.4.1\n"
+"POT-Creation-Date: 2000-08-23 19:41+0200\n"
 "PO-Revision-Date: 2000-04-04 19:23+0200\n"
 "Last-Translator: Andreas Hyden <a.hyden@cyberpoint.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -13,10 +14,147 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:41
 #: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/gui/component/addressbook-factory.c:59 calendar/gui/main.c:68
+#: addressbook/backend/ebook/test-client-list.c:29
+#: addressbook/backend/ebook/test-client.c:54
+#: addressbook/conduit/address-conduit.c:1215
+#: addressbook/demo/addressbook-factory.c:32
+#: addressbook/gui/component/addressbook-factory.c:59
+#: addressbook/gui/minicard/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1669
+#: calendar/conduits/todo/todo-conduit.c:1298 calendar/gui/main.c:68
 msgid "Could not initialize Bonobo"
-msgstr "Kunde inte initialisera bonobo"
+msgstr "Kunde inte initiera bonobo"
+
+#. This array must be in the same order as enumerations
+#. in GnomePilotConduitSyncType as they are used as index.
+#. Custom type implies Disabled state.
+#.
+#: 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:55
+msgid "Disabled"
+msgstr "Avstängd"
+
+#: 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:56
+msgid "Synchronize"
+msgstr "Synkronisera"
+
+#: 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:57
+msgid "Copy From Pilot"
+msgstr "Kopiera från 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:58
+msgid "Copy To Pilot"
+msgstr "Kopiera till 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:59
+msgid "Merge From Pilot"
+msgstr ""
+
+#: 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:60
+msgid "Merge To Pilot"
+msgstr ""
+
+#: 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:144
+msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#: addressbook/conduit/address-conduit-control-applet.c:145
+msgid "Gpilotd address conduit"
+msgstr ""
+
+#: 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:147
+msgid "(C) 1998 the Free Software Foundation"
+msgstr "(C) 1998 Free Software Foundation"
+
+#: addressbook/conduit/address-conduit-control-applet.c:148
+msgid "Configuration utility for the address conduit.\n"
+msgstr ""
+
+#: 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:150
+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:191
+msgid "Synchronize Action"
+msgstr ""
+
+#: 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:262
+msgid "Conduit state"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:315
+#: addressbook/conduit/address-conduit-control-applet.c:328
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
+#: calendar/conduits/todo/todo-conduit-control-applet.c:316
+#: calendar/conduits/todo/todo-conduit-control-applet.c:329
+msgid ""
+"No pilot configured, please choose the\n"
+"'Pilot Link Properties' capplet first."
+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:335
+msgid "Not connected to the gnome-pilot daemon"
+msgstr ""
+
+#: 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:340
+#, fuzzy
+msgid ""
+"An error occured when trying to fetch\n"
+"pilot list from the gnome-pilot daemon"
+msgstr ""
+"Ett undantag uppstod vid laddning av data till komponenten med PersistStream"
+
+#: addressbook/conduit/address-conduit.c:127
+#: addressbook/conduit/address-conduit.c:141
+msgid "BLARG\n"
+msgstr "BLARG\n"
+
+#: addressbook/conduit/address-conduit.c:471
+#, c-format
+msgid "Address holds %ld address entries"
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:497
+#: addressbook/conduit/address-conduit.c:499
+msgid "Could not start addressbook server"
+msgstr "Kunde inte starta server för adressbok"
+
+#: addressbook/conduit/address-conduit.c:512
+#: addressbook/conduit/address-conduit.c:515
+msgid "Could not read pilot's Address application block"
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:853
+msgid "Error while communicating with address server"
+msgstr ""
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -35,467 +173,476 @@ msgstr "Objekt tillhör dessa katerogier:"
 msgid "Available Categories:"
 msgstr "Tillgänliga katerogier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:643
-#: calendar/gui/event-editor.c:1118
-#, fuzzy
+#: addressbook/contact-editor/e-contact-editor.c:665
+#: calendar/gui/dialogs/task-editor.c:217 calendar/gui/event-editor.c:1179
 msgid "FIXME: _Appointment"
 msgstr "_Möte"
 
-#: addressbook/contact-editor/e-contact-editor.c:644
-#: calendar/gui/event-editor.c:1119
-#, fuzzy
+#: addressbook/contact-editor/e-contact-editor.c:666
+#: calendar/gui/dialogs/task-editor.c:218 calendar/gui/event-editor.c:1180
 msgid "FIXME: Meeting Re_quest"
 msgstr "Begäran om möte"
 
-#: addressbook/contact-editor/e-contact-editor.c:646
-#: calendar/gui/event-editor.c:1121
-#, fuzzy
+#: addressbook/contact-editor/e-contact-editor.c:668
+#: calendar/gui/dialogs/task-editor.c:216 calendar/gui/event-editor.c:1182
 msgid "FIXME: _Mail Message"
 msgstr "_Posta meddelande"
 
-#: addressbook/contact-editor/e-contact-editor.c:647
-#: calendar/gui/event-editor.c:1122
-#, fuzzy
+#: addressbook/contact-editor/e-contact-editor.c:669
+#: calendar/gui/dialogs/task-editor.c:219 calendar/gui/event-editor.c:1183
 msgid "FIXME: _Contact"
 msgstr "_Kontakt"
 
-#: addressbook/contact-editor/e-contact-editor.c:648
-#: calendar/gui/event-editor.c:1123
+#: addressbook/contact-editor/e-contact-editor.c:670
+#: calendar/gui/dialogs/task-editor.c:213
+#: calendar/gui/dialogs/task-editor.c:220 calendar/gui/event-editor.c:1184
 msgid "FIXME: _Task"
-msgstr ""
+msgstr "Uppgift"
 
-#: addressbook/contact-editor/e-contact-editor.c:649
-#: calendar/gui/event-editor.c:1124
-#, fuzzy
+#: addressbook/contact-editor/e-contact-editor.c:671
+#: calendar/gui/dialogs/task-editor.c:214
+#: calendar/gui/dialogs/task-editor.c:221 calendar/gui/event-editor.c:1185
 msgid "FIXME: Task _Request"
 msgstr "Uppgiftsbegä_ran"
 
-#: addressbook/contact-editor/e-contact-editor.c:650
-#: calendar/gui/event-editor.c:1125
-#, fuzzy
+#: addressbook/contact-editor/e-contact-editor.c:672
+#: calendar/gui/dialogs/task-editor.c:222 calendar/gui/event-editor.c:1186
 msgid "FIXME: _Journal Entry"
-msgstr "_Dagbokpost"
+msgstr "_Dagbokspost"
 
-#: addressbook/contact-editor/e-contact-editor.c:651
-#: calendar/gui/event-editor.c:1126
+#: addressbook/contact-editor/e-contact-editor.c:673
+#: calendar/gui/dialogs/task-editor.c:223 calendar/gui/event-editor.c:1187
 msgid "FIXME: _Note"
-msgstr ""
+msgstr "Notering"
 
-#: addressbook/contact-editor/e-contact-editor.c:653
-#: addressbook/contact-editor/e-contact-editor.c:758
-#: calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:675
+#: addressbook/contact-editor/e-contact-editor.c:780
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:332 calendar/gui/event-editor.c:1189
+#: calendar/gui/event-editor.c:1296
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:658
-#: calendar/gui/event-editor.c:1133
+#: addressbook/contact-editor/e-contact-editor.c:680
+#: calendar/gui/dialogs/task-editor.c:230 calendar/gui/event-editor.c:1194
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:660
-#: calendar/gui/event-editor.c:1135
+#: addressbook/contact-editor/e-contact-editor.c:682
+#: calendar/gui/dialogs/task-editor.c:232 calendar/gui/event-editor.c:1196
 msgid "FIXME: Define Print _Styles..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:667
-#: calendar/gui/event-editor.c:1142
+#: addressbook/contact-editor/e-contact-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:239 calendar/gui/event-editor.c:1203
 msgid "FIXME: S_end"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:671
-#: calendar/gui/event-editor.c:1146
+#: addressbook/contact-editor/e-contact-editor.c:693
+#: calendar/gui/dialogs/task-editor.c:243 calendar/gui/event-editor.c:1207
 #, fuzzy
 msgid "FIXME: Save Attac_hments..."
 msgstr "Lägg till bilaga..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: addressbook/contact-editor/e-contact-editor.c:673
+#: addressbook/contact-editor/e-contact-editor.c:695
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: addressbook/contact-editor/e-contact-editor.c:674
-#: calendar/gui/event-editor.c:1149
+#: addressbook/contact-editor/e-contact-editor.c:696
+#: calendar/gui/dialogs/task-editor.c:246 calendar/gui/event-editor.c:1210
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:675
-#: calendar/gui/event-editor.c:1150
+#: addressbook/contact-editor/e-contact-editor.c:697
+#: calendar/gui/dialogs/task-editor.c:247 calendar/gui/event-editor.c:1211
 msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:677
-#: calendar/gui/event-editor.c:1152
+#: addressbook/contact-editor/e-contact-editor.c:699
+#: calendar/gui/dialogs/task-editor.c:249 calendar/gui/event-editor.c:1213
 msgid "Page Set_up"
 msgstr "Inställningar för sida"
 
-#: addressbook/contact-editor/e-contact-editor.c:678
-#: calendar/gui/event-editor.c:1153
+#: addressbook/contact-editor/e-contact-editor.c:700
+#: calendar/gui/dialogs/task-editor.c:250 calendar/gui/event-editor.c:1214
 msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/event-editor.c:1174
+#: addressbook/contact-editor/e-contact-editor.c:721
+#: calendar/gui/dialogs/task-editor.c:271 calendar/gui/event-editor.c:1235
 msgid "FIXME: Paste _Special..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:704
-#: calendar/gui/event-editor.c:1179
+#: addressbook/contact-editor/e-contact-editor.c:726
+#: calendar/gui/dialogs/task-editor.c:276 calendar/gui/event-editor.c:1240
 msgid "FIXME: Mark as U_nread"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:708
-#: calendar/gui/event-editor.c:1183
+#: addressbook/contact-editor/e-contact-editor.c:730
+#: calendar/gui/dialogs/task-editor.c:280 calendar/gui/event-editor.c:1244
 msgid "_Object"
 msgstr "_Object"
 
-#: addressbook/contact-editor/e-contact-editor.c:713
-#: addressbook/contact-editor/e-contact-editor.c:720
-#: calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
+#: addressbook/contact-editor/e-contact-editor.c:735
+#: addressbook/contact-editor/e-contact-editor.c:742
+#: calendar/gui/dialogs/task-editor.c:285
+#: calendar/gui/dialogs/task-editor.c:293 calendar/gui/event-editor.c:1249
+#: calendar/gui/event-editor.c:1256
 msgid "FIXME: _Item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:714
-#: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:736
+#: addressbook/contact-editor/e-contact-editor.c:743
+#: calendar/gui/dialogs/task-editor.c:286
+#: calendar/gui/dialogs/task-editor.c:294 calendar/gui/event-editor.c:1250
+#: calendar/gui/event-editor.c:1257
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:715
-#: calendar/gui/event-editor.c:1190
+#: addressbook/contact-editor/e-contact-editor.c:737
+#: calendar/gui/dialogs/task-editor.c:288 calendar/gui/event-editor.c:1251
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:722
-#: calendar/gui/event-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:744
+#: calendar/gui/dialogs/task-editor.c:296 calendar/gui/event-editor.c:1258
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:727
-#: calendar/gui/event-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:749
+#: calendar/gui/dialogs/task-editor.c:301 calendar/gui/event-editor.c:1263
 msgid "FIXME: _Standard"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:729
-#: calendar/gui/event-editor.c:1204
+#: addressbook/contact-editor/e-contact-editor.c:751
+#: calendar/gui/dialogs/task-editor.c:303 calendar/gui/event-editor.c:1265
 msgid "FIXME: __Formatting"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:732
-#: calendar/gui/event-editor.c:1207
+#: addressbook/contact-editor/e-contact-editor.c:754
+#: calendar/gui/dialogs/task-editor.c:306 calendar/gui/event-editor.c:1268
 msgid "FIXME: _Customize..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/event-editor.c:1212
+#: addressbook/contact-editor/e-contact-editor.c:759
+#: calendar/gui/dialogs/task-editor.c:311 calendar/gui/event-editor.c:1273
 msgid "Pre_vious"
 msgstr "Föreg_ående"
 
-#: addressbook/contact-editor/e-contact-editor.c:738
-#: calendar/gui/event-editor.c:1213
+#: addressbook/contact-editor/e-contact-editor.c:760
+#: calendar/gui/dialogs/task-editor.c:312 calendar/gui/event-editor.c:1274
 msgid "Ne_xt"
 msgstr "Nä_sta"
 
-#: addressbook/contact-editor/e-contact-editor.c:740
-#: calendar/gui/event-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:762
+#: calendar/gui/dialogs/task-editor.c:314 calendar/gui/event-editor.c:1278
 msgid "_Toolbars"
 msgstr "_Verktyg"
 
-#: addressbook/contact-editor/e-contact-editor.c:745
-#: calendar/gui/event-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:767
+#: calendar/gui/dialogs/task-editor.c:319 calendar/gui/event-editor.c:1283
 msgid "FIXME: _File..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:746
-#: calendar/gui/event-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:768
+#: calendar/gui/dialogs/task-editor.c:320 calendar/gui/event-editor.c:1284
 msgid "FIXME: It_em..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:747
-#: calendar/gui/event-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:769
+#: calendar/gui/dialogs/task-editor.c:321 calendar/gui/event-editor.c:1285
 msgid "FIXME: _Object..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:752
-#: calendar/gui/event-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:774
+#: calendar/gui/dialogs/task-editor.c:326 calendar/gui/event-editor.c:1290
 #, fuzzy
 msgid "FIXME: _Font..."
 msgstr "Typsnitt..."
 
-#: addressbook/contact-editor/e-contact-editor.c:753
-#: calendar/gui/event-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:775
+#: calendar/gui/dialogs/task-editor.c:327 calendar/gui/event-editor.c:1291
 msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:760
-#: calendar/gui/event-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:782
+#: calendar/gui/dialogs/task-editor.c:334 calendar/gui/event-editor.c:1298
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:761
-#: calendar/gui/event-editor.c:1238
+#: addressbook/contact-editor/e-contact-editor.c:783
+#: calendar/gui/dialogs/task-editor.c:335 calendar/gui/event-editor.c:1299
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:763
-#: calendar/gui/event-editor.c:1240
+#: addressbook/contact-editor/e-contact-editor.c:785
+#: calendar/gui/dialogs/task-editor.c:337 calendar/gui/event-editor.c:1301
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:764
-#: calendar/gui/event-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:786
+#: calendar/gui/dialogs/task-editor.c:338 calendar/gui/event-editor.c:1302
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:766
-#: calendar/gui/event-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:788
+#: calendar/gui/dialogs/task-editor.c:340 calendar/gui/event-editor.c:1304
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:771
-#: calendar/gui/event-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:793
+#: calendar/gui/dialogs/task-editor.c:345 calendar/gui/event-editor.c:1309
 msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:773
-#: calendar/gui/event-editor.c:1253
+#: addressbook/contact-editor/e-contact-editor.c:795
+#: calendar/gui/dialogs/task-editor.c:350 calendar/gui/event-editor.c:1314
 msgid "_Forms"
 msgstr "_Former"
 
-#: addressbook/contact-editor/e-contact-editor.c:778
+#: addressbook/contact-editor/e-contact-editor.c:800
 msgid "FIXME: _New Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:779
+#: addressbook/contact-editor/e-contact-editor.c:801
 msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:781
+#: addressbook/contact-editor/e-contact-editor.c:803
 msgid "FIXME: New _Letter to Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:782
+#: addressbook/contact-editor/e-contact-editor.c:804
 msgid "FIXME: New _Message to Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:783
+#: addressbook/contact-editor/e-contact-editor.c:805
 msgid "FIXME: New Meetin_g with Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:784
+#: addressbook/contact-editor/e-contact-editor.c:806
 msgid "FIXME: _Plan a Meeting..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:785
+#: addressbook/contact-editor/e-contact-editor.c:807
 msgid "FIXME: New _Task for Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:786
+#: addressbook/contact-editor/e-contact-editor.c:808
 msgid "FIXME: New _Journal Entry for Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:788
+#: addressbook/contact-editor/e-contact-editor.c:810
 msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:789
+#: addressbook/contact-editor/e-contact-editor.c:811
 msgid "FIXME: _Display Map of Address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:790
+#: addressbook/contact-editor/e-contact-editor.c:812
 msgid "FIXME: _Open Web Page"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:792
+#: addressbook/contact-editor/e-contact-editor.c:814
 msgid "FIXME: Forward as _vCard"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/event-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:815
+#: calendar/gui/dialogs/task-editor.c:367 calendar/gui/event-editor.c:1327
 msgid "FIXME: For_ward"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:805
-#: calendar/gui/event-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:827
+#: calendar/gui/dialogs/task-editor.c:380 calendar/gui/event-editor.c:1340
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: addressbook/contact-editor/e-contact-editor.c:806
-#: calendar/gui/event-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:828
+#: calendar/gui/dialogs/task-editor.c:381 calendar/gui/event-editor.c:1341
 msgid "F_ormat"
 msgstr "F_ormatera"
 
-#. FIXME: add Favorites here
-#: addressbook/contact-editor/e-contact-editor.c:807
-#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:473
+#: addressbook/contact-editor/e-contact-editor.c:829
+#: addressbook/gui/component/addressbook.c:545
+#: calendar/gui/dialogs/task-editor.c:382 calendar/gui/event-editor.c:1342
 msgid "_Tools"
 msgstr "_Verktyg"
 
-#: addressbook/contact-editor/e-contact-editor.c:808
-#: calendar/gui/event-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:830
+#: calendar/gui/dialogs/task-editor.c:383 calendar/gui/event-editor.c:1343
 msgid "Actio_ns"
 msgstr "Hä_ndelser"
 
-#: addressbook/contact-editor/e-contact-editor.c:839
+#: addressbook/contact-editor/e-contact-editor.c:861
 msgid "Save and Close"
 msgstr "Spara och stäng"
 
-#: addressbook/contact-editor/e-contact-editor.c:840
-#: calendar/gui/event-editor.c:1321
+#: addressbook/contact-editor/e-contact-editor.c:862
+#: calendar/gui/event-editor.c:1382
 msgid "Save the appointment and close the dialog box"
 msgstr "Spara ärendet och stäng dialogen"
 
-#: addressbook/contact-editor/e-contact-editor.c:844
-#: calendar/gui/calendar-commands.c:673
+#: addressbook/contact-editor/e-contact-editor.c:866
+#: calendar/gui/calendar-commands.c:654
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: addressbook/contact-editor/e-contact-editor.c:845
-#: calendar/gui/event-editor.c:1326
+#: addressbook/contact-editor/e-contact-editor.c:867
+#: calendar/gui/dialogs/task-editor.c:415 calendar/gui/event-editor.c:1387
 msgid "Print this item"
 msgstr "Skriv ut detta objektet"
 
-#: addressbook/contact-editor/e-contact-editor.c:848
-#: calendar/gui/event-editor.c:1327
+#: addressbook/contact-editor/e-contact-editor.c:870
+#: calendar/gui/dialogs/task-editor.c:416 calendar/gui/event-editor.c:1388
 msgid "FIXME: Insert File..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:849
-#: calendar/gui/event-editor.c:1328
+#: addressbook/contact-editor/e-contact-editor.c:871
+#: calendar/gui/dialogs/task-editor.c:417 calendar/gui/event-editor.c:1389
 msgid "Insert a file as an attachment"
 msgstr "Infoga en fil som en bifogning"
 
 #. Delete
-#: addressbook/contact-editor/e-contact-editor.c:852
-#: addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
-#: mail/folder-browser-factory.c:45
+#: addressbook/contact-editor/e-contact-editor.c:874
+#: addressbook/demo/addressbook.c:84
+#: addressbook/gui/component/addressbook.c:444
+#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/event-editor-dialog.glade.h:93 calendar/gui/gncal-todo.c:548
+#: mail/folder-browser-factory.c:50 mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
+#: mail/mail-view.c:147
 msgid "Delete"
 msgstr "Ta bort"
 
-#: addressbook/contact-editor/e-contact-editor.c:853
-#: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327
+#: addressbook/contact-editor/e-contact-editor.c:875
+#: calendar/gui/dialogs/task-editor.c:426 calendar/gui/event-editor.c:1398
+#: calendar/gui/gncal-todo.c:376
 msgid "Delete this item"
 msgstr "Ta bort detta objektet"
 
-#: addressbook/contact-editor/e-contact-editor.c:856
-#: calendar/gui/event-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:879
+#: calendar/gui/dialogs/task-editor.c:428 calendar/gui/event-editor.c:1400
 msgid "FIXME: Previous"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:857
-#: calendar/gui/event-editor.c:1340
+#: addressbook/contact-editor/e-contact-editor.c:880
+#: calendar/gui/dialogs/task-editor.c:429 calendar/gui/event-editor.c:1401
 msgid "Go to the previous item"
 msgstr "Gå till det föregående objektet"
 
-#: addressbook/contact-editor/e-contact-editor.c:859
-#: calendar/gui/event-editor.c:1341
+#: addressbook/contact-editor/e-contact-editor.c:882
+#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1402
 msgid "FIXME: Next"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:860
-#: calendar/gui/event-editor.c:1342
+#: addressbook/contact-editor/e-contact-editor.c:883
+#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1403
 msgid "Go to the next item"
 msgstr "Gå till det nästa objektet"
 
-#: addressbook/contact-editor/e-contact-editor.c:862
-#: calendar/gui/event-editor.c:1343
+#: addressbook/contact-editor/e-contact-editor.c:886
+#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1404
 msgid "FIXME: Help"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:863
-#: calendar/gui/event-editor.c:1344
+#: addressbook/contact-editor/e-contact-editor.c:887
+#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1405
 msgid "See online help"
 msgstr "Läs direkthjälp"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1343
 msgid "Assistant"
 msgstr "Assistant"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/contact-editor/e-contact-editor.c:1383
+#: addressbook/contact-editor/e-contact-editor.c:1344
+#: addressbook/contact-editor/e-contact-editor.c:1448
 msgid "Business"
 msgstr "Företag"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1345
 msgid "Business 2"
 msgstr "Företag 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1346
 msgid "Business Fax"
 msgstr "Fax företag"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1347
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1348
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1349
 msgid "Company"
 msgstr "Företag"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/contact-editor/e-contact-editor.c:1384
+#: addressbook/contact-editor/e-contact-editor.c:1350
+#: addressbook/contact-editor/e-contact-editor.c:1449
 msgid "Home"
 msgstr "Hem"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:1351
 msgid "Home 2"
 msgstr "Hem 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1352
 msgid "Home Fax"
 msgstr "Fax hem"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/contact-editor/e-contact-editor.c:1353
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/contact-editor/e-contact-editor.c:1354
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
-#: addressbook/contact-editor/e-contact-editor.c:1385
+#: addressbook/contact-editor/e-contact-editor.c:1355
+#: addressbook/contact-editor/e-contact-editor.c:1450
+#: mail/mail-config.glade.h:28
 msgid "Other"
 msgstr "Annat"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1356
 msgid "Other Fax"
 msgstr "Annan fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1357
 #, fuzzy
 msgid "Pager"
 msgstr "Sida"
 
-#: addressbook/contact-editor/e-contact-editor.c:1293
+#: addressbook/contact-editor/e-contact-editor.c:1358
 msgid "Primary"
 msgstr "Primär"
 
-#: addressbook/contact-editor/e-contact-editor.c:1294
+#: addressbook/contact-editor/e-contact-editor.c:1359
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1295
+#: addressbook/contact-editor/e-contact-editor.c:1360
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1296
+#: addressbook/contact-editor/e-contact-editor.c:1361
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1340
+#: addressbook/contact-editor/e-contact-editor.c:1405
 msgid "Primary Email"
 msgstr "Primär epost"
 
-#: addressbook/contact-editor/e-contact-editor.c:1341
+#: addressbook/contact-editor/e-contact-editor.c:1406
 msgid "Email 2"
 msgstr "Epost 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1342
+#: addressbook/contact-editor/e-contact-editor.c:1407
 msgid "Email 3"
 msgstr "Epost 3"
 
@@ -504,6 +651,22 @@ msgstr "Epost 3"
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#, fuzzy
+msgid "Delete Contact?"
+msgstr "Ta bort en 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/contact-editor/e-contact-editor-strings.h:7
 msgid "_Add"
 msgstr "_Lägg till"
@@ -518,6 +681,8 @@ msgid "New phone type"
 msgstr "Ny telefontyp"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
+#: calendar/gui/event-editor-dialog.glade.h:91 mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:16 mail/mail-config.glade.h:22
 msgid "Add"
 msgstr "Lägg till"
 
@@ -567,13 +732,14 @@ msgstr "F_öretag"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:25
 msgid "_This is the mailing address"
-msgstr "De_tta är epost-adressen"
+msgstr "De_tta är epostadressen"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
 msgid "C_ontacts..."
 msgstr "_Kontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -586,6 +752,7 @@ msgid "_Company:"
 msgstr "_Företag:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "General"
 msgstr "Generellt"
 
@@ -630,6 +797,7 @@ msgid "No_tes:"
 msgstr "An_teckningar:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
 msgid "Details"
 msgstr "Detaljer"
 
@@ -692,55 +860,72 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/gui/component/addressbook.c:420
-#: calendar/gui/calendar-commands.c:544
+#: addressbook/demo/addressbook.c:78
+#: addressbook/gui/component/addressbook.c:438
+#: calendar/gui/calendar-commands.c:511 notes/component-factory.c:27
 msgid "New"
 msgstr "Ny"
 
-#: addressbook/gui/component/addressbook.c:420
+#: addressbook/demo/addressbook.c:78
+#: addressbook/gui/component/addressbook.c:438
 msgid "Create a new contact"
 msgstr "Skapa en ny kontakt"
 
-#: addressbook/gui/component/addressbook.c:424
+#: addressbook/demo/addressbook.c:82
+#: addressbook/gui/component/addressbook.c:442
 msgid "Find"
 msgstr "Hitta"
 
-#: addressbook/gui/component/addressbook.c:424
+#: addressbook/demo/addressbook.c:82
+#: addressbook/gui/component/addressbook.c:442
 msgid "Find a contact"
 msgstr "Hitta en kontakt"
 
-#: addressbook/gui/component/addressbook.c:425
-#: addressbook/gui/component/addressbook.c:492
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
+#: addressbook/demo/addressbook.c:83
+#: addressbook/gui/component/addressbook.c:443
+#: calendar/gui/calendar-commands.c:516 mail/folder-browser-factory.c:48
+#: mail/mail-view.c:145
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/demo/addressbook.c:83
+#: addressbook/gui/component/addressbook.c:443
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: addressbook/gui/component/addressbook.c:426
+#: addressbook/demo/addressbook.c:84
+#: addressbook/gui/component/addressbook.c:444
 msgid "Delete a contact"
 msgstr "Ta bort en kontakt"
 
-#: addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:1039
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:506
+#: addressbook/demo/addressbook.c:103
+#: addressbook/gui/component/addressbook.c:529
 msgid "_New Contact"
 msgstr "_Ny kontakt"
 
-#: addressbook/gui/component/addressbook.c:514
+#: addressbook/gui/component/addressbook.c:512
+#, fuzzy
+msgid "_Print Contacts..."
+msgstr "Skriv ut kontakter"
+
+#: addressbook/gui/component/addressbook.c:522
+#: addressbook/gui/component/addressbook.c:1052
+msgid "As _Table"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:537
 msgid "N_ew Directory Server"
 msgstr "Ny katalogserver"
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:551
+msgid "_Search for contacts"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:633
 msgid "Unable to open addressbook"
 msgstr "Kunde inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:598
+#: addressbook/gui/component/addressbook.c:638
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -752,20 +937,20 @@ msgid ""
 "OpenLDAP and recompile and install evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:943
-#: addressbook/gui/minicard/e-minicard.c:330
+#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/minicard/e-minicard.c:332
 msgid "Save as VCard"
 msgstr "Spara som VCard"
 
-#: addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/component/addressbook.c:1023
 msgid "* Click here to add a contact *"
 msgstr "* Klicka här för att lägga till en kontakt *"
 
-#: addressbook/gui/component/addressbook.c:1046
+#: addressbook/gui/component/addressbook.c:1059
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
-#: addressbook/gui/component/addressbook.c:1097
+#: addressbook/gui/component/addressbook.c:1110
 msgid "The URI that the Folder Browser will display"
 msgstr "URL:en som mappbläddraden kommer att visa"
 
@@ -811,7 +996,7 @@ msgid "g"
 msgstr "g"
 
 #: addressbook/gui/component/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:98
+#: calendar/cal-util/timeutil.c:131
 msgid "h"
 msgstr "h"
 
@@ -887,6 +1072,10 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
+#: addressbook/gui/component/e-ldap-storage.c:88
+msgid "External Directories"
+msgstr ""
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -914,6 +1103,35 @@ msgstr "Rot DN:"
 msgid "Name:"
 msgstr "Namn:"
 
+#.
+#. * 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
+#, fuzzy
+msgid "Select Names"
+msgstr "_Markerade objekt"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "Find..."
+msgstr "Hitta"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+msgid "Select name from List:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:10
+#, fuzzy
+msgid "Message Recipients"
+msgstr "Meddelandestatus"
+
+#: addressbook/gui/minicard/e-minicard-control.c:278
+#, fuzzy
+msgid "Save in addressbook"
+msgstr "Kunde inte öppna adressboken"
+
 #: addressbook/gui/minicard/e-minicard-view.c:110
 msgid ""
 "\n"
@@ -928,6 +1146,26 @@ msgstr ""
 "\n"
 "Dubbel-klicka här för att skapa en ny kontakt."
 
+#: addressbook/gui/minicard/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/minicard/test-minicard-view.c:101
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: addressbook/gui/minicard/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: mail/folder-browser.c:370
+#, fuzzy
+msgid "Search"
+msgstr "Sök..."
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -1031,6 +1269,7 @@ msgstr "Typ:"
 
 #: addressbook/printing/e-contact-print.glade.h:31
 #: addressbook/printing/e-contact-print.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:81
 msgid "label26"
 msgstr "label26"
 
@@ -1109,51 +1348,91 @@ msgstr "Backa vid jämna sidor"
 msgid "Header/Footer"
 msgstr "Rubrik/sidfot"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:596
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:595
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/calendar-commands.c:56
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:146
+msgid "Gpilotd calendar conduit"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:149
+msgid "Configuration utility for the calendar conduit.\n"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:399
+#: calendar/conduits/calendar/calendar-conduit.c:1109
+#: calendar/conduits/todo/todo-conduit.c:443
+#: calendar/conduits/todo/todo-conduit.c:1025
+msgid "Error while communicating with calendar server"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:776
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:707
+#: calendar/conduits/todo/todo-conduit.c:709
+msgid "Could not start gnomecal server"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:806
+#: calendar/conduits/calendar/calendar-conduit.c:809
+msgid "Could not read pilot's DateBook application block"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:146
+msgid "Gpilotd todo conduit"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:149
+msgid "Configuration utility for the todo conduit.\n"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:737
+#: calendar/conduits/todo/todo-conduit.c:740
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:59
 msgid "Outline:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:57
+#: calendar/gui/calendar-commands.c:60
 msgid "Headings:"
 msgstr "Rubriker:"
 
-#: calendar/gui/calendar-commands.c:58
+#: calendar/gui/calendar-commands.c:61
 msgid "Empty days:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:62
 msgid "Appointments:"
 msgstr "Ärenden:"
 
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:63
 msgid "Highlighted day:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:64
 msgid "Day numbers:"
 msgstr "Dagnummer:"
 
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:65
 msgid "Current day's number:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:66
 msgid "To-Do item that is not yet due:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is due today:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is overdue:"
 msgstr ""
 
@@ -1165,166 +1444,232 @@ msgstr "Gnome-kalender"
 msgid "The GNOME personal calendar and schedule manager."
 msgstr "GNOMEs personliga kalender och schemahanterare."
 
-#: calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:401 tests/ui-tests/message-browser.c:676
 msgid "File not found"
 msgstr "Filen hittades inte"
 
-#: calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:423
 msgid "Open calendar"
 msgstr "Öppna kalendern"
 
-#: calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:462
 msgid "Save calendar"
 msgstr "Spara kalendern"
 
-#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713
-#: calendar/gui/gncal-todo.c:717
+#: calendar/gui/calendar-commands.c:489 calendar/gui/gncal-todo.c:763
+#: calendar/gui/gncal-todo.c:767
 msgid "Day"
 msgstr "Dag"
 
-#: calendar/gui/calendar-commands.c:522
+#: calendar/gui/calendar-commands.c:489
 msgid "Show 1 day"
 msgstr "Visa 1 dag"
 
-#: calendar/gui/calendar-commands.c:525
+#: calendar/gui/calendar-commands.c:492
 msgid "5 Days"
 msgstr "5 dagar"
 
-#: calendar/gui/calendar-commands.c:525
+#: calendar/gui/calendar-commands.c:492
 #, fuzzy
 msgid "Show the working week"
 msgstr "Växlar trädvyn"
 
-#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712
+#: calendar/gui/calendar-commands.c:495 calendar/gui/gncal-todo.c:762
 msgid "Week"
 msgstr "Vecka"
 
-#: calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:495
 msgid "Show 1 week"
 msgstr "Visa 1 vecka"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:498
 msgid "Month"
 msgstr "Månader"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:498
 msgid "Show 1 month"
 msgstr "Visa 1 månad"
 
-#: calendar/gui/calendar-commands.c:535
+#: calendar/gui/calendar-commands.c:502
 msgid "Year"
 msgstr "År"
 
-#: calendar/gui/calendar-commands.c:535
+#: calendar/gui/calendar-commands.c:502
 msgid "Show 1 year"
 msgstr "Visa 1 år"
 
-#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+#: calendar/gui/calendar-commands.c:511 calendar/gui/calendar-commands.c:663
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt ärende"
 
-#: calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
+#: calendar/gui/calendar-commands.c:516 calendar/gui/calendar-commands.c:655
 msgid "Print this calendar"
 msgstr "Skriv ut denna kalendern"
 
-#: calendar/gui/calendar-commands.c:552
+#: calendar/gui/calendar-commands.c:520
 msgid "Prev"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:552
+#: calendar/gui/calendar-commands.c:520
 msgid "Go back in time"
 msgstr "Gå tillbaka i tiden"
 
-#: calendar/gui/calendar-commands.c:553
+#: calendar/gui/calendar-commands.c:521
 msgid "Today"
 msgstr "Idag"
 
-#: calendar/gui/calendar-commands.c:553
+#: calendar/gui/calendar-commands.c:521
 msgid "Go to present time"
 msgstr "Gå till nutid"
 
-#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
+#: calendar/gui/calendar-commands.c:522
 msgid "Next"
 msgstr "Nästa"
 
-#: calendar/gui/calendar-commands.c:554
+#: calendar/gui/calendar-commands.c:522
 msgid "Go forward in time"
 msgstr "Gå fram i tiden"
 
-#: calendar/gui/calendar-commands.c:558
+#: calendar/gui/calendar-commands.c:526
 msgid "Go to"
 msgstr "Gå till"
 
-#: calendar/gui/calendar-commands.c:558
+#: calendar/gui/calendar-commands.c:526
 msgid "Go to a specific date"
 msgstr "Gå till ett specifikt datum"
 
 #. file menu
-#: calendar/gui/calendar-commands.c:659
+#: calendar/gui/calendar-commands.c:640
 msgid "New Ca_lendar"
 msgstr "Ny ka_lender"
 
-#: calendar/gui/calendar-commands.c:660
+#: calendar/gui/calendar-commands.c:641
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
-#: calendar/gui/calendar-commands.c:663
+#: calendar/gui/calendar-commands.c:644
 msgid "Open Ca_lendar"
 msgstr "Öppna ka_lender"
 
-#: calendar/gui/calendar-commands.c:664
+#: calendar/gui/calendar-commands.c:645
 msgid "Open a calendar"
 msgstr "Öppna en kalender"
 
-#: calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
+#: calendar/gui/calendar-commands.c:649 calendar/gui/calendar-commands.c:650
 msgid "Save Calendar As"
 msgstr "Spara kalender som"
 
-#: calendar/gui/calendar-commands.c:682
+#: calendar/gui/calendar-commands.c:663
 msgid "_New appointment..."
 msgstr "_Nytt ärende..."
 
-#: calendar/gui/calendar-commands.c:687
-msgid "New appointment for _today..."
-msgstr "Ny_tt ärende för idag..."
-
-#: calendar/gui/calendar-commands.c:688
-msgid "Create a new appointment for today"
-msgstr "Skapa ett nytt ärende för idag"
-
-#: calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
+#: calendar/gui/calendar-commands.c:671 calendar/gui/prop.c:716
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704
+#: calendar/gui/calendar-commands.c:678 calendar/gui/calendar-commands.c:679
 msgid "About Calendar"
 msgstr "Om kalendern"
 
 #. 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:746
+#: calendar/gui/calendar-commands.c:721
 #, c-format
 msgid "%s%s"
 msgstr "%s%s"
 
-#: calendar/gui/calendar-commands.c:746
+#: calendar/gui/calendar-commands.c:721
 msgid "'s calendar"
 msgstr "'s kalender"
 
-#: calendar/gui/control-factory.c:136
+#: calendar/gui/calendar-model.c:327
+msgid "Public"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:330
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#, fuzzy
+msgid "Private"
+msgstr "Klistra in"
+
+#: calendar/gui/calendar-model.c:333
+msgid "Confidential"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:503
+#, fuzzy
+msgid "Unknown"
+msgstr "Okänt fel"
+
+#: calendar/gui/calendar-model.c:423
+msgid "N"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:423
+#, fuzzy
+msgid "S"
+msgstr "Lö"
+
+#: calendar/gui/calendar-model.c:425
+msgid "E"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:425
+#, fuzzy
+msgid "W"
+msgstr "On"
+
+#: calendar/gui/calendar-model.c:497
+#, fuzzy
+msgid "Transparent"
+msgstr "Post-transportering"
+
+#: calendar/gui/calendar-model.c:500
+msgid "Opaque"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:737
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:914
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:954
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:988
+msgid "The priority must be between 1 and 9, inclusive"
+msgstr ""
+
+#: calendar/gui/control-factory.c:132
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "URL:en som mappbläddraden kommer att visa"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:181
+#: calendar/gui/dialogs/alarm-notify-dialog.c:183
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm på %A %b %d %Y %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:188
+#: calendar/gui/dialogs/alarm-notify-dialog.c:190
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#, fuzzy
+msgid "No summary available."
+msgstr "Ingen sammanfattning"
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -1334,7 +1679,7 @@ msgstr ""
 msgid "Close"
 msgstr "Stäng"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1086
 #, fuzzy
 msgid "Snooze"
 msgstr "Storlek"
@@ -1347,137 +1692,658 @@ msgstr "Redigera ärende"
 msgid "Snooze time (minutes)"
 msgstr ""
 
+#: calendar/gui/dialogs/task-editor.c:245 calendar/gui/event-editor.c:1209
+#, fuzzy
+msgid "FIXME: _Delete"
+msgstr "Ta bort"
+
+#: calendar/gui/dialogs/task-editor.c:287
+#: calendar/gui/dialogs/task-editor.c:295
+#, fuzzy
+msgid "FIXME: In_complete Task"
+msgstr "Ta bort"
+
+#: calendar/gui/dialogs/task-editor.c:347 calendar/gui/event-editor.c:1311
+msgid "FIXME: Chec_k Names"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:348 calendar/gui/event-editor.c:1312
+msgid "FIXME: Address _Book..."
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:355
+#, fuzzy
+msgid "FIXME: _New Task"
+msgstr "_Möte"
+
+#: calendar/gui/dialogs/task-editor.c:357
+msgid "FIXME: S_end Status Report"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:358
+#, fuzzy
+msgid "FIXME: _Mark Complete"
+msgstr "Ta bort"
+
+#: calendar/gui/dialogs/task-editor.c:360 calendar/gui/event-editor.c:1321
+msgid "FIXME: Rec_urrence..."
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:361
+msgid "FIXME: S_kip Occurrence"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:363
+msgid "FIXME: Assig_n Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:365
+#, fuzzy
+msgid "FIXME: _Reply"
+msgstr "Ta bort"
+
+#: calendar/gui/dialogs/task-editor.c:366
+#, fuzzy
+msgid "FIXME: Reply to A_ll"
+msgstr "Svara till alla"
+
+#: calendar/gui/dialogs/task-editor.c:409 calendar/gui/event-editor.c:1381
+msgid "FIXME: Save and Close"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:410
+#, fuzzy
+msgid "Save the task and close the dialog box"
+msgstr "Spara ärendet och stäng dialogen"
+
+#: calendar/gui/dialogs/task-editor.c:414 calendar/gui/event-editor.c:1386
+msgid "FIXME: Print..."
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:419 calendar/gui/event-editor.c:1391
+msgid "FIXME: Recurrence..."
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:420 calendar/gui/event-editor.c:1392
+msgid "Configure recurrence rules"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:422
+#, fuzzy
+msgid "FIXME: Assign Task..."
+msgstr "Typsnitt..."
+
+#: calendar/gui/dialogs/task-editor.c:423
+msgid "Assign the task to someone"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:425 calendar/gui/event-editor.c:1397
+#, fuzzy
+msgid "FIXME: Delete"
+msgstr "Ta bort"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#, fuzzy
+msgid "S_ubject:"
+msgstr "Ämne:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+msgid "Owner:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Sta_rt Date:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#, fuzzy
+msgid "_Due Date:"
+msgstr "Avdelning:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+msgid "_Status:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Cancelled\n"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+msgid "Not Started"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "_Priority:"
+msgstr "Prioritet:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#, fuzzy
+msgid "High"
+msgstr "Höjd:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+msgid "% Comp_lete:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#, fuzzy
+msgid "_Contacts..."
+msgstr "_Kontakter..."
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#, fuzzy
+msgid "Task"
+msgstr "Uppgif_t"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
+#, fuzzy
+msgid "Date Completed:"
+msgstr "Objektkommentarer:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#, fuzzy
+msgid "Location:"
+msgstr "Sektioner:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+msgid "URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
+#, fuzzy
+msgid "Resources:"
+msgstr "Papperskälla:"
+
+#: calendar/gui/e-calendar-table.c:189
+#, fuzzy
+msgid "Comment"
+msgstr "Objektkommentarer:"
+
+#: calendar/gui/e-calendar-table.c:194
+msgid "Completed"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:199
+#, fuzzy
+msgid "Created"
+msgstr "Skapa filter"
+
+#: calendar/gui/e-calendar-table.c:204
+#, fuzzy
+msgid "Description"
+msgstr "Beskrivning:"
+
+#: calendar/gui/e-calendar-table.c:209
+msgid "Timestamp"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:214
+msgid "Start Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:219
+#, fuzzy
+msgid "End Date"
+msgstr "Datum"
+
+#: calendar/gui/e-calendar-table.c:224
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:229
+msgid "Last Modification Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:234
+#, fuzzy
+msgid "Location"
+msgstr "Hä_ndelser"
+
+#: calendar/gui/e-calendar-table.c:239
+#, fuzzy
+msgid "Organizer"
+msgstr "Organisation:"
+
+#: calendar/gui/e-calendar-table.c:244
+msgid "% Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:249 calendar/gui/gncal-todo.c:476
+#: calendar/gui/prop.c:609 mail/message-list.c:508
+msgid "Priority"
+msgstr "Prioritet"
+
+#: calendar/gui/e-calendar-table.c:260
+#, fuzzy
+msgid "TaskPad"
+msgstr "Uppgif_t"
+
+#: calendar/gui/e-calendar-table.c:265
+msgid "URL"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:270
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "Reminder"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:369
+#, fuzzy
+msgid "Open..."
+msgstr "_Öppna"
+
+#: calendar/gui/e-calendar-table.c:370
+msgid "Open the task"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:372
+msgid "Mark Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:373
+msgid "Mark the task complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, fuzzy
+msgid "Delete the task"
+msgstr "Ta bort detta objektet"
+
 #: calendar/gui/e-day-view-time-item.c:391
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-day-view.c:2333 calendar/gui/e-day-view.c:2340
+#: calendar/gui/e-day-view.c:2349 calendar/gui/e-week-view.c:2675
+#: calendar/gui/e-week-view.c:2682 calendar/gui/e-week-view.c:2691
 msgid "New appointment..."
 msgstr "Nytt ärende..."
 
-#: 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
+#: calendar/gui/e-day-view.c:2337 calendar/gui/e-day-view.c:2344
+#: calendar/gui/e-week-view.c:2679 calendar/gui/e-week-view.c:2686
 msgid "Edit this appointment..."
 msgstr "Redigera detta ärendet..."
 
-#: calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+#: calendar/gui/e-day-view.c:2338 calendar/gui/e-week-view.c:2680
 msgid "Delete this appointment"
 msgstr "Ta bort detta ärendet"
 
-#: calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
+#: calendar/gui/e-day-view.c:2345 calendar/gui/e-week-view.c:2687
 msgid "Make this appointment movable"
 msgstr "Gör detta ärendet flyttbart"
 
-#: calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
+#: calendar/gui/e-day-view.c:2346 calendar/gui/e-week-view.c:2688
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Ta bort detta meddelandet"
 
-#: calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
+#: calendar/gui/e-day-view.c:2347 calendar/gui/e-week-view.c:2689
 msgid "Delete all occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:289
+#: calendar/gui/event-editor.c:294
 msgid "Edit Appointment"
 msgstr "Redigera ärende"
 
-#: calendar/gui/event-editor.c:294
+#: calendar/gui/event-editor.c:300
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/event-editor.c:298
+#: calendar/gui/event-editor.c:306
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ärende - %s"
 
-#: calendar/gui/event-editor.c:301
+#: calendar/gui/event-editor.c:309
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/event-editor.c:304
+#: calendar/gui/event-editor.c:312
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "_Dagbokpost"
 
 #. Owner, summary
-#: calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688
+#: calendar/gui/event-editor.c:613 calendar/gui/event-editor.c:717
 msgid "?"
 msgstr "?"
 
-#: calendar/gui/event-editor.c:1148
+#: calendar/gui/event-editor.c:1276
+msgid "FIXME: Ca_lendar..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1319
 #, fuzzy
-msgid "FIXME: _Delete"
-msgstr "Ta bort"
+msgid "FIXME: _New Appointment"
+msgstr "_Möte"
 
-#: calendar/gui/event-editor.c:1215
-msgid "FIXME: Ca_lendar..."
+#: calendar/gui/event-editor.c:1323
+#, fuzzy
+msgid "FIXME: Invite _Attendees..."
+msgstr "Lägg till bilaga..."
+
+#: calendar/gui/event-editor.c:1324
+msgid "FIXME: C_ancel Invitation..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1250
-msgid "FIXME: Chec_k Names"
+#: calendar/gui/event-editor.c:1326
+msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1251
-msgid "FIXME: Address _Book..."
+#: calendar/gui/event-editor.c:1394
+msgid "FIXME: Invite Attendees..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1395
+msgid "Invite attendees to a meeting"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1838
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#. todo
+#.
+#. build some of the recur stuff by hand to take into account
+#. the start-on-monday preference?
+#.
+#. get the apply button to work right
+#.
+#. make the properties stuff unglobal
+#.
+#. figure out why alarm units aren't sticking between edits
+#.
+#. closing the dialog window with the wm caused a crash
+#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
+#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
+#.
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: calendar/gui/event-editor-dialog.glade.h:7
+msgid "event-editor-dialog"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1258
+#: calendar/gui/event-editor-dialog.glade.h:8
 #, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "_Möte"
+msgid "_Summary:"
+msgstr "Sammanfattning:"
 
-#: calendar/gui/event-editor.c:1260
-msgid "FIXME: Rec_urrence..."
+#: calendar/gui/event-editor-dialog.glade.h:9
+msgid "_Owner:"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1262
-msgid "FIXME: Intive _Attendees..."
+#: calendar/gui/event-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Time"
+msgstr "Tid kvar"
+
+#: calendar/gui/event-editor-dialog.glade.h:11
+#, fuzzy
+msgid "Start time:"
+msgstr "Begäran om möte"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+msgid "End time:"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1263
-msgid "FIXME: C_ancel Invitation..."
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1265
-msgid "FIXME: Forward as v_Calendar"
+#: calendar/gui/event-editor-dialog.glade.h:14
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1320
-msgid "FIXME: Save and Close"
+#: calendar/gui/event-editor-dialog.glade.h:15
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1325
-msgid "FIXME: Print..."
+#: calendar/gui/event-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Pri_vate"
+msgstr "Klistra in"
+
+#: calendar/gui/event-editor-dialog.glade.h:17
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1330
-msgid "FIXME: Recurrence..."
+#: calendar/gui/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:31
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days\n"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1331
-msgid "Configure recurrence rules"
+#: calendar/gui/event-editor-dialog.glade.h:35
+#, fuzzy
+msgid "_Display"
+msgstr "Detaljer"
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+#, fuzzy
+msgid "_Audio"
+msgstr "_Lägg till"
+
+#: calendar/gui/event-editor-dialog.glade.h:37
+msgid "_Program"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1333
-msgid "FIXME: Invite Attendees..."
+#: calendar/gui/event-editor-dialog.glade.h:38
+#, fuzzy
+msgid "_Mail"
+msgstr "_Mobil"
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+#, fuzzy
+msgid "Mail _to:"
+msgstr "Post-källa"
+
+#: calendar/gui/event-editor-dialog.glade.h:40
+msgid "_Run program:"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1334
-msgid "Invite attendees to a meeting"
+#: calendar/gui/event-editor-dialog.glade.h:42
+msgid "Recurrence rule"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1336
+#: calendar/gui/event-editor-dialog.glade.h:43 shell/e-shell-view.c:877
+msgid "None"
+msgstr "Inga"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
 #, fuzzy
-msgid "FIXME: Delete"
-msgstr "Ta bort"
+msgid "Daily"
+msgstr "Detaljer"
 
-#: calendar/gui/event-editor.c:1745
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
+#: calendar/gui/event-editor-dialog.glade.h:45
+#, fuzzy
+msgid "Weekly"
+msgstr "Vecka"
+
+#: calendar/gui/event-editor-dialog.glade.h:46
+#, fuzzy
+msgid "Monthly"
+msgstr "Månader"
+
+#: calendar/gui/event-editor-dialog.glade.h:47
+#, fuzzy
+msgid "Yearly"
+msgstr "År"
+
+#: calendar/gui/event-editor-dialog.glade.h:48
+#, fuzzy
+msgid "label23"
+msgstr "label2"
+
+#: calendar/gui/event-editor-dialog.glade.h:49
+#: calendar/gui/event-editor-dialog.glade.h:52
+#: calendar/gui/event-editor-dialog.glade.h:82
+msgid "Every "
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:50
+#, fuzzy
+msgid "day(s)"
+msgstr "dag"
+
+#: calendar/gui/event-editor-dialog.glade.h:51
+#, fuzzy
+msgid "label24"
+msgstr "label2"
+
+#: calendar/gui/event-editor-dialog.glade.h:53
+#, fuzzy
+msgid "week(s)"
+msgstr "vecka"
+
+#: calendar/gui/event-editor-dialog.glade.h:54
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Mån"
+
+#: calendar/gui/event-editor-dialog.glade.h:55
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Tis"
+
+#: calendar/gui/event-editor-dialog.glade.h:56
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Ons"
+
+#: calendar/gui/event-editor-dialog.glade.h:57
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Tors"
+
+#: calendar/gui/event-editor-dialog.glade.h:58
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Fre"
+
+#: calendar/gui/event-editor-dialog.glade.h:59
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Lör"
+
+#. Initialize by default to three-letter day names
+#: calendar/gui/event-editor-dialog.glade.h:60
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Sön"
+
+#: calendar/gui/event-editor-dialog.glade.h:61
+#, fuzzy
+msgid "label25"
+msgstr "label2"
+
+#: calendar/gui/event-editor-dialog.glade.h:62
+#: calendar/gui/event-editor-dialog.glade.h:63
+msgid "Recur on the"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:64
+msgid "th day of the month"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:65
+msgid ""
+"1st\n"
+"2nd\n"
+"3rd\n"
+"4th\n"
+"5th\n"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:71
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday\n"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:79
+msgid "Every"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:80
+#, fuzzy
+msgid "month(s)"
+msgstr "Typsnitt"
+
+#: calendar/gui/event-editor-dialog.glade.h:83
+#, fuzzy
+msgid "year(s)"
+msgstr "år"
+
+#: calendar/gui/event-editor-dialog.glade.h:84
+#, fuzzy
+msgid "label27"
+msgstr "label7"
+
+#: calendar/gui/event-editor-dialog.glade.h:85
+msgid "Ending date"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:86
+msgid "Repeat forever"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:87
+msgid "End on "
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:88
+#, fuzzy
+msgid "End after"
+msgstr "Redigera filter"
+
+#: calendar/gui/event-editor-dialog.glade.h:89
+msgid "occurrence(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:90
+#, fuzzy
+msgid "Exceptions"
+msgstr "Alternativ"
+
+#: calendar/gui/event-editor-dialog.glade.h:92
+#, fuzzy
+msgid "Change"
+msgstr "Skuggning"
+
+#: calendar/gui/event-editor-dialog.glade.h:94
+msgid "Recurrence"
+msgstr ""
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -1575,11 +2441,11 @@ msgstr "fredag"
 msgid "saturday"
 msgstr "lördag"
 
-#: calendar/gui/getdate.y:420
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
 msgid "year"
 msgstr "år"
 
-#: calendar/gui/getdate.y:421
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
 msgid "month"
 msgstr "månad"
 
@@ -1587,19 +2453,19 @@ msgstr "månad"
 msgid "fortnight"
 msgstr ""
 
-#: calendar/gui/getdate.y:423
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
 msgid "week"
 msgstr "vecka"
 
-#: calendar/gui/getdate.y:424
+#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/getdate.y:425
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
 msgid "hour"
 msgstr "timme"
 
-#: calendar/gui/getdate.y:426
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
 msgid "minute"
 msgstr "minut"
 
@@ -1607,7 +2473,7 @@ msgstr "minut"
 msgid "min"
 msgstr "min"
 
-#: calendar/gui/getdate.y:428
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
 msgid "second"
 msgstr "sekund"
 
@@ -1627,7 +2493,8 @@ msgstr "förgår"
 msgid "today"
 msgstr "idag"
 
-#: calendar/gui/getdate.y:438
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
+#: filter/filter-datespec.c:664
 msgid "now"
 msgstr "nu"
 
@@ -1693,143 +2560,109 @@ msgstr "tolfte"
 msgid "ago"
 msgstr "sen"
 
-#: calendar/gui/gncal-todo.c:137
+#: calendar/gui/gncal-todo.c:167
 msgid "Create to-do item"
 msgstr "Skapa att-göra objekt"
 
-#: calendar/gui/gncal-todo.c:137
+#: calendar/gui/gncal-todo.c:167
 msgid "Edit to-do item"
 msgstr "Redigera att-göra objekt"
 
-#: calendar/gui/gncal-todo.c:171
+#: calendar/gui/gncal-todo.c:203
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
-#: calendar/gui/gncal-todo.c:181
+#: calendar/gui/gncal-todo.c:214
 #, fuzzy
 msgid "Due Date:"
 msgstr "Avdelning:"
 
-#: calendar/gui/gncal-todo.c:190
+#: calendar/gui/gncal-todo.c:225
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: calendar/gui/gncal-todo.c:207
+#: calendar/gui/gncal-todo.c:243
 msgid "Item Comments:"
 msgstr "Objektkommentarer:"
 
-#: calendar/gui/gncal-todo.c:325
+#: calendar/gui/gncal-todo.c:374
 msgid "Add to-do item..."
 msgstr "Lägg till att-göra objekt..."
 
-#: calendar/gui/gncal-todo.c:326
+#: calendar/gui/gncal-todo.c:375
 msgid "Edit this item..."
 msgstr "Redigera detta objektet..."
 
-#: calendar/gui/gncal-todo.c:425
+#: calendar/gui/gncal-todo.c:474
 msgid "Summary"
 msgstr "Sammanfattning"
 
-#: calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604
+#: calendar/gui/gncal-todo.c:475 calendar/gui/prop.c:608
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605
-#: mail/message-list.c:474
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/gncal-todo.c:428
+#: calendar/gui/gncal-todo.c:477
 msgid "Time Left"
 msgstr "Tid kvar"
 
 #. Label
-#: calendar/gui/gncal-todo.c:440
+#: calendar/gui/gncal-todo.c:489
 msgid "To-do list"
 msgstr "Att-göra lista"
 
 #. Add
-#: calendar/gui/gncal-todo.c:479
+#: calendar/gui/gncal-todo.c:528
 #: composer/e-msg-composer-address-dialog.glade.h:13
 msgid "Add..."
 msgstr "Lägg till..."
 
 #. Edit
-#: calendar/gui/gncal-todo.c:488
+#: calendar/gui/gncal-todo.c:537
 msgid "Edit..."
 msgstr "Redigera..."
 
-#: calendar/gui/gncal-todo.c:712
+#: calendar/gui/gncal-todo.c:762
 msgid "Weeks"
 msgstr "Veckor"
 
-#: calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717
+#: calendar/gui/gncal-todo.c:763 calendar/gui/gncal-todo.c:767
 msgid "Days"
 msgstr "Dagar"
 
-#: calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
+#: calendar/gui/gncal-todo.c:768 calendar/gui/gncal-todo.c:772
 msgid "Hours"
 msgstr "Timmar"
 
-#: calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
+#: calendar/gui/gncal-todo.c:768 calendar/gui/gncal-todo.c:772
 msgid "Hour"
 msgstr "Timme"
 
-#: calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
+#: calendar/gui/gncal-todo.c:773 calendar/gui/gncal-todo.c:777
 msgid "Minutes"
 msgstr "Minuter"
 
-#: calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
+#: calendar/gui/gncal-todo.c:773 calendar/gui/gncal-todo.c:777
 msgid "Minute"
 msgstr "Minut"
 
-#: calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
+#: calendar/gui/gncal-todo.c:778 calendar/gui/gncal-todo.c:782
 msgid "Seconds"
 msgstr "Sekunder"
 
-#: calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
+#: calendar/gui/gncal-todo.c:778 calendar/gui/gncal-todo.c:782
 msgid "Second"
 msgstr "Sekund"
 
-#: calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
-#: calendar/gui/gnome-cal.c:1120
+#: calendar/gui/gnome-cal.c:461 calendar/gui/gnome-cal.c:1094
+#: calendar/gui/gnome-cal.c:1150
 msgid "Reminder of your appointment at "
 msgstr ""
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124
+#: calendar/gui/gnome-cal.c:1099 calendar/gui/gnome-cal.c:1154
 msgid "Ok"
 msgstr "Ok"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Sön"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Mån"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Tis"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Ons"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Tors"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Fre"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Lör"
-
 #: calendar/gui/goto.c:82
 msgid "Year:"
 msgstr "År:"
@@ -1850,246 +2683,246 @@ msgstr ""
 msgid "Go to today"
 msgstr "Gå till idag"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:271
+#: calendar/gui/print.c:294
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Mo"
 msgstr "Må"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "We"
 msgstr "On"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Sa"
 msgstr "Lö"
 
-#: calendar/gui/print.c:868
+#: calendar/gui/print.c:937
 msgid "TODO Items"
 msgstr "ATT-GÖRA objekt"
 
 #. Day
-#: calendar/gui/print.c:980
+#: calendar/gui/print.c:1038
 msgid "Current day (%a %b %d %Y)"
 msgstr "Aktuell dag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1000 calendar/gui/print.c:1014
-#: calendar/gui/print.c:1015
+#: calendar/gui/print.c:1058 calendar/gui/print.c:1072
+#: calendar/gui/print.c:1073
 msgid "%a"
 msgstr "%a"
 
-#: calendar/gui/print.c:1001 calendar/gui/print.c:1002
-#: calendar/gui/print.c:1016 calendar/gui/print.c:1017
+#: calendar/gui/print.c:1059 calendar/gui/print.c:1060
+#: calendar/gui/print.c:1074 calendar/gui/print.c:1075
 msgid "%b"
 msgstr "%b"
 
-#: calendar/gui/print.c:1004
+#: calendar/gui/print.c:1062
 #, c-format
 msgid "Current week (%s %s %d - %s %d %d)"
 msgstr "Aktuell vecka (%s %s %d - %s %d %d)"
 
-#: calendar/gui/print.c:1021
+#: calendar/gui/print.c:1079
 #, c-format
 msgid "Current week (%s %s %d - %s %s %d %d)"
 msgstr "Aktuell vecka (%s %s %d - %s %s %d %d)"
 
-#: calendar/gui/print.c:1027
+#: calendar/gui/print.c:1085
 #, c-format
 msgid "Current week (%s %s %d %d - %s %s %d %d)"
 msgstr "Aktuell vecka (%s %s %d %d - %s %s %d %d)"
 
 #. Month
-#: calendar/gui/print.c:1040
+#: calendar/gui/print.c:1098
 msgid "Current month (%a %Y)"
 msgstr "Nuvarande månad (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1047
+#: calendar/gui/print.c:1105
 msgid "Current year (%Y)"
 msgstr "Aktuellt år (%Y)"
 
-#: calendar/gui/print.c:1084
+#: calendar/gui/print.c:1142
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1249
+#: calendar/gui/print.c:1307
 msgid "Print Preview"
 msgstr "Förhandsgranskning"
 
-#: calendar/gui/prop.c:330
+#: calendar/gui/prop.c:334
 msgid "Time display"
 msgstr "Tidsvisning"
 
 #. Time format
-#: calendar/gui/prop.c:334
+#: calendar/gui/prop.c:338
 msgid "Time format"
 msgstr "Tidsformat"
 
-#: calendar/gui/prop.c:335
+#: calendar/gui/prop.c:339
 msgid "12-hour (AM/PM)"
 msgstr "12-timmars (AM/PM)"
 
-#: calendar/gui/prop.c:336
+#: calendar/gui/prop.c:340
 msgid "24-hour"
 msgstr "24-timmars"
 
 #. Weeks start on
-#: calendar/gui/prop.c:346
+#: calendar/gui/prop.c:350
 msgid "Weeks start on"
 msgstr "Veckor börjar på"
 
-#: calendar/gui/prop.c:347
+#: calendar/gui/prop.c:351
 msgid "Sunday"
 msgstr "Söndag"
 
-#: calendar/gui/prop.c:348
+#: calendar/gui/prop.c:352
 msgid "Monday"
 msgstr "Måndag"
 
 #. Day range
-#: calendar/gui/prop.c:358
+#: calendar/gui/prop.c:362
 msgid "Day range"
 msgstr ""
 
-#: calendar/gui/prop.c:369
+#: calendar/gui/prop.c:373
 msgid ""
 "Please select the start and end hours you want\n"
 "to be displayed in the day view and week view.\n"
@@ -2097,112 +2930,113 @@ msgid ""
 "by default."
 msgstr ""
 
-#: calendar/gui/prop.c:385
+#: calendar/gui/prop.c:389
 msgid "Day start:"
 msgstr ""
 
-#: calendar/gui/prop.c:396
+#: calendar/gui/prop.c:400
 msgid "Day end:"
 msgstr ""
 
-#: calendar/gui/prop.c:519
+#: calendar/gui/prop.c:523
 msgid "Colors for display"
 msgstr "Färger för visning"
 
-#: calendar/gui/prop.c:522
+#: calendar/gui/prop.c:526
 msgid "Colors"
 msgstr "Färger"
 
-#: calendar/gui/prop.c:599
+#: calendar/gui/prop.c:603
 msgid "Show on TODO List:"
 msgstr "Visa på ATT-GÖRA listan:"
 
-#: calendar/gui/prop.c:606
+#: calendar/gui/prop.c:610
 msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/prop.c:637
+#: calendar/gui/prop.c:641
 msgid "To Do List style options:"
 msgstr ""
 
-#: calendar/gui/prop.c:642
+#: calendar/gui/prop.c:646
 msgid "Highlight overdue items"
 msgstr ""
 
-#: calendar/gui/prop.c:645
+#: calendar/gui/prop.c:649
 msgid "Highlight not yet due items"
 msgstr ""
 
-#: calendar/gui/prop.c:648
+#: calendar/gui/prop.c:652
 msgid "Highlight items due today"
 msgstr ""
 
-#: calendar/gui/prop.c:678
+#: calendar/gui/prop.c:682
 msgid "To Do List Properties"
 msgstr ""
 
-#: calendar/gui/prop.c:681
+#: calendar/gui/prop.c:685
 msgid "To Do List"
 msgstr ""
 
-#: calendar/gui/prop.c:780
+#: calendar/gui/prop.c:784
 msgid "Alarms"
 msgstr "Alarm"
 
 #. build miscellaneous box
-#: calendar/gui/prop.c:783
+#: calendar/gui/prop.c:787
 msgid "Alarm Properties"
 msgstr "Egenskaper hos alarm"
 
-#: calendar/gui/prop.c:793
+#: calendar/gui/prop.c:797
 msgid "Beep on display alarms"
 msgstr ""
 
-#: calendar/gui/prop.c:803
+#: calendar/gui/prop.c:807
 msgid "Audio alarms timeout after"
 msgstr ""
 
-#: calendar/gui/prop.c:814 calendar/gui/prop.c:831
+#: calendar/gui/prop.c:818 calendar/gui/prop.c:835
 msgid " seconds"
 msgstr " sekunder"
 
-#: calendar/gui/prop.c:820
+#: calendar/gui/prop.c:824
 msgid "Enable snoozing for "
 msgstr ""
 
 #. populate default frame/box
-#: calendar/gui/prop.c:836
+#: calendar/gui/prop.c:840
 #, fuzzy
 msgid "Defaults"
 msgstr "Detaljer"
 
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
+#: composer/e-msg-composer-address-dialog.c:182
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: composer/e-msg-composer-address-dialog.c:184
+#: composer/e-msg-composer-address-dialog.c:183
 msgid "Cut selected item into clipboard"
 msgstr "Klipp ut markerat objekt till urklipp"
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
+#: composer/e-msg-composer-address-dialog.c:186
+#: mail/folder-browser-factory.c:46
 msgid "Copy"
 msgstr "Kopiera"
 
-#: composer/e-msg-composer-address-dialog.c:188
+#: composer/e-msg-composer-address-dialog.c:187
 msgid "Copy selected item into clipboard"
 msgstr "Kopiera markerat objekt till urklipp"
 
-#: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947
+#: composer/e-msg-composer-address-dialog.c:190
+#: composer/e-msg-composer-address-dialog.c:198
 msgid "Paste"
 msgstr "Klistra in"
 
-#: composer/e-msg-composer-address-dialog.c:192
-#: composer/e-msg-composer-address-dialog.c:200
+#: composer/e-msg-composer-address-dialog.c:191
+#: composer/e-msg-composer-address-dialog.c:199
 msgid "Paste item from clipboard"
 msgstr "Klistra in objekt från urklipp"
 
-#: composer/e-msg-composer-address-dialog.c:528
+#: composer/e-msg-composer-address-dialog.c:525
 msgid "Select recipients' addresses"
 msgstr "Välj mottagaradresser"
 
@@ -2224,6 +3058,7 @@ msgid "Name"
 msgstr "Namn"
 
 #: composer/e-msg-composer-address-dialog.glade.h:11
+#: mail/mail-config.glade.h:8
 msgid "Address"
 msgstr "Adress"
 
@@ -2316,31 +3151,40 @@ msgstr "Mime-typ:"
 msgid "File name:"
 msgstr "Filnamn:"
 
-#: composer/e-msg-composer-hdrs.c:174
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
+msgid "From:"
+msgstr "Från:"
+
+#: composer/e-msg-composer-hdrs.c:243
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
-#: composer/e-msg-composer-hdrs.c:216
+#: composer/e-msg-composer-hdrs.c:296
+#, fuzzy
+msgid "Enter the identitiy you wish to send this message from"
+msgstr "Ange meddelandets mottagare"
+
+#: composer/e-msg-composer-hdrs.c:300
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:217
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:221
+#: composer/e-msg-composer-hdrs.c:305
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:222
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ange adresserna som ska få en kopia av meddelandet"
 
-#: composer/e-msg-composer-hdrs.c:227
+#: composer/e-msg-composer-hdrs.c:311
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:228
+#: composer/e-msg-composer-hdrs.c:312
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2348,54 +3192,70 @@ msgstr ""
 "Ange adressen till den som ska ta emot extrakopian av meddelandet utan att "
 "den visas i mottagandelistan av meddelandet."
 
-#: composer/e-msg-composer-hdrs.c:234
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:235
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Enter the subject of the mail"
 msgstr "Ange brevets ämne"
 
-#: composer/e-msg-composer.c:463
+#: composer/e-msg-composer.c:451
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: composer/e-msg-composer.c:474
+#: composer/e-msg-composer.c:462
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparning av filen: %s"
 
-#: composer/e-msg-composer.c:494
+#: composer/e-msg-composer.c:482
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid laddning av filen: %s"
 
-#: composer/e-msg-composer.c:513
+#: composer/e-msg-composer.c:504
 #, fuzzy
-msgid "Discard this message?"
-msgstr "Skicka detta meddelandet vidare"
+msgid "Saving changes to message..."
+msgstr "Skicka ett nytt meddelande"
 
-#: composer/e-msg-composer.c:561
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "About to save changes to message..."
+msgstr "Bifoga en fil till meddelandet"
+
+#: composer/e-msg-composer.c:590 shell/e-shell-view-menu.c:165
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:596
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: composer/e-msg-composer.c:618
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:730
 msgid "That file does not exist."
 msgstr "Den filen finns inte."
 
-#: composer/e-msg-composer.c:686
+#: composer/e-msg-composer.c:740
 msgid "That is not a regular file."
 msgstr "Den där är ingen vanlig fil."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:750
 msgid "That file exists but is not readable."
 msgstr "Den filen finns men är inte läsbar."
 
-#: composer/e-msg-composer.c:707
+#: composer/e-msg-composer.c:760
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:729
+#: composer/e-msg-composer.c:782
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2403,251 +3263,464 @@ msgstr ""
 "Filen är mycket stor (mer än 100K).\n"
 "Är du säker på att du vill infoga den?"
 
-#: composer/e-msg-composer.c:748
+#: composer/e-msg-composer.c:803
 msgid "An error occurred while reading the file."
 msgstr "Ett fel uppstod vid läsning av filen."
 
-#: composer/e-msg-composer.c:888
+#: composer/e-msg-composer.c:899 shell/e-shell-view-menu.c:434
+msgid "_File"
+msgstr "_Arkiv"
+
+#: composer/e-msg-composer.c:905
+msgid "_Open..."
+msgstr "_Öppna..."
+
+#: composer/e-msg-composer.c:906
+msgid "Load a previously saved message"
+msgstr ""
+
+#: composer/e-msg-composer.c:914
+msgid "_Save..."
+msgstr "_Spara som..."
+
+#: composer/e-msg-composer.c:915
+msgid "Save message"
+msgstr "Spara brev"
+
+#: composer/e-msg-composer.c:923
+msgid "_Save as..."
+msgstr "Spara som..."
+
+#: composer/e-msg-composer.c:924
+msgid "Save message with a different name"
+msgstr "Spara meddelandet med ett annat namn"
+
+#: composer/e-msg-composer.c:932
 msgid "Save in _folder..."
 msgstr "Spara i _mapp..."
 
-#: composer/e-msg-composer.c:888
+#: composer/e-msg-composer.c:933
 msgid "Save the message in a specified folder"
 msgstr "Spara meddelandet i en viss mapp"
 
-#: composer/e-msg-composer.c:891
-msgid "_Insert Text File"
-msgstr "_Infoga textfil"
+#: composer/e-msg-composer.c:942
+msgid "_Insert text file... (FIXME)"
+msgstr "_Infoga textfil... (FIXA)"
 
-#: composer/e-msg-composer.c:891
+#: composer/e-msg-composer.c:943
 msgid "Insert a file as text into the message"
 msgstr "Infoga en fil som text i meddelandet"
 
-#: composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
-msgid "Send"
-msgstr "Skicka"
+#: composer/e-msg-composer.c:952
+msgid "_Send"
+msgstr "_Skicka"
 
-#: composer/e-msg-composer.c:894
+#: composer/e-msg-composer.c:953
 msgid "Send the message"
 msgstr "Skicka meddelandet"
 
-#: composer/e-msg-composer.c:906
-msgid "View _attachments"
-msgstr "Visa _bilagor"
+#: composer/e-msg-composer.c:963
+msgid "_Close..."
+msgstr "Stäng..."
 
-#: composer/e-msg-composer.c:907
-msgid "View/hide attachments"
-msgstr "Visa/göm bilagor"
+#: composer/e-msg-composer.c:964
+msgid "Quit the message composer"
+msgstr ""
 
-#: composer/e-msg-composer.c:942
-msgid "Send this message"
-msgstr "Skicka detta meddelandet"
+#: composer/e-msg-composer.c:977 shell/e-shell-view-menu.c:478
+msgid "_Edit"
+msgstr "Redigera"
 
-#: composer/e-msg-composer.c:945
-msgid "Cut selected region into the clipboard"
-msgstr "Klipp ut markerat område till urklipp"
+#: composer/e-msg-composer.c:988
+msgid "_Format"
+msgstr "Format"
 
-#: composer/e-msg-composer.c:946
-msgid "Copy selected region into the clipboard"
-msgstr "Kopiera markerat område till urklipp"
+#: composer/e-msg-composer.c:994
+msgid "HTML"
+msgstr "HTML"
 
-#: composer/e-msg-composer.c:947
-msgid "Paste selected region into the clipboard"
-msgstr "Klistra in markerat område till urklipp"
+#: composer/e-msg-composer.c:995
+msgid "Send the mail in HTML format"
+msgstr "Skicka brevet i HMTL-format"
 
-#: composer/e-msg-composer.c:948
-msgid "Undo"
-msgstr "Ångra"
+#: composer/e-msg-composer.c:1008 mail/folder-browser-factory.c:185
+#: shell/e-shell-view-menu.c:383 shell/e-shell-view-menu.c:489
+#: shell/e-storage-set-view.c:242
+msgid "_View"
+msgstr "_Visa"
 
-#: composer/e-msg-composer.c:948
-msgid "Undo last operation"
-msgstr "Ångra senaste ändringen"
+#: composer/e-msg-composer.c:1014
+msgid "Show _attachments"
+msgstr "Visa _bilagor"
 
-#: composer/e-msg-composer.c:951
+#: composer/e-msg-composer.c:1015
+msgid "Show/hide attachments"
+msgstr "Visa/göm bilagor"
+
+#: composer/e-msg-composer.c:1048
+msgid "Send"
+msgstr "Skicka"
+
+#: composer/e-msg-composer.c:1049
+msgid "Send this message"
+msgstr "Skicka detta meddelandet"
+
+#: composer/e-msg-composer.c:1058
 msgid "Attach"
 msgstr "Bifoga"
 
-#: composer/e-msg-composer.c:951
+#: composer/e-msg-composer.c:1059
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer.c:1127
+#: composer/e-msg-composer.c:1246
 msgid "Compose a message"
 msgstr ""
 
-#: filter/filter-editor.c:198
-msgid "Edit Filter"
-msgstr "Redigera filter"
+#: filter/filter-datespec.c:61
+msgid "years"
+msgstr "år"
 
-#: filter/filter-editor.c:198
-msgid "Create filter"
-msgstr "Skapa filter"
+#: filter/filter-datespec.c:62
+msgid "months"
+msgstr "månader"
+
+#: filter/filter-datespec.c:63
+msgid "weeks"
+msgstr "veckor"
+
+#: filter/filter-datespec.c:64
+msgid "days"
+msgstr "dagar"
 
-#: filter/filter-editor.c:209
-msgid "Back"
-msgstr "Tillbaka"
+#: filter/filter-datespec.c:65
+msgid "hours"
+msgstr "timmar"
 
-#: filter/filter-editor.c:211
-msgid "Finish"
-msgstr "Klar"
+#: filter/filter-datespec.c:66
+msgid "minutes"
+msgstr "minuter"
 
-#: filter/filter-editor.c:212
-msgid "Cancel"
-msgstr "Avbryt"
+#: filter/filter-datespec.c:67
+msgid "seconds"
+msgstr " sekunder"
 
-#: filter/filter-editor.c:216
-msgid "Apply"
-msgstr "Verkställ"
+#: filter/filter-datespec.c:232
+msgid ""
+"The message's date will be compared against\n"
+"whatever the time is when the filter is run\n"
+"or vfolder is opened."
+msgstr ""
 
-#: filter/filter-editor.c:233
+#: filter/filter-datespec.c:254
 msgid ""
-"<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
-"continue forwards to customise it.</p>"
+"The message's date will be compared against\n"
+"the time that you specify here."
 msgstr ""
 
-#: mail/component-factory.c:196
+#: filter/filter-datespec.c:293
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when the filter is run;\n"
+"\"a week ago\", for example."
+msgstr ""
+
+#. keep in sync with FilterDatespec_type!
+#: filter/filter-datespec.c:328
+#, fuzzy
+msgid "the current time"
+msgstr "Gå till nutid"
+
+#: filter/filter-datespec.c:328
+msgid "a time you specify"
+msgstr ""
+
+#: filter/filter-datespec.c:329
+msgid "a time relative to the current time"
+msgstr ""
+
+#. The label
+#: filter/filter-datespec.c:387
+msgid "Compare against"
+msgstr ""
+
+#: filter/filter-datespec.c:661
+#, fuzzy
+msgid "<click here to select a date>"
+msgstr "* Klicka här för att lägga till en kontakt *"
+
+#: filter/filter-editor.c:156 filter/score-editor.c:126
+#: filter/vfolder-editor.c:152
+#, fuzzy
+msgid "Add Rule"
+msgstr "Lägg till källa"
+
+#: filter/filter-editor.c:188
+#, fuzzy
+msgid "Edit Rule"
+msgstr "Redigera filter"
+
+#: filter/filter-filter.c:397 filter/filter-rule.c:534
+msgid "Less"
+msgstr "Färre"
+
+#: filter/filter-filter.c:400 filter/filter-rule.c:537
+msgid "More"
+msgstr "Fler"
+
+#: filter/filter-folder.c:183 filter/vfolder-rule.c:269
+msgid "Select Folder"
+msgstr "Välj mapp"
+
+#: filter/filter-folder.c:205
+msgid "Enter folder URI"
+msgstr ""
+
+#: filter/filter-folder.c:247
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: filter/filter-part.c:420
+msgid "Test"
+msgstr "Test"
+
+#: filter/score-editor.c:160
+#, fuzzy
+msgid "Edit Score Rule"
+msgstr "Redigera källa"
+
+#: filter/vfolder-editor.c:186
+msgid "Edit VFolder Rule"
+msgstr "Redigera regel för VFilter"
+
+#: mail/component-factory.c:187
 msgid "Cannot initialize Evolution's mail component."
-msgstr "Kan inte initialisera Evolutions postkomponent."
+msgstr "Kan inte initiera Evolutions postkomponent."
 
-#: mail/folder-browser-factory.c:29
+#: mail/folder-browser-factory.c:33
 msgid "Get mail"
 msgstr "Hämta post"
 
-#: mail/folder-browser-factory.c:29
+#: mail/folder-browser-factory.c:33
 msgid "Check for new mail"
 msgstr "Kolla efter ny post"
 
-#: mail/folder-browser-factory.c:30
+#: mail/folder-browser-factory.c:34
 msgid "Compose"
-msgstr ""
+msgstr "Skriv brev"
 
-#: mail/folder-browser-factory.c:30
-#, fuzzy
+#: mail/folder-browser-factory.c:34
 msgid "Compose a new message"
 msgstr "Skriv ett nytt brev"
 
-#: mail/folder-browser-factory.c:34
+#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
+#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
+#: mail/folder-browser-factory.c:38 mail/mail-view.c:135
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/folder-browser-factory.c:34
+#: mail/folder-browser-factory.c:38 mail/mail-view.c:135
 msgid "Reply to the sender of this message"
 msgstr "Svara till sändaren av det här meddelandet"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:39 mail/mail-view.c:138
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:39 mail/mail-view.c:138
 msgid "Reply to all recipients of this message"
 msgstr "Svara till alla mottagare av det här meddelandet"
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser-factory.c:41 mail/mail-view.c:141
 msgid "Forward"
 msgstr "Skicka vidare"
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser-factory.c:41 mail/mail-view.c:141
 msgid "Forward this message"
 msgstr "Skicka detta meddelandet vidare"
 
-#: mail/folder-browser-factory.c:41
-#, fuzzy
-msgid "Refile"
-msgstr "Mottag"
+#: mail/folder-browser-factory.c:45
+msgid "Move"
+msgstr "Flytta"
 
-#: mail/folder-browser-factory.c:41
-#, fuzzy
+#: mail/folder-browser-factory.c:45
 msgid "Move message to a new folder"
-msgstr "Spara meddelandet i en viss mapp"
+msgstr "Flytta meddelandet till en mapp"
+
+#: mail/folder-browser-factory.c:46
+msgid "Copy message to a new folder"
+msgstr "Kopiera meddelandet till en mapp"
 
-#: mail/folder-browser-factory.c:43
+#: mail/folder-browser-factory.c:48 mail/mail-view.c:145
 msgid "Print the selected message"
 msgstr "Skriv ut markerat meddelande"
 
-#: mail/folder-browser-factory.c:45
+#: mail/folder-browser-factory.c:50 mail/mail-view.c:147
 msgid "Delete this message"
 msgstr "Ta bort detta meddelandet"
 
-#: mail/folder-browser-factory.c:65
-msgid "_Threaded Message List"
+#: mail/folder-browser-factory.c:71
+#, c-format
+msgid "Run filter \"%s\""
 msgstr ""
 
-#: mail/folder-browser-factory.c:77
+#: mail/folder-browser-factory.c:127
+msgid "_Threaded Message List"
+msgstr "_Trådad brevlista"
+
+#: mail/folder-browser-factory.c:137
+msgid "_Print Message"
+msgstr "_Skriv ut meddelande"
+
+#: mail/folder-browser-factory.c:146
+msgid "F_older"
+msgstr "_Mapp"
+
+#: mail/folder-browser-factory.c:152
+msgid "_Mark all as Read"
+msgstr "Markera alla som lästa"
+
+#: mail/folder-browser-factory.c:158
 msgid "_Expunge"
 msgstr "Rad_era"
 
-#: mail/folder-browser-factory.c:83
-msgid "_Filter Druid ..."
-msgstr "_Filter-guide ..."
+#: mail/folder-browser-factory.c:165
+msgid "_Configure Folder"
+msgstr "_Ny mapp"
 
-#: mail/folder-browser-factory.c:89
-msgid "_Virtual Folder Druid ..."
-msgstr ""
+#: mail/folder-browser-factory.c:172
+msgid "_Message"
+msgstr "_Meddelande"
+
+#: mail/folder-browser-factory.c:178
+msgid "E_dit"
+msgstr "Redigera"
+
+#: mail/folder-browser-factory.c:192
+msgid "Mail _Filters ..."
+msgstr "Brev_filter..."
 
-#: mail/folder-browser-factory.c:95
+#: mail/folder-browser-factory.c:199
+msgid "_vFolder Editor ..."
+msgstr "_VFilter-editor..."
+
+#: mail/folder-browser-factory.c:206
 msgid "_Mail Configuration ..."
-msgstr "_Post konfiguration ..."
+msgstr "_Postinställningar..."
 
-#: mail/folder-browser-factory.c:101
+#: mail/folder-browser-factory.c:213
 msgid "Forget _Passwords"
 msgstr "_Glöm lösenord"
 
-#: mail/mail-config.c:262
+#: mail/folder-browser.c:373
+msgid "Save"
+msgstr "Spara"
+
+#: mail/mail-callbacks.c:134
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Detta meddelandet har inget ämne.\n"
+"Vill du verkligen skicka?"
+
+#: mail/mail-callbacks.c:166
+msgid ""
+"You need to configure an identity\n"
+"before you can send mail."
+msgstr ""
+"Du måste ange uppgifter för"
+"för epostkonfiguration innan du kan skicka brev."
+
+#: mail/mail-callbacks.c:182
+msgid ""
+"You need to configure a mail transport\n"
+"before you can send mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:389
+msgid "Move message(s) to"
+msgstr "Flytta meddelanden till"
+
+#: mail/mail-callbacks.c:391
+msgid "Copy message(s) to"
+msgstr "Kopiera meddelanden till"
+
+#: mail/mail-callbacks.c:448
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Du kan bara redigera meddelanden\n"
+"som du sparat i mappen Drafts."
+
+#: mail/mail-callbacks.c:536
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr "Fel vid läsning av filterinformation:\n"
+"%s"
+
+#: mail/mail-config-gui.c:431
 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 "
 "read your signature from."
 msgstr ""
-"Ange ditt namn och epost-adress som ska användas i utgående post. Du kan "
-"också, om du vill, ange namnet på din organisation, och namnet på en fil att "
+"Ange ditt namn och din epostadress för utgående post. Du kan "
+"också, om du vill, ange namnet på din organisation och en fil att "
 "läsa din signatur från."
 
-#: mail/mail-config.c:277
+#: mail/mail-config-gui.c:444
 msgid "Full name:"
-msgstr "Hela namnet:"
+msgstr "Fullständigt namn:"
 
-#: mail/mail-config.c:305
+#: mail/mail-config-gui.c:468
 msgid "Email address:"
-msgstr "Epost-adress:"
+msgstr "Epostadress:"
 
-#: mail/mail-config.c:328
+#: mail/mail-config-gui.c:483
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.c:340
+#: mail/mail-config-gui.c:494
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.c:345
+#: mail/mail-config-gui.c:499 mail/mail-config.glade.h:10
 msgid "Signature File"
 msgstr "Signaturfil"
 
-#: mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
+#: mail/mail-config-gui.c:898
 msgid "Server:"
 msgstr "Server:"
 
-#: mail/mail-config.c:725
+#: mail/mail-config-gui.c:904
 msgid "Username:"
-msgstr "Filnamn:"
+msgstr "Användarnamn:"
 
-#: mail/mail-config.c:732
+#: mail/mail-config-gui.c:910
 msgid "Path:"
-msgstr "Sökväg"
+msgstr "Sökväg:"
 
-#: mail/mail-config.c:739 mail/mail-config.c:819
-#, fuzzy
+#: mail/mail-config-gui.c:918
 msgid "Authentication:"
-msgstr "Orientation"
+msgstr "Autentisering:"
 
-#: mail/mail-config.c:751 mail/mail-config.c:831
+#: mail/mail-config-gui.c:930
 msgid "Detect supported types..."
-msgstr ""
+msgstr "Detektera stödda metoder..."
+
+#: mail/mail-config-gui.c:955
+msgid "Don't delete messages from server"
+msgstr "Ta inte bort meddelenden från servern"
 
-#: mail/mail-config.c:777 mail/mail-config.c:853
-msgid "Test these values before continuing"
-msgstr "Testa dessa värden innan nästa steg"
+#: mail/mail-config-gui.c:967
+msgid "Test Settings"
+msgstr "Testa inställningarna"
 
-#: mail/mail-config.c:960
+#: mail/mail-config-gui.c:1099 mail/mail-config-gui.c:1147
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -2656,134 +3729,492 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config.c:978
-msgid "Select the method you would like to use to deliver your mail."
-msgstr "Välj den metod du vill använda för att leverera din post."
-
-#: mail/mail-config.c:1163 mail/mail-config.c:1242
-msgid "Mail Configuration"
-msgstr "Konfiguration för post"
-
-#. Identity page
-#: mail/mail-config.c:1180
-msgid "Identity"
-msgstr "Identitet"
-
-#. Source page
-#: mail/mail-config.c:1199
-msgid "Mail Source"
-msgstr "Post-källa"
+#: mail/mail-config-gui.c:1123
+msgid ""
+"Select the kind of news server you have, and enter the relevant information "
+"about it.\n"
+"\n"
+"If the server requires authentication, you can click the \"Detect supported "
+"types...\" button after entering the other information."
+msgstr ""
 
-#. Transport page
-#: mail/mail-config.c:1220
-msgid "Mail Transport"
+#: mail/mail-config-gui.c:1142
+#, fuzzy
+msgid "Mail transport type:"
 msgstr "Post-transportering"
 
-#: mail/mail-config.c:1343
+#: mail/mail-config-gui.c:1197
 msgid "Edit Identity"
 msgstr "Redigera identitet"
 
-#: mail/mail-config.c:1345
+#: mail/mail-config-gui.c:1199
 msgid "Add Identity"
 msgstr "Lägg till identitet"
 
-#: mail/mail-config.c:1488
+#: mail/mail-config-gui.c:1293
 msgid "Edit Source"
 msgstr "Redigera källa"
 
-#: mail/mail-config.c:1490
+#: mail/mail-config-gui.c:1295
 msgid "Add Source"
 msgstr "Lägg till källa"
 
-#. "\n\n"
-#. "If the server requires authentication, you can click the "
-#. "\"Detect supported types...\" button after entering "
-#. "the other information."
-#: mail/mail-config.c:1600
-msgid "Enter the hostname of the News Server you have."
-msgstr "Ange värdnamnet på den nyhetsserver du har."
-
-#: mail/mail-config.c:1656
+#: mail/mail-config-gui.c:1392
 msgid "Edit News Server"
 msgstr "Redigera nyhetsserver"
 
-#: mail/mail-config.c:1658
+#: mail/mail-config-gui.c:1394
 msgid "Add News Server"
 msgstr "Lägg till nyhetsserver"
 
-#: mail/mail-ops.c:374
-msgid "Fetching mail"
-msgstr "Hämtar post"
+#: mail/mail-config-gui.c:2244
+msgid "The connection was successful!"
+msgstr "Anslutningen lyckades"
+
+#.
+#. * 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 "Identitet"
+
+#: mail/mail-config.glade.h:9
+msgid "Organization"
+msgstr "Organisation"
+
+#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:23
+msgid "Edit"
+msgstr "Redigera"
+
+#: mail/mail-config.glade.h:15
+msgid "Sources"
+msgstr "Källor"
+
+#: mail/mail-config.glade.h:19
+msgid "Mail Sources"
+msgstr "Postkällor"
+
+#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
+msgid "Mail Transport"
+msgstr "Posttransport"
+
+#: mail/mail-config.glade.h:21
+msgid "News Servers"
+msgstr "Nyhetsservrar"
+
+#: mail/mail-config.glade.h:25
+msgid "News Sources"
+msgstr "Nyhetskällor"
+
+#: mail/mail-config.glade.h:26
+msgid "Send messages in HTML format"
+msgstr "Skicka meddelanden som HTML"
+
+#: mail/mail-config.glade.h:27
+msgid "Mark message as seen [ms]: "
+msgstr "Markera meddelanden som lästa [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 "Konfiguration för post"
 
-#: mail/mail-ops.c:386
+#: mail/mail-config-druid.glade.h:9
 msgid ""
-"This message has no subject.\n"
-"Really send?"
+"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 ""
-"Detta meddelandet har inget ämne.\n"
-"Vill du verkligen skicka?"
+"Välkommen till Evolutions hjälpmedel för inställningar\n"
+"för epost! Efter att ha fyllt i information om dina\n"
+"epostkonton, kan du börja skicka och ta emot epost direkt.\n"
+"Klicka \"Nästa\" för att fortsätta."
+
+#: mail/mail-config-druid.glade.h:13
+msgid "Identity"
+msgstr "Identitet"
+
+#: mail/mail-config-druid.glade.h:14
+msgid "Mail Source"
+msgstr "Postkälla"
+
+#: mail/mail-config-druid.glade.h:17
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"Dina inställningar för epost är nu klara.\n"
+"Klicka \"Slutför\" för att spara dina inställningar."
+
+#: mail/mail-crypto.c:338 mail/mail-crypto.c:418
+msgid "Please enter your PGP/GPG passphrase."
+msgstr "Ange din passfras för PGP/GPG."
+
+#: mail/mail-crypto.c:342 mail/mail-crypto.c:422
+msgid "No password provided."
+msgstr ""
+
+#: mail/mail-crypto.c:348 mail/mail-crypto.c:428
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Kunde inte skapa rör till GPG/PGP: %s"
+
+#: mail/mail-local.c:257
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:261
+#, c-format
+msgid "Change folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-ops.c:74
+#, c-format
+msgid "Fetching email from %s"
+msgstr "Hämtar post från %s"
+
+#: mail/mail-ops.c:76
+#, c-format
+msgid "Fetch email from %s"
+msgstr "Hämta post från %s"
+
+#: mail/mail-ops.c:87
+msgid "You have no remote mail source configured to fetch mail from."
+msgstr ""
+
+#: mail/mail-ops.c:97
+msgid "Bad folder passed to fetch_mail"
+msgstr ""
+
+#: mail/mail-ops.c:165
+msgid "There is no new mail."
+msgstr "Det finns ingen ny post."
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:234
+#, c-format
+msgid "Sending \"%s\""
+msgstr "Skickar \"%s\""
+
+#: mail/mail-ops.c:239
+msgid "Sending a message without a subject"
+msgstr "Skickar ett meddelande utan ämnesbeskrivning"
+
+#: mail/mail-ops.c:242
+#, c-format
+msgid "Send \"%s\""
+msgstr "Skicka \"%s\""
+
+#: mail/mail-ops.c:245
+msgid "Send a message without a subject"
+msgstr "Skicka ett meddelande utan ämnesbeskrivning"
+
+#: mail/mail-ops.c:410
+#, c-format
+msgid "Expunging \"%s\""
+msgstr "Tömmer \"%s\""
+
+#: mail/mail-ops.c:412
+#, c-format
+msgid "Expunge \"%s\""
+msgstr "Töm \"%s\""
+
+#: mail/mail-ops.c:484
+#, c-format
+msgid "Moving messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:486
+#, c-format
+msgid "Copying messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:489
+#, c-format
+msgid "Move messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:491
+#, c-format
+msgid "Copy messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:637
+#, fuzzy, c-format
+msgid "Marking messages in folder \"%s\""
+msgstr "Spara meddelandet i en viss mapp"
+
+#: mail/mail-ops.c:640
+#, fuzzy, c-format
+msgid "Mark messages in folder \"%s\""
+msgstr "Spara meddelandet i en viss mapp"
+
+#: mail/mail-ops.c:769
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:772
+#, c-format
+msgid "Scan folders in \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:859
+msgid "(No description)"
+msgstr "(Ingen beskrivning)"
+
+#: mail/mail-ops.c:922
+#, c-format
+msgid "Attaching messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:925
+#, c-format
+msgid "Attach messages from \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1051
+#, fuzzy, c-format
+msgid "Forwarding messages \"%s\""
+msgstr "Skicka detta meddelandet vidare"
+
+#: mail/mail-ops.c:1056
+msgid "Forwarding a message without a subject"
+msgstr ""
+
+#: mail/mail-ops.c:1059
+#, c-format
+msgid "Forward message \"%s\""
+msgstr "Skicka vidare meddelande \"%s\""
+
+#: mail/mail-ops.c:1064
+msgid "Forward a message without a subject"
+msgstr ""
+
+#: mail/mail-ops.c:1129
+msgid ""
+"Failed to generate mime part from message while generating forwarded message."
+msgstr ""
+
+#: mail/mail-ops.c:1218
+#, fuzzy, c-format
+msgid "Loading \"%s\""
+msgstr "Rubriker"
+
+#: mail/mail-ops.c:1220
+#, c-format
+msgid "Load \"%s\""
+msgstr "Ladda \"%s\""
+
+#: mail/mail-ops.c:1339
+#, c-format
+msgid "Creating \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1341
+#, c-format
+msgid "Create \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1412
+msgid "Exception while reporting result to shell component listener."
+msgstr ""
+
+#: mail/mail-ops.c:1465
+#, c-format
+msgid "Synchronizing \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1467
+#, c-format
+msgid "Synchronize \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1543
+#, c-format
+msgid "Displaying message UID \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1546
+msgid "Clearing message display"
+msgstr ""
+
+#: mail/mail-ops.c:1549
+#, c-format
+msgid "Display message UID \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1552
 #, fuzzy
-msgid "Refile message(s) to"
+msgid "Clear message display"
+msgstr "Färger för visning"
+
+#: mail/mail-ops.c:1679
+#, c-format
+msgid "Opening messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1682
+#, fuzzy, c-format
+msgid "Open messages from \"%s\""
+msgstr "Skickade brev"
+
+#: mail/mail-ops.c:1794
+msgid "Loading Draftbox"
+msgstr ""
+
+#: mail/mail-ops.c:1796
+msgid "Load Draftbox"
+msgstr ""
+
+#: mail/mail-ops.c:1864
+#, c-format
+msgid "Viewing messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1867
+#, fuzzy, c-format
+msgid "View messages from \"%s\""
 msgstr "Nya brev"
 
-#: mail/mail-threads.c:483
-msgid "Currently pending operations:"
+#: mail/mail-threads.c:274
+#, c-format
+msgid ""
+"Error while preparing to %s:\n"
+"%s"
 msgstr ""
 
-#: mail/mail-threads.c:621
+#: mail/mail-threads.c:627
+#, c-format
+msgid ""
+"Error while `%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-threads.c:680
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:623
+#: mail/mail-threads.c:684
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:712
+#: mail/mail-threads.c:749
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:814
+#: mail/mail-threads.c:861
 msgid "Could not create dialog box."
 msgstr "Kunde inte skapa dialog."
 
-#: mail/mail-threads.c:849
+#: mail/mail-threads.c:872
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/main.c:62
-msgid "Mail Component: I could not initialize Bonobo"
-msgstr "Postkomponent: Jag kunde inte initialisera Bonobo"
+#: mail/mail-tools.c:206
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr ""
+
+#: mail/mail-tools.c:291
+#, c-format
+msgid ""
+"Could not read UID cache file \"%s\". You may receive duplicate messages."
+msgstr ""
+
+#: mail/mail-tools.c:374
+#, c-format
+msgid "[%s] %s"
+msgstr "[%s] %s"
+
+#: mail/mail-tools.c:376
+#, fuzzy, c-format
+msgid "[%s] (forwarded message)"
+msgstr "Skicka detta meddelandet vidare"
+
+#: mail/mail-tools.c:385
+msgid "Fwd: (no subject)"
+msgstr ""
+
+#: mail/mail-tools.c:422
+#, fuzzy, c-format
+msgid "Forwarded message - %s"
+msgstr "Skicka detta meddelandet vidare"
+
+#: mail/mail-tools.c:424
+#, fuzzy
+msgid "Forwarded message (no subject)"
+msgstr "Skicka detta meddelandet vidare"
+
+#: mail/mail-tools.c:625
+#, c-format
+msgid "Don't know protocol to open URI `%s'"
+msgstr ""
+
+#: mail/mail-tools.c:654
+#, c-format
+msgid ""
+"Cannot open location `%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-vfolder.c:298
+#, fuzzy
+msgid "New VFolder"
+msgstr "_Ny mapp"
 
-#: mail/message-list.c:460
+#: mail/message-list.c:490
 msgid "Online Status"
 msgstr "Anslutningsstatus"
 
-#: mail/message-list.c:488
+#: mail/message-list.c:526
 msgid "From"
 msgstr "Från"
 
-#: mail/message-list.c:495
+#: mail/message-list.c:533
 msgid "Subject"
 msgstr "Ämne"
 
-#: mail/message-list.c:502
+#: mail/message-list.c:540
 msgid "Date"
 msgstr "Datum"
 
-#: mail/message-list.c:509
+#: mail/message-list.c:547
 msgid "Received"
 msgstr "Mottog"
 
-#: mail/message-list.c:516
+#: mail/message-list.c:554
 msgid "To"
 msgstr "Till"
 
-#: mail/message-list.c:523
+#: mail/message-list.c:561
 msgid "Size"
 msgstr "Storlek"
 
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Skapa en ny mapp"
+
+#: notes/component-factory.c:148
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Kan inte initialisera Evolutions postkomponent."
+
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Postkomponent: Jag kunde inte initialisera Bonobo"
+
 #: shell/e-setup.c:47
 msgid "Evolution installation"
 msgstr "Installation för Evolution"
@@ -2821,14 +4252,22 @@ msgstr ""
 msgid "Evolution files successfully installed."
 msgstr "Evolutions installation lyckades."
 
-#: shell/e-setup.c:108
+#: shell/e-setup.c:109
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
-"Please remove it in order to allow installation\n"
+"Please move it in order to allow installation\n"
 "of the Evolution user files."
 msgstr ""
 
+#: shell/e-setup.c:121
+#, c-format
+msgid ""
+"The directory `%s' exists but is not the\n"
+"Evolution directory.  Please move it in order\n"
+"to allow installation of the Evolution user files."
+msgstr ""
+
 #: shell/e-shell-folder-creation-dialog.c:81
 #, fuzzy, c-format
 msgid ""
@@ -2844,41 +4283,37 @@ msgstr "Det angivna mappnamnet är inte giltigt."
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Skapa ny mapp"
 
-#: shell/e-shell-folder-selection-dialog.c:95
+#: shell/e-shell-folder-selection-dialog.c:96
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:236
+#: shell/e-shell-folder-selection-dialog.c:272
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:355
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
 #. you might have to call gnome_dialog_run() on the
 #. * dialog returned here, I don't remember...
 #.
-#: shell/e-shell-view-menu.c:110
+#: shell/e-shell-view-menu.c:113
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy hittades inte i din $PATH."
 
 #. same as above
-#: shell/e-shell-view-menu.c:116
+#: shell/e-shell-view-menu.c:119
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
-#: shell/e-shell-view-menu.c:159
-msgid "Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view-menu.c:161
+#: shell/e-shell-view-menu.c:167
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:163
+#: shell/e-shell-view-menu.c:169
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -2888,141 +4323,149 @@ msgstr ""
 "för epost, kalender, och kontakt-hantering\n"
 "inom GNOME's skrivbordsmiljö."
 
-#: shell/e-shell-view-menu.c:301
+#: shell/e-shell-view-menu.c:319
 msgid "Go to folder..."
 msgstr "Gå till mapp..."
 
-#: shell/e-shell-view-menu.c:365
+#: shell/e-shell-view-menu.c:377
+msgid "_New"
+msgstr "_Ny"
+
+#: shell/e-shell-view-menu.c:389
 msgid "_Folder"
 msgstr "_Mapp"
 
-#: shell/e-shell-view-menu.c:369
-msgid "Evolution _Bar Shortcut"
+#: shell/e-shell-view-menu.c:395
+#, fuzzy
+msgid "Evolution bar _shortcut"
 msgstr "Evolution genvägsrad"
 
-#: shell/e-shell-view-menu.c:375
+#: shell/e-shell-view-menu.c:404
 #, fuzzy
 msgid "_Mail message (FIXME)"
 msgstr "_Posta meddelande"
 
-#: shell/e-shell-view-menu.c:376 shell/e-shell-view-menu.c:379
-msgid "Composes a new mail message"
-msgstr "Skriv ett nytt brev"
-
-#: shell/e-shell-view-menu.c:378
+#: shell/e-shell-view-menu.c:410
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "_Möte"
 
-#: shell/e-shell-view-menu.c:381
+#: shell/e-shell-view-menu.c:416
 #, fuzzy
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
-#: shell/e-shell-view-menu.c:384
+#: shell/e-shell-view-menu.c:422
 msgid "_Task (FIXME)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:387
-#, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "Uppgiftsbegä_ran"
-
-#: shell/e-shell-view-menu.c:390
+#: shell/e-shell-view-menu.c:444
 #, fuzzy
-msgid "_Journal Entry (FIXME)"
-msgstr "_Dagbokpost"
-
-#: shell/e-shell-view-menu.c:398
-msgid "_New"
-msgstr "_Ny"
-
-#: shell/e-shell-view-menu.c:402
-msgid "_Go to folder..."
+msgid "_Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: shell/e-shell-view-menu.c:402
+#: shell/e-shell-view-menu.c:445
 msgid "Display a different folder"
 msgstr "Visa en annan mapp"
 
-#: shell/e-shell-view-menu.c:404
-msgid "_Create new folder..."
+#: shell/e-shell-view-menu.c:452
+#, fuzzy
+msgid "_Create New Folder..."
 msgstr "_Skapa ny mapp..."
 
-#: shell/e-shell-view-menu.c:404
+#: shell/e-shell-view-menu.c:453 shell/e-shell-view-menu.c:465
 msgid "Create a new folder"
 msgstr "Skapa en ny mapp"
 
-#: shell/e-shell-view-menu.c:419
+#: shell/e-shell-view-menu.c:464
+#, fuzzy
+msgid "E_xit..."
+msgstr "Redigera..."
+
+#: shell/e-shell-view-menu.c:495
 #, fuzzy
-msgid "Show _shortcut bar"
+msgid "Show _Shortcut Bar"
 msgstr "_Växla genvägsrad"
 
-#: shell/e-shell-view-menu.c:420
+#: shell/e-shell-view-menu.c:496
 #, fuzzy
 msgid "Show the shortcut bar"
 msgstr "Växlar genvägsraden"
 
-#: shell/e-shell-view-menu.c:422
+#: shell/e-shell-view-menu.c:501
 #, fuzzy
-msgid "Show _folder bar"
+msgid "Show _Folder Bar"
 msgstr "_Växla genvägsrad"
 
-#: shell/e-shell-view-menu.c:423
+#: shell/e-shell-view-menu.c:502
 #, fuzzy
 msgid "Show the folder bar"
 msgstr "Växlar genvägsraden"
 
-#: shell/e-shell-view-menu.c:440
+#: shell/e-shell-view-menu.c:513
+#, fuzzy
+msgid "_Settings"
+msgstr "Sektioner:"
+
+#: shell/e-shell-view-menu.c:524
+#, fuzzy
+msgid "_Help"
+msgstr "_Hem"
+
+#: shell/e-shell-view-menu.c:530
 msgid "Help _Index"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:537
 msgid "Getting _Started"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:446
+#: shell/e-shell-view-menu.c:544
 msgid "Using the _Mailer"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:449
+#: shell/e-shell-view-menu.c:551
 msgid "Using the _Calendar"
 msgstr "Att använda kalendern"
 
-#: shell/e-shell-view-menu.c:452
-msgid "Using the Cont_act Manager"
+#: shell/e-shell-view-menu.c:558
+#, fuzzy
+msgid "Using the C_ontact Manager"
 msgstr "Att använda kontakthanteraren"
 
-#: shell/e-shell-view-menu.c:457
-msgid "_Submit bug report"
+#: shell/e-shell-view-menu.c:568
+#, fuzzy
+msgid "_Submit Bug Report"
 msgstr "_Skicka felrapport"
 
-#: shell/e-shell-view-menu.c:458
-msgid "Submit bug-report via bug-buddy"
+#: shell/e-shell-view-menu.c:569
+#, fuzzy
+msgid "Submit bug report using Bug Buddy"
 msgstr "Skicka felrapport via bug-buddy"
 
-#: shell/e-shell-view-menu.c:474
-msgid "_Actions"
-msgstr "_Händelser"
+#: shell/e-shell-view-menu.c:578
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Evolution"
+
+#: shell/e-shell-view-menu.c:579
+msgid "Show information about Evolution"
+msgstr ""
 
-#: shell/e-shell-view.c:113
+#: shell/e-shell-view.c:122
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: shell/e-shell-view.c:208
+#: shell/e-shell-view.c:350
 msgid "Folders"
 msgstr "Mappar"
 
-#: shell/e-shell-view.c:596
-msgid "None"
-msgstr "Inga"
-
-#: shell/e-shell-view.c:600
+#: shell/e-shell-view.c:881
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:299
+#: shell/e-shell.c:293
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan inte lägga upp lokal sparningsplats -- %s"
@@ -3111,7 +4554,12 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: shell/main.c:99
+#: shell/e-storage-set-view.c:242
+#, fuzzy
+msgid "View the selected folder"
+msgstr "Skriv ut markerat meddelande"
+
+#: shell/main.c:66
 #, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -3159,7 +4607,7 @@ msgstr ""
 "Vi hoppas att du trivs med resultatet av vårt hårda arbete, och vi väntar\n"
 "irvrigt på dina bidrag!\n"
 
-#: shell/main.c:126
+#: shell/main.c:93
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -3167,18 +4615,36 @@ msgstr ""
 "Tack\n"
 "Evolution-teamet\n"
 
-#: shell/main.c:172
+#: shell/main.c:121
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan inte initialisera Evolution-skalet"
 
-#: shell/main.c:214
-msgid "Cannot initialize the configuration system."
-msgstr "Kan inte initialisera konfigurationssystemet."
-
-#: shell/main.c:220
+#: shell/main.c:156
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet"
 
+#: tests/ui-tests/message-browser.c:360
+#, fuzzy
+msgid "The component now claims that it doesn't support PersistStream!"
+msgstr "Komponenten %s stöder inte PersistStream!\n"
+
+#: tests/ui-tests/message-browser.c:378
+msgid ""
+"An exception occured while trying to load data into the component with "
+"PersistStream"
+msgstr ""
+"Ett undantag uppstod vid laddning av data till 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öder inte PersistStream!\n"
+
+#: tests/ui-tests/message-browser.c:710
+#, fuzzy
+msgid "Open Mime Message"
+msgstr "Skicka meddelandet"
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -3206,6 +4672,7 @@ msgstr "Filter"
 #. * 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
 #, fuzzy
 msgid "Field Chooser"
 msgstr "Poster"
@@ -3249,6 +4716,50 @@ msgstr "Lägg till >>"
 msgid "<< Remove"
 msgstr "<< Ta bort"
 
+#: widgets/e-table/e-table-header-item.c:1156
+msgid "Sort Ascending"
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1157
+msgid "Sort Descending"
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1158
+#, fuzzy
+msgid "Unsort"
+msgstr "_Infoga"
+
+#: widgets/e-table/e-table-header-item.c:1160
+msgid "Group By This Field"
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1161
+#, fuzzy
+msgid "Group By Box"
+msgstr "Grupp %i"
+
+#: widgets/e-table/e-table-header-item.c:1163
+#, fuzzy
+msgid "Remove This Column"
+msgstr "Ta bort grupp"
+
+#: widgets/e-table/e-table-header-item.c:1166
+#, fuzzy
+msgid "Alignment"
+msgstr "Ärenden:"
+
+#: widgets/e-table/e-table-header-item.c:1167
+msgid "Best Fit"
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1168
+msgid "Format Columns..."
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1170
+msgid "Customize Current View..."
+msgstr ""
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 #, fuzzy
 msgid "Tentative"
@@ -3329,6 +4840,12 @@ msgstr "Begäran om möte"
 msgid "All Attendees"
 msgstr ""
 
+#. 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:281
+msgid "MTWTFSS"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:106
 msgid "..."
 msgstr "..."
@@ -3338,49 +4855,72 @@ msgstr "..."
 msgid "Group %i"
 msgstr "Grupp %i"
 
-#, fuzzy
-#~ msgid "No description"
-#~ msgstr "Beskrivning:"
+#~ msgid "New appointment for _today..."
+#~ msgstr "Ny_tt ärende för idag..."
 
-#, fuzzy
-#~ msgid "_Mail"
-#~ msgstr "_Mobil"
+#~ msgid "Create a new appointment for today"
+#~ msgstr "Skapa ett nytt ärende för idag"
 
 #, fuzzy
-#~ msgid "Pri_vate"
-#~ msgstr "Klistra in"
+#~ msgid "Discard this message?"
+#~ msgstr "Skicka detta meddelandet vidare"
 
-#, fuzzy
-#~ msgid "Daily"
-#~ msgstr "Detaljer"
+#~ msgid "Cut selected region into the clipboard"
+#~ msgstr "Klipp ut markerat område till urklipp"
 
-#, fuzzy
-#~ msgid "label23"
-#~ msgstr "label2"
+#~ msgid "Copy selected region into the clipboard"
+#~ msgstr "Kopiera markerat område till urklipp"
 
-#, fuzzy
-#~ msgid "label24"
-#~ msgstr "label2"
+#~ msgid "Paste selected region into the clipboard"
+#~ msgstr "Klistra in markerat område till urklipp"
 
-#, fuzzy
-#~ msgid "label25"
-#~ msgstr "label2"
+#~ msgid "Undo"
+#~ msgstr "Ångra"
 
-#, fuzzy
-#~ msgid "month(s)"
-#~ msgstr "Typsnitt"
+#~ msgid "Undo last operation"
+#~ msgstr "Ångra senaste ändringen"
+
+#~ msgid "Back"
+#~ msgstr "Tillbaka"
+
+#~ msgid "Finish"
+#~ msgstr "Klar"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "Apply"
+#~ msgstr "Verkställ"
 
 #, fuzzy
-#~ msgid "label27"
-#~ msgstr "label7"
+#~ msgid "Refile"
+#~ msgstr "Mottag"
+
+#~ msgid "Test these values before continuing"
+#~ msgstr "Testa dessa värden innan nästa steg"
+
+#~ msgid "Select the method you would like to use to deliver your mail."
+#~ msgstr "Välj den metod du vill använda för att leverera din post."
+
+#~ msgid "Enter the hostname of the News Server you have."
+#~ msgstr "Ange värdnamnet på den nyhetsserver du har."
+
+#~ msgid "Composes a new mail message"
+#~ msgstr "Skriv ett nytt brev"
 
 #, fuzzy
-#~ msgid "Exceptions"
-#~ msgstr "Alternativ"
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Uppgiftsbegä_ran"
 
 #, fuzzy
-#~ msgid "Change"
-#~ msgstr "Skuggning"
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Dagbokpost"
+
+#~ msgid "_Actions"
+#~ msgstr "_Händelser"
+
+#~ msgid "Cannot initialize the configuration system."
+#~ msgstr "Kan inte initialisera konfigurationssystemet."
 
 #~ msgid "Evolution can not create its local folders"
 #~ msgstr "Evolution kan inte skapa sina lokala mappar"
@@ -3391,30 +4931,12 @@ msgstr "Grupp %i"
 #~ msgid "Browse..."
 #~ msgstr "Bläddra..."
 
-#~ msgid "Send a new message"
-#~ msgstr "Skicka ett nytt meddelande"
-
-#~ msgid "Find messages"
-#~ msgstr "Hitta meddelanden"
-
 #~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
 #~ msgstr "Tyvärr, Evolutions mappbläddrare kan inte initialiseras."
 
 #~ msgid "Whether a message preview should be shown"
 #~ msgstr "Huruvida meddelanden ska förhandsgranskas"
 
-#~ msgid "_Task"
-#~ msgstr "Uppgif_t"
-
-#~ msgid "_Selected Items"
-#~ msgstr "_Markerade objekt"
-
-#~ msgid "_New Folder"
-#~ msgstr "_Ny mapp"
-
-#~ msgid "_Open"
-#~ msgstr "_Öppna"
-
 #~ msgid "Clos_e All Items"
 #~ msgstr "Stäng _alla objekt"
 
@@ -3470,9 +4992,6 @@ msgstr "Grupp %i"
 #~ msgid "A service containing tasks"
 #~ msgstr "En tjänst som innehåller uppgifter"
 
-#~ msgid "Remove Group"
-#~ msgstr "Ta bort grupp"
-
 #~ msgid "Rename Group"
 #~ msgstr "Byt namn på grupp"
 
@@ -3491,9 +5010,6 @@ msgstr "Grupp %i"
 #~ msgid "Inbox"
 #~ msgstr "Inbox"
 
-#~ msgid "Sent messages"
-#~ msgstr "Skickade brev"
-
 #~ msgid "Sent mail messages"
 #~ msgstr "Skickade brev"
 
@@ -3520,15 +5036,6 @@ msgstr "Grupp %i"
 #~ "och fixa problemet, och starta om Evolution"
 
 #~ msgid ""
-#~ "An exception occured while trying to load data into the component with "
-#~ "PersistStream"
-#~ msgstr ""
-#~ "Ett undantag uppstod vid laddning av data till komponenten med PersistStream"
-
-#~ msgid "The %s component doesn't support PersistStream!\n"
-#~ msgstr "Komponenten %s stöder inte PersistStream!\n"
-
-#~ msgid ""
 #~ "Evolution detected that the file `%s' is a not a directory.\n"
 #~ "\n"
 #~ "Evolution can rename the file, delete the file or shutdown and\n"
@@ -3538,6 +5045,3 @@ msgstr "Grupp %i"
 #~ "\n"
 #~ "Evolution kan byta namn på filen, ta bort den eller stänga av och\n"
 #~ "låt dig fixa problemet."
-
-#~ msgid "Message status"
-#~ msgstr "Meddelandestatus"