Pass make dist

svn path=/trunk/; revision=22904
author: Rodrigo Moya <rodrigo@src.gnome.org> 2003-10-16 06:23:14 +0800
committer: Rodrigo Moya <rodrigo@src.gnome.org> 2003-10-16 06:23:14 +0800
commit: 8b7b352e60bba599989fd94c1c44c0e7f237ba44 (patch)
tree: 52ee2d928eee785d55514f9f7bbaaec18c714b93 /po
parent: 31691e6c2afa78eb71422bda60807122e88b3871 (diff)
download: gsoc2013-evolution-8b7b352e60bba599989fd94c1c44c0e7f237ba44.tar.gz
gsoc2013-evolution-8b7b352e60bba599989fd94c1c44c0e7f237ba44.tar.zst
gsoc2013-evolution-8b7b352e60bba599989fd94c1c44c0e7f237ba44.zip
30 files changed, 85892 insertions, 83286 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0df0336bbe..9a4b6048ef 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -92,7 +92,6 @@ calendar/gui/dialogs/event-editor.c
 calendar/gui/dialogs/event-page.c
 calendar/gui/dialogs/event-page.glade
 calendar/gui/dialogs/meeting-page.c
-calendar/gui/dialogs/meeting-page.etspec
 calendar/gui/dialogs/meeting-page.glade
 calendar/gui/dialogs/recur-comp.c
 calendar/gui/dialogs/recurrence-page.c
@@ -119,7 +118,6 @@ calendar/gui/e-day-view-time-item.c
 calendar/gui/e-day-view-top-item.c
 calendar/gui/e-itip-control.c
 calendar/gui/e-itip-control.glade
-calendar/gui/e-meeting-model.c
 calendar/gui/e-meeting-time-sel.c
 calendar/gui/e-meeting-time-sel.etspec
 calendar/gui/e-meeting-time-sel-item.c
@@ -262,10 +260,7 @@ importers/evolution-gnomecard-importer.c
 importers/netscape-importer.c
 importers/pine-importer.c
 mail/component-factory.c
-mail/folder-browser.c
 mail/folder-browser-factory.c
-mail/folder-browser.h
-mail/folder-browser-ui.c
 mail/folder-info.c
 mail/GNOME_Evolution_Mail.server.in.in
 mail/importers/elm-importer.c
@@ -280,35 +275,27 @@ mail/local-config.glade
 mail/mail-account-editor.c
 mail/mail-account-gui.c
 mail/mail-accounts.c
-mail/mail-accounts.etspec
 mail/mail-autofilter.c
-mail/mail-callbacks.c
 mail/mail-composer-prefs.c
 mail/mail-config.c
 mail/mail-config-druid.c
 mail/mail-config.glade
 mail/mail-crypto.c
-mail/mail-display.c
 mail/mail-folder-cache.c
-mail/mail-format.c
 mail/mail-local.c
 mail/mail-mt.c
 mail/mail-ops.c
 mail/mail-preferences.c
-mail/mail-search.c
 mail/mail-send-recv.c
 mail/mail-session.c
 mail/mail-signature-editor.c
 mail/mail-tools.c
 mail/mail-vfolder.c
-mail/message-browser.c
 mail/message-list.c
 mail/message-list.etspec
 mail/message-tag-editor.c
 mail/message-tag-followup.c
 mail/message-tags.glade
-mail/subscribe-dialog.c
-mail/subscribe-dialog.etspec
 mail/subscribe-dialog.glade
 my-evolution/component-factory.c
 my-evolution/e-summary.c
diff --git a/po/am.po b/po/am.po
index 7e15959f94..1d1bae1758 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-15 23:12+0200\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2003-02-07 17:46+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/backend/ebook/e-card-simple.c:60
@@ -88,7 +88,6 @@ msgid "Title"
 msgstr "አርእስት"
 
 #: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr ""
@@ -124,7 +123,7 @@ msgstr ""
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:998
+#: addressbook/backend/ebook/e-card.c:1436
 msgid "Mailer"
 msgstr ""
 
@@ -170,7 +169,7 @@ msgstr ""
 msgid "Wants HTML set"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1506
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
 msgid "List"
 msgstr "ዝርዝር"
 
@@ -952,7 +951,7 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:34
 #: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:611
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr ""
 
@@ -1135,7 +1134,7 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:33 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -1362,10 +1361,10 @@ msgstr "ምድብ... (_T)"
 #: calendar/gui/dialogs/meeting-page.c:634
 #: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
 #: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: mail/folder-browser.c:1829 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:32 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:45
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "አጥፉ"
 
@@ -2887,7 +2886,6 @@ msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
@@ -3533,7 +3531,7 @@ msgstr "ከፍ ያለ"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:806
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
 #: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "የተለመደ"
@@ -3668,58 +3666,58 @@ msgstr ""
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:366
+#: calendar/gui/calendar-commands.c:376
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:372
+#: calendar/gui/calendar-commands.c:382
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:377
+#: calendar/gui/calendar-commands.c:387
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "ቀን"
 
-#: calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:478 calendar/gui/e-day-view.c:1364
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
 #: calendar/gui/e-day-view-top-item.c:266
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:485
-#: calendar/gui/calendar-commands.c:487
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:498 calendar/gui/calendar-commands.c:505
-#: calendar/gui/calendar-commands.c:511 calendar/gui/calendar-commands.c:513
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:503
+#: calendar/gui/calendar-commands.c:518
 #: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:901
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1527
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3824,6 +3822,11 @@ msgstr "የሳመንት ዕይታ"
 msgid "Month View"
 msgstr "የወር ዕይታ"
 
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "የተለመደው ዕይታ"
+
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
@@ -3836,7 +3839,7 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1122
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
 msgid "Unmatched"
 msgstr ""
 
@@ -3852,16 +3855,16 @@ msgstr ""
 msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:122
+#: calendar/gui/control-factory.c:125
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
 
-#: calendar/gui/control-factory.c:168
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/control-factory.c:175
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr ""
 
@@ -4142,7 +4145,7 @@ msgid "Wednesday"
 msgstr "ረቡዕ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr ""
 
@@ -4588,10 +4591,9 @@ msgstr ""
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2082
-#: mail/folder-browser.c:1791 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
@@ -4614,54 +4616,6 @@ msgstr ""
 msgid "_Delegate To..."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "ቋንቋ"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "ሁኔታ"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4821,7 +4775,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1588
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr ""
 
@@ -4857,8 +4811,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-tasks.c:250
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
 #: calendar/gui/print.c:2311
 msgid "Completed"
 msgstr ""
@@ -5027,15 +4980,16 @@ msgstr "%s በ %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:281
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
 msgid "Confidential"
 msgstr "ሚስጢራዊ"
 
@@ -5099,8 +5053,7 @@ msgstr ""
 
 #: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
 #: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
-#: mail/folder-browser.c:1802 shell/e-shortcuts-view.c:422
-#: ui/evolution-addressbook.xml.h:36
+#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "ክፈት"
 
@@ -5110,14 +5063,14 @@ msgstr ""
 
 #: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
 #: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: mail/folder-browser.c:1804 ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Save As..."
 msgstr "በሌላ ስም አስቀምጥ"
 
 #: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
 #: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
 #: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
@@ -5132,7 +5085,7 @@ msgstr "ቁረጥ"
 
 #: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
 #: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:31
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
 #: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
@@ -5141,7 +5094,7 @@ msgstr "ቅጂ"
 #: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
 #: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
 #: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "ለጥፍ"
@@ -5214,6 +5167,12 @@ msgstr "ቅድሚያ"
 msgid "Start Date"
 msgstr ""
 
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "ሁኔታ"
+
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
@@ -5232,22 +5191,29 @@ msgstr "ቀለም"
 msgid "component"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:808
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "ያልታወቀ"
+
+#: calendar/gui/e-cal-model.c:828
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:810
+#: calendar/gui/e-cal-model.c:830
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-model.c:812 calendar/gui/e-cal-model-tasks.c:933
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
 msgid "Yes"
 msgstr "አዎ"
 
-#: calendar/gui/e-cal-model.c:812 calendar/gui/e-cal-model-tasks.c:933
-#: calendar/gui/e-meeting-model.c:278 calendar/gui/e-meeting-model.c:788
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
 msgid "No"
 msgstr "አይ"
 
@@ -5299,7 +5265,7 @@ msgstr ""
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:36
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
@@ -5501,9 +5467,7 @@ msgstr "ቦታ፦"
 msgid "Status:"
 msgstr "ሁኔታ፦"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:801
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr ""
 
@@ -5511,23 +5475,11 @@ msgstr ""
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:802
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:759
-#: calendar/gui/e-meeting-model.c:775 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:347
-#: mail/mail-display.c:1044 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "ያልታወቀ"
-
 #: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
 #: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
 #: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
@@ -5557,6 +5509,11 @@ msgstr ""
 msgid "Decline"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
 #: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr ""
@@ -5861,81 +5818,10 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1639
-msgid "Required Participants"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:82
-msgid "Resources"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:755
-msgid "Individual"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:756
-msgid "Group"
-msgstr "የውይይት መድረክ"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:757
-msgid "Resource"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:758
-msgid "Room"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:771
-msgid "Chair"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:772
-msgid "Required Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
-msgid "Optional Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:800
-msgid "Needs Action"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:803 calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:804
-msgid "Delegated"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
-msgstr ""
-
 #: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
@@ -6011,6 +5897,34 @@ msgstr "%A, %B %d, %Y"
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "ቋንቋ"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr ""
+
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
@@ -6059,12 +5973,12 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1684
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1898
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6083,22 +5997,22 @@ msgstr ""
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1656
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1670
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1726
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid "Adding alarms for %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6106,7 +6020,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1924
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6114,21 +6028,21 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2130
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2151
+#: calendar/gui/gnome-cal.c:2197
 msgid "Opening default tasks folder"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:3035
+#: calendar/gui/gnome-cal.c:3094
 #, c-format
 msgid "Purging event %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:3119
+#: calendar/gui/gnome-cal.c:3178
 #, fuzzy
 msgid "Purging"
 msgstr "አትም"
@@ -6374,8 +6288,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2954
-#: my-evolution/e-summary.c:649
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "የቅድመ ህትመት ዕይታ"
 
@@ -10291,7 +10204,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr ""
 
@@ -10303,61 +10216,61 @@ msgstr ""
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:950
 msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1040
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1061
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1122
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1147
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1167
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1191
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10365,35 +10278,35 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1272
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "QUIT response error"
 msgstr ""
 
@@ -10412,8 +10325,7 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:300 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr ""
 
@@ -10469,64 +10381,64 @@ msgid ""
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1222
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1245
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1291
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1298
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1305
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1314
+#: composer/e-msg-composer.c:1325
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1323
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1583
+#: composer/e-msg-composer.c:1594
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10534,34 +10446,34 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1592
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1624
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "ፋይል ክፈት"
 
-#: composer/e-msg-composer.c:2043
+#: composer/e-msg-composer.c:2054
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2083 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2263 composer/e-msg-composer.c:2959
-#: composer/e-msg-composer.c:2960
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2991
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3019
+#: composer/e-msg-composer.c:3030
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10569,13 +10481,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3089
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4099
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10651,7 +10563,6 @@ msgstr ""
 msgid "Posting destination"
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:102
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr ""
@@ -10810,7 +10721,7 @@ msgid ""
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr ""
 
@@ -11383,7 +11294,7 @@ msgstr ""
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1839
+#: filter/libfilter-i18n.h:18
 msgid "Label"
 msgstr "መለያ"
 
@@ -11432,7 +11343,7 @@ msgstr ""
 msgid "Score"
 msgstr "ነጥብ"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1826
+#: filter/libfilter-i18n.h:30
 msgid "Sender"
 msgstr ""
 
@@ -11460,8 +11371,8 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:969
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "ጉዳዩ"
 
@@ -11627,9 +11538,8 @@ msgstr ""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
 #: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/folder-browser-ui.c:362 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "ፖስታ"
 
@@ -11692,7 +11602,7 @@ msgstr ""
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1108 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "የማይፈለግ"
 
@@ -11816,191 +11726,6 @@ msgstr ""
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:329 mail/mail-display.c:396 mail/mail-display.c:1033
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr ""
-
-#: mail/folder-browser.c:804
-#, c-format
-msgid "%d new"
-msgstr "%d አዲስ"
-
-#: mail/folder-browser.c:807 mail/folder-browser.c:815
-#: mail/folder-browser.c:818
-msgid ", "
-msgstr "፣ "
-
-#: mail/folder-browser.c:809
-#, c-format
-msgid "%d hidden"
-msgstr "%d የተደበቀ"
-
-#: mail/folder-browser.c:811
-#, c-format
-msgid "%d visible"
-msgstr "%d የሚታይ"
-
-#: mail/folder-browser.c:816
-#, c-format
-msgid "%d selected"
-msgstr "%d ተመርጠዋል"
-
-#: mail/folder-browser.c:821
-#, c-format
-msgid "%d unsent"
-msgstr ""
-
-#: mail/folder-browser.c:823
-#, c-format
-msgid "%d sent"
-msgstr "%d ተልኳል"
-
-#: mail/folder-browser.c:825
-#, c-format
-msgid "%d total"
-msgstr "%d አጠቃላይ"
-
-#: mail/folder-browser.c:1204
-msgid "Create _Virtual Folder From Search..."
-msgstr ""
-
-#: mail/folder-browser.c:1775
-msgid "VFolder on _Subject"
-msgstr ""
-
-#: mail/folder-browser.c:1776
-msgid "VFolder on Se_nder"
-msgstr ""
-
-#: mail/folder-browser.c:1777
-msgid "VFolder on _Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:1778
-msgid "VFolder on Mailing _List"
-msgstr ""
-
-#: mail/folder-browser.c:1782
-msgid "Filter on Sub_ject"
-msgstr ""
-
-#: mail/folder-browser.c:1783
-msgid "Filter on Sen_der"
-msgstr ""
-
-#: mail/folder-browser.c:1784
-msgid "Filter on Re_cipients"
-msgstr ""
-
-#: mail/folder-browser.c:1785 mail/folder-browser.c:2109
-msgid "Filter on _Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:1803
-msgid "_Edit as New Message..."
-msgstr ""
-
-#: mail/folder-browser.c:1805
-msgid "_Print"
-msgstr "አትም"
-
-#: mail/folder-browser.c:1809 ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr ""
-
-#: mail/folder-browser.c:1810 ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr ""
-
-#: mail/folder-browser.c:1811 ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr ""
-
-#: mail/folder-browser.c:1812
-msgid "_Forward"
-msgstr "ወደፊት፦"
-
-#: mail/folder-browser.c:1816
-msgid "Follo_w Up..."
-msgstr ""
-
-#: mail/folder-browser.c:1817
-msgid "Fla_g Completed"
-msgstr ""
-
-#: mail/folder-browser.c:1818
-msgid "Cl_ear Flag"
-msgstr ""
-
-#. separator here?
-#: mail/folder-browser.c:1822 ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr ""
-
-#: mail/folder-browser.c:1823
-msgid "Mark as _Unread"
-msgstr ""
-
-#: mail/folder-browser.c:1824
-msgid "Mark as _Important"
-msgstr ""
-
-#: mail/folder-browser.c:1825
-msgid "_Mark as Unimportant"
-msgstr ""
-
-#: mail/folder-browser.c:1830
-msgid "U_ndelete"
-msgstr "አታጥፋ"
-
-#: mail/folder-browser.c:1834
-msgid "Mo_ve to Folder..."
-msgstr ""
-
-#: mail/folder-browser.c:1835 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr ""
-
-#: mail/folder-browser.c:1843
-msgid "Add Sender to Address_book"
-msgstr ""
-
-#: mail/folder-browser.c:1847
-msgid "Appl_y Filters"
-msgstr ""
-
-#: mail/folder-browser.c:1851
-msgid "Crea_te Rule From Message"
-msgstr ""
-
-#: mail/folder-browser.c:2110
-msgid "VFolder on M_ailing List"
-msgstr ""
-
-#: mail/folder-browser.c:2112
-#, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr ""
-
-#: mail/folder-browser.c:2113
-#, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr ""
-
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "የነበረው"
-
-#: mail/folder-browser-ui.c:475
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "ለ \"%s\"ን ምርጫዎች"
-
-#: mail/folder-browser-ui.c:477
-msgid "Properties"
-msgstr "ምርጫዎች"
-
 #: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr ""
@@ -12173,16 +11898,16 @@ msgstr "የነበረው"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "ያስችላል"
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 msgid "Protocol"
 msgstr ""
 
@@ -12222,182 +11947,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:101
-msgid "Don't show this message again."
-msgstr ""
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:1190
-msgid "an unknown sender"
-msgstr ""
-
-#. translators: attribution string used when quoting messages
-#: mail/mail-callbacks.c:1199
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr ""
-
-#: mail/mail-callbacks.c:1706 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:1708 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:2350
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2366
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:2399
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:2409
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2430
-msgid "No Message Selected"
-msgstr ""
-
-#: mail/mail-callbacks.c:2471
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-
-#: mail/mail-callbacks.c:2476
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2517
-msgid "Save Message As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:2519
-msgid "Save Messages As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:2692
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2787
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-callbacks.c:2795
-msgid "Filters"
-msgstr "አጣራዎች"
-
-#: mail/mail-callbacks.c:2836
-#, c-format
-msgid "Page %d of %d"
-msgstr ""
-
-#: mail/mail-callbacks.c:2892
-msgid "Print Message"
-msgstr ""
-
-#: mail/mail-callbacks.c:2960
-msgid "Printing of message failed"
-msgstr ""
-
-#: mail/mail-callbacks.c:3155
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr ""
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12594,6 +12143,10 @@ msgstr ""
 msgid "De_fault"
 msgstr "የነበረው (_F)"
 
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "የነበረው"
+
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr ""
@@ -13032,195 +12585,11 @@ msgstr ""
 msgid "description"
 msgstr "መግለጫ"
 
-#: mail/mail-display.c:197
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr ""
-
-#: mail/mail-display.c:411
-#, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr ""
-
-#: mail/mail-display.c:461
-#, c-format
-msgid "%s is not a valid directory name."
-msgstr ""
-
-#: mail/mail-display.c:508
-msgid "Select Directory for Attachments"
-msgstr ""
-
-#: mail/mail-display.c:582
-msgid "Save Attachment..."
-msgstr ""
-
-#: mail/mail-display.c:583
-#, fuzzy
-msgid "Save all attachments..."
-msgstr "ምስሉን በሌላ ስም አስቀምጥ"
-
-#: mail/mail-display.c:584
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:585
-#, c-format
-msgid "Open in %s..."
-msgstr ""
-
-#: mail/mail-display.c:652
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:656
-msgid "Hide"
-msgstr "ደብቅ"
-
-#: mail/mail-display.c:678
-msgid "External Viewer"
-msgstr ""
-
-#: mail/mail-display.c:1484
-msgid "Downloading images"
-msgstr ""
-
-#: mail/mail-display.c:1661
-msgid "Loading message content"
-msgstr ""
-
-#: mail/mail-display.c:2003
-msgid "Overdue:"
-msgstr ""
-
-#: mail/mail-display.c:2007
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/mail-display.c:2371
-msgid "Open Link in Browser"
-msgstr ""
-
-#: mail/mail-display.c:2372
-msgid "Copy Link Location"
-msgstr "አያያዝ ቦታ ቅጂ"
-
-#: mail/mail-display.c:2374
-msgid "Save Link as (FIXME)"
-msgstr ""
-
-#: mail/mail-display.c:2376
-msgid "Save Image as..."
-msgstr "ምስሉን በሌላ ስም አስቀምጥ"
-
 #: mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-format.c:666
-#, c-format
-msgid "%s attachment"
-msgstr ""
-
-#: mail/mail-format.c:708 mail/mail-format.c:1412 mail/mail-format.c:1483
-#: mail/mail-format.c:1603 mail/mail-format.c:1727 mail/mail-format.c:1752
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-
-#: mail/mail-format.c:794 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "ቀን"
-
-#. Timezone conversion crossed midnight. Show day
-#. translators: strftime format for local time equivalent in Date header display
-#: mail/mail-format.c:811
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#: mail/mail-format.c:813
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/mail-format.c:906
-msgid "Bad Address"
-msgstr ""
-
-#: mail/mail-format.c:947 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "ከ"
-
-#: mail/mail-format.c:951
-msgid "Reply-To"
-msgstr ""
-
-#: mail/mail-format.c:956 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "ወደ"
-
-#: mail/mail-format.c:961
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/mail-format.c:966
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/mail-format.c:1526
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1554
-msgid "Could not create a PGP verfication context"
-msgstr ""
-
-#: mail/mail-format.c:1562
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1569
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1833
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1844
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1847
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1874
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1880
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1882
-msgid "Malformed external-body part."
-msgstr ""
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
@@ -13293,190 +12662,158 @@ msgstr ""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:559
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:580
+#: mail/mail-ops.c:578
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:589
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:631
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:864
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1058
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1246
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1289
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1361
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1439
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1533
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1620 mail/mail-ops.c:1671
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1668
+#: mail/mail-ops.c:1666
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1669 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1744
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1948
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1976
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2094
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr ""
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr ""
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr ""
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr ""
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr ""
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr ""
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr "ፈልግ"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr ""
-
 #: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr ""
@@ -13615,15 +12952,6 @@ msgstr ""
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr ""
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - መልዕክት"
-
 #: mail/message-list.c:900
 msgid "Unseen"
 msgstr ""
@@ -13688,6 +13016,10 @@ msgstr "%b %d %Y"
 msgid "Generating message list"
 msgstr ""
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "ቀን"
+
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr ""
@@ -13704,6 +13036,10 @@ msgstr ""
 msgid "Follow Up Flag"
 msgstr ""
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "ከ"
+
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr ""
@@ -13716,6 +13052,10 @@ msgstr ""
 msgid "Size"
 msgstr "መጠን"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "ወደ"
+
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr ""
@@ -13774,39 +13114,6 @@ msgstr ""
 msgid "_Flag:"
 msgstr "ባንዲራ"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "ዶሴ"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr ""
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr ""
-
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -25761,6 +25068,10 @@ msgstr ""
 msgid "Checkbox"
 msgstr ""
 
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "ዶሴ"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -26184,7 +25495,7 @@ msgstr ""
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "ክሊፕቦርዱን ለጥፍ"
 
@@ -26192,7 +25503,7 @@ msgstr "ክሊፕቦርዱን ለጥፍ"
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
@@ -26238,7 +25549,7 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:30
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
@@ -26248,6 +25559,10 @@ msgstr ""
 msgid "_Actions"
 msgstr "ትግባሮች (_A)"
 
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr ""
@@ -26316,48 +25631,52 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "ወር"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "ገጽ"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:25
+msgid "Show as list"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr "ሳመንት"
 
@@ -26875,6 +26194,10 @@ msgstr ""
 msgid "Load _Images"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr ""
@@ -26979,6 +26302,14 @@ msgstr ""
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr ""
@@ -27107,6 +26438,10 @@ msgstr ""
 msgid "_Quoted"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:119
 msgid "_Resend..."
 msgstr ""
@@ -27888,6 +27223,77 @@ msgstr ""
 msgid "Evolution Addressbook local file backend"
 msgstr ""
 
+#~ msgid "Group"
+#~ msgstr "የውይይት መድረክ"
+
+#~ msgid "%d new"
+#~ msgstr "%d አዲስ"
+
+#~ msgid ", "
+#~ msgstr "፣ "
+
+#~ msgid "%d hidden"
+#~ msgstr "%d የተደበቀ"
+
+#~ msgid "%d visible"
+#~ msgstr "%d የሚታይ"
+
+#~ msgid "%d selected"
+#~ msgstr "%d ተመርጠዋል"
+
+#~ msgid "%d sent"
+#~ msgstr "%d ተልኳል"
+
+#~ msgid "%d total"
+#~ msgstr "%d አጠቃላይ"
+
+#~ msgid "_Print"
+#~ msgstr "አትም"
+
+#~ msgid "_Forward"
+#~ msgstr "ወደፊት፦"
+
+#~ msgid "U_ndelete"
+#~ msgstr "አታጥፋ"
+
+#~ msgid "Properties for \"%s\""
+#~ msgstr "ለ \"%s\"ን ምርጫዎች"
+
+#~ msgid "Properties"
+#~ msgstr "ምርጫዎች"
+
+#~ msgid "Filters"
+#~ msgstr "አጣራዎች"
+
+#, fuzzy
+#~ msgid "Save all attachments..."
+#~ msgstr "ምስሉን በሌላ ስም አስቀምጥ"
+
+#~ msgid "Hide"
+#~ msgstr "ደብቅ"
+
+#, fuzzy
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "%b %d %l:%M %p"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "አያያዝ ቦታ ቅጂ"
+
+#~ msgid "Save Image as..."
+#~ msgstr "ምስሉን በሌላ ስም አስቀምጥ"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Find:"
+#~ msgstr "ፈልግ"
+
+#~ msgid "%s - Message"
+#~ msgstr "%s - መልዕክት"
+
 #~ msgid "URL:"
 #~ msgstr "url"
 
diff --git a/po/az.po b/po/az.po
index af49c46f7f..e97597558a 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.99.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-15 23:12+0200\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2001-12-19 19:21GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 0.9.5\n"
 
 #: addressbook/backend/ebook/e-card.c:1306
@@ -92,7 +92,6 @@ msgid "Title"
 msgstr "Başlıq"
 
 #: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolu"
@@ -128,7 +127,7 @@ msgstr "Yoldaş"
 msgid "Anniversary"
 msgstr "İldönümü"
 
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:998
+#: addressbook/backend/ebook/e-card.c:1436
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -180,7 +179,7 @@ msgstr ""
 msgid "Wants HTML set"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1506
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "List"
 msgstr "siyahı"
@@ -1032,7 +1031,7 @@ msgstr "Axtarışın əhatə _sahəsi:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
 #: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:611
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr "Axtarılır"
 
@@ -1222,7 +1221,7 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:33 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -1476,10 +1475,10 @@ msgstr "Nö_vlər..."
 #: calendar/gui/dialogs/meeting-page.c:634
 #: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
 #: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: mail/folder-browser.c:1829 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:32 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:45
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -3040,7 +3039,6 @@ msgid "VCard for %s"
 msgstr "%s üçün VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
@@ -3720,7 +3718,7 @@ msgstr "Yüksək"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:806
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
 #: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Normal"
@@ -3871,7 +3869,7 @@ msgstr "gnome-vfs-ni başlada bilmədim"
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti emalatxanası yaradıla bilmir"
 
-#: calendar/gui/calendar-commands.c:366
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3883,54 +3881,54 @@ msgstr ""
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: calendar/gui/calendar-commands.c:372
+#: calendar/gui/calendar-commands.c:382
 #, fuzzy
 msgid "Purge events older than"
 msgstr "azdır"
 
-#: calendar/gui/calendar-commands.c:377
+#: calendar/gui/calendar-commands.c:387
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "gün"
 
-#: calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:478 calendar/gui/e-day-view.c:1364
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
 #: calendar/gui/e-day-view-top-item.c:266
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:485
-#: calendar/gui/calendar-commands.c:487
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:498 calendar/gui/calendar-commands.c:505
-#: calendar/gui/calendar-commands.c:511 calendar/gui/calendar-commands.c:513
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:503
+#: calendar/gui/calendar-commands.c:518
 #: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:901
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Təqvimin görünüşü quraşdırıla bilmir. Lütfən ORBIT və OAF qurğularınızı "
 "yoxlayın."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1527
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -4047,6 +4045,11 @@ msgstr "Həftəlik Nümayiş"
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "_Hazırkı Görünüş"
+
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Daxil edən icmal"
@@ -4059,7 +4062,7 @@ msgstr "Daxil edən izah"
 msgid "Comment contains"
 msgstr "Daxil edən şərh"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1122
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
 msgid "Unmatched"
 msgstr "Oxşar Olmayan"
 
@@ -4077,16 +4080,16 @@ msgstr ""
 msgid "Permission denied to open the calendar"
 msgstr "Qadağandır"
 
-#: calendar/gui/control-factory.c:122
+#: calendar/gui/control-factory.c:125
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/control-factory.c:168
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "Təqvimin göstərəcəyi URI"
 
-#: calendar/gui/control-factory.c:175
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr ""
 
@@ -4373,7 +4376,7 @@ msgid "Wednesday"
 msgstr "Çərşənbə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr "İş  Həftəsi"
 
@@ -4842,10 +4845,9 @@ msgstr "_Başlama vaxt:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2082
-#: mail/folder-browser.c:1791 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
@@ -4868,55 +4870,6 @@ msgstr "Ən az bir dinləyici lazımdır."
 msgid "_Delegate To..."
 msgstr "_Təmsil Et..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Ziyarətçilər"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-#, fuzzy
-msgid "Click here to add an attendee"
-msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Ümumi Ad"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Təmsil Etdiyi Yer"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Təmsil Edir"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Dil"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Üzv"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Hal"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -5086,7 +5039,7 @@ msgstr ""
 "\n"
 "Dəyişikliklərinizin qeyd edilməyini istəyirsinizmi?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1588
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5125,8 +5078,7 @@ msgstr "% Qurtardı"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-tasks.c:250
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
 #: calendar/gui/print.c:2311
 msgid "Completed"
 msgstr "Bitirmə Tarixi"
@@ -5296,15 +5248,16 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "naməlum tətik növü üçün %s"
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:281
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
 msgid "Public"
 msgstr "Ümumi"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
 msgid "Private"
 msgstr "Şəxsi"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
 msgid "Confidential"
 msgstr "Gizli"
 
@@ -5369,8 +5322,7 @@ msgstr "Seçili üzv silinir"
 
 #: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
 #: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
-#: mail/folder-browser.c:1802 shell/e-shortcuts-view.c:422
-#: ui/evolution-addressbook.xml.h:36
+#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Aç"
 
@@ -5381,14 +5333,14 @@ msgstr "İsmarışı _Aç"
 
 #: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
 #: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: mail/folder-browser.c:1804 ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et ..."
 
 #: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
 #: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
 #: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
@@ -5403,7 +5355,7 @@ msgstr "Kə_s"
 
 #: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
 #: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:31
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
 #: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
@@ -5412,7 +5364,7 @@ msgstr "_Köçürt"
 #: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
 #: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
 #: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Yapışdır"
@@ -5488,6 +5440,12 @@ msgstr "Üstünlük"
 msgid "Start Date"
 msgstr "Başlama Tarixi"
 
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Hal"
+
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
@@ -5508,22 +5466,29 @@ msgstr " rəng"
 msgid "component"
 msgstr "İclas"
 
-#: calendar/gui/e-cal-model.c:808
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Naməlum"
+
+#: calendar/gui/e-cal-model.c:828
 msgid "Recurring"
 msgstr "Təkrarlayan"
 
-#: calendar/gui/e-cal-model.c:810
+#: calendar/gui/e-cal-model.c:830
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/e-cal-model.c:812 calendar/gui/e-cal-model-tasks.c:933
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
 msgid "Yes"
 msgstr "Bəli"
 
-#: calendar/gui/e-cal-model.c:812 calendar/gui/e-cal-model-tasks.c:933
-#: calendar/gui/e-meeting-model.c:278 calendar/gui/e-meeting-model.c:788
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
 msgid "No"
 msgstr "Xeyr"
 
@@ -5579,7 +5544,7 @@ msgstr "_Bugünə Get"
 msgid "_Go to Date..."
 msgstr "Tarixə _Get..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:36
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatını _Dərc Et"
 
@@ -5801,9 +5766,7 @@ msgstr ""
 msgid "Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:801
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Qəbul Edildi"
 
@@ -5812,23 +5775,11 @@ msgstr "Qəbul Edildi"
 msgid "Tentatively Accepted"
 msgstr "Girişimli qəbul et"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:802
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Rədd Edildi"
 
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:759
-#: calendar/gui/e-meeting-model.c:775 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:347
-#: mail/mail-display.c:1044 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Naməlum"
-
 #: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
 #: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
 #: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
@@ -5858,6 +5809,11 @@ msgstr "Girişimli qəbul et"
 msgid "Decline"
 msgstr "Rədd Et"
 
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
 #: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatını Yolla"
@@ -6170,82 +6126,10 @@ msgstr "bitiş tarixi"
 msgid "date-start"
 msgstr "başlama tarixi"
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr "İştirakçılar"
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1639
-msgid "Required Participants"
-msgstr "Lazımi İştirakçılar"
-
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
-msgstr "Ehtiyatdakı İştirakçılar"
-
-#: calendar/gui/e-meeting-model.c:82
-#, fuzzy
-msgid "Resources"
-msgstr "Mənbə"
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:755
-msgid "Individual"
-msgstr "Şəxsi"
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:756
-msgid "Group"
-msgstr "Qrup"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:757
-msgid "Resource"
-msgstr "Mənbə"
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:758
-msgid "Room"
-msgstr "Otaq"
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:771
-msgid "Chair"
-msgstr "Stul"
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:772
-msgid "Required Participant"
-msgstr "Lazımi İştirakçılar"
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
-msgid "Optional Participant"
-msgstr "Ehtiyatdakı İştirakçılar"
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
-msgid "Non-Participant"
-msgstr "Qeyri İştirakçılar"
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:800
-msgid "Needs Action"
-msgstr "Hərəkət Lazımdır"
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:803 calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Girişimli"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:804
-msgid "Delegated"
-msgstr "Temsil Edildi"
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
-msgstr "İşləyir"
-
 #: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "İş Yerində Deyil"
@@ -6321,6 +6205,35 @@ msgstr "%a %B %d %Y"
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Ziyarətçilər"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Ümumi Ad"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Təmsil Etdiyi Yer"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Təmsil Edir"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Dil"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Üzv"
+
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
@@ -6369,12 +6282,12 @@ msgstr "`%s' dakı (dəki) vəzifələr yüklənə bilmədi"
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' i(ı) yükləməyə yarayan yol dəstəklənmir"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1684
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1898
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6396,22 +6309,22 @@ msgstr "Seçili üzv silinir"
 msgid "Expunging"
 msgstr "Qovluq açılır"
 
-#: calendar/gui/gnome-cal.c:1656
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/gnome-cal.c:1670
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' i(ı) açmağa yarayan yol dəstəklənmir"
 
-#: calendar/gui/gnome-cal.c:1726
+#: calendar/gui/gnome-cal.c:1772
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s vaxtı alarm ver"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6419,7 +6332,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1924
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6427,22 +6340,22 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2130
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Təqvim %s vaxtı açılır"
 
-#: calendar/gui/gnome-cal.c:2151
+#: calendar/gui/gnome-cal.c:2197
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s qovluğu açılır"
 
-#: calendar/gui/gnome-cal.c:3035
+#: calendar/gui/gnome-cal.c:3094
 #, fuzzy, c-format
 msgid "Purging event %s"
 msgstr "%s daranır"
 
-#: calendar/gui/gnome-cal.c:3119
+#: calendar/gui/gnome-cal.c:3178
 #, fuzzy
 msgid "Purging"
 msgstr "Türkçə"
@@ -6706,8 +6619,7 @@ msgid "Contacts: "
 msgstr "Əlaqələr:"
 
 #: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2954
-#: my-evolution/e-summary.c:649
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Çap Etmə nümayişi"
 
@@ -10878,7 +10790,7 @@ msgstr "%s dan(dən) SMTP məktub göndərilməsi"
 msgid "Cannot send message: sender address not valid."
 msgstr "İsmarış göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr "İsmarış göndərilir"
 
@@ -10891,63 +10803,63 @@ msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr "SMTP Qarşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:950
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "SMTP Tanıtma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanıtma cismi yaratma xətası."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1040
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1061
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "AUTH istək bacarılmadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1122
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Vericidən xətalı tanıtma istəyi alındı.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1147
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAİL FROM istək vaxt dolması: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1167
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAİL FROM cavablama xətası: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1191
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO istək vaxt dolması: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
@@ -10955,39 +10867,39 @@ msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1272
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA göndərmə vaxt dolması: ismarış qurtarılır: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET cavablama xətası: %s"
@@ -11007,8 +10919,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:300 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "yapışdırılmış fayl"
 
@@ -11067,30 +10978,30 @@ msgstr ""
 "%s faylı oxunurkən xəta oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr "Fayl mövcuddur, üstünə yazaq?"
 
-#: composer/e-msg-composer.c:1222
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fayl qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1245
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fayl yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayla yetişilirkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1291
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Editordan ismarışlar alına bilmir"
 
-#: composer/e-msg-composer.c:1298
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11099,7 +11010,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1305
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11108,7 +11019,7 @@ msgstr ""
 "Fayl parçalana bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1314
+#: composer/e-msg-composer.c:1325
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11117,7 +11028,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1323
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11126,7 +11037,7 @@ msgstr ""
 "İsmarışın öz-özünə qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11134,7 +11045,7 @@ msgstr ""
 "Ximian Evolution əvvəlki iclasdan qalan qeyd edilməmiş fayllar tapdı.\n"
 "Onları indi bərpa etməyə cəhd etməyimi istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1583
+#: composer/e-msg-composer.c:1594
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11145,29 +11056,29 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmak istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1592
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
 
-#: composer/e-msg-composer.c:1624
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:2043
+#: composer/e-msg-composer.c:2054
 #, fuzzy
 msgid "Signature:"
 msgstr "Imzanı qeyd et"
 
-#: composer/e-msg-composer.c:2083 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2263 composer/e-msg-composer.c:2959
-#: composer/e-msg-composer.c:2960
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Bir ismarış yaz"
 
-#: composer/e-msg-composer.c:2991
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11175,7 +11086,7 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "Ünvan seçici idarə fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:3019
+#: composer/e-msg-composer.c:3030
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11186,7 +11097,7 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "HTML editor parçası fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:3089
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11194,7 +11105,7 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "HTML editor parçası fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:4099
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11277,7 +11188,6 @@ msgstr "_Qapı:"
 msgid "Posting destination"
 msgstr "izah"
 
-#: composer/e-msg-composer-select-file.c:102
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -11447,7 +11357,7 @@ msgstr ""
 "Eyni adlı bir fayl onsuz da vardır.\n"
 "Üstünə yazım mı?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "Faylının üsütünə yazım mı?"
 
@@ -12046,7 +11956,7 @@ msgstr "İfadə"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1839
+#: filter/libfilter-i18n.h:18
 msgid "Label"
 msgstr ""
 
@@ -12097,7 +12007,7 @@ msgstr "Cavab verilən"
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1826
+#: filter/libfilter-i18n.h:30
 msgid "Sender"
 msgstr "Göndərən"
 
@@ -12126,8 +12036,8 @@ msgstr "Xas başlıq"
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:969
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Mövzu"
 
@@ -12304,9 +12214,8 @@ msgstr "%s daranır"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
 #: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/folder-browser-ui.c:362 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Məktub"
 
@@ -12373,7 +12282,7 @@ msgstr "Evolution köhnə Netscape verilənlərini idxal edir"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1108 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Zibil Qutusu"
 
@@ -12512,203 +12421,6 @@ msgstr "Vericiyə bağlantı qurulur..."
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: mail/folder-browser.c:329 mail/mail-display.c:396 mail/mail-display.c:1033
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
-
-#: mail/folder-browser.c:804
-#, c-format
-msgid "%d new"
-msgstr "%d yeni"
-
-#: mail/folder-browser.c:807 mail/folder-browser.c:815
-#: mail/folder-browser.c:818
-msgid ", "
-msgstr ", "
-
-#: mail/folder-browser.c:809
-#, c-format
-msgid "%d hidden"
-msgstr "%d gizli"
-
-#: mail/folder-browser.c:811
-#, c-format
-msgid "%d visible"
-msgstr ""
-
-#: mail/folder-browser.c:816
-#, c-format
-msgid "%d selected"
-msgstr "%d seçili"
-
-#: mail/folder-browser.c:821
-#, c-format
-msgid "%d unsent"
-msgstr "%d yollanmamış"
-
-#: mail/folder-browser.c:823
-#, c-format
-msgid "%d sent"
-msgstr "%d yollanmış"
-
-#: mail/folder-browser.c:825
-#, c-format
-msgid "%d total"
-msgstr "cəmi %d"
-
-#: mail/folder-browser.c:1204
-#, fuzzy
-msgid "Create _Virtual Folder From Search..."
-msgstr "İsmarışdan _Virtual Qovluq Yarat"
-
-#: mail/folder-browser.c:1775
-msgid "VFolder on _Subject"
-msgstr "_Mövzudakı vFolder"
-
-#: mail/folder-browser.c:1776
-msgid "VFolder on Se_nder"
-msgstr "Gön_dərəndəki vFolder"
-
-#: mail/folder-browser.c:1777
-msgid "VFolder on _Recipients"
-msgstr "_Alıcıdakı vFolder"
-
-#: mail/folder-browser.c:1778
-msgid "VFolder on Mailing _List"
-msgstr "Məktublaşma Q_rupundakı VFolder"
-
-#: mail/folder-browser.c:1782
-msgid "Filter on Sub_ject"
-msgstr "Mö_vzudakı Süzgəc"
-
-#: mail/folder-browser.c:1783
-msgid "Filter on Sen_der"
-msgstr "Gön_dərəndəki  Süzgəc"
-
-#: mail/folder-browser.c:1784
-msgid "Filter on Re_cipients"
-msgstr "_Alıcıdakı Süzgəc"
-
-#: mail/folder-browser.c:1785 mail/folder-browser.c:2109
-msgid "Filter on _Mailing List"
-msgstr "_Məktublaşma Qrupundakı Süzgəc"
-
-#: mail/folder-browser.c:1803
-msgid "_Edit as New Message..."
-msgstr "Yeni İsmarış olaraq _Düzəlt ..."
-
-#: mail/folder-browser.c:1805
-msgid "_Print"
-msgstr "_Çap Et"
-
-#: mail/folder-browser.c:1809 ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "Göndərənə _Cavab Ver"
-
-#: mail/folder-browser.c:1810 ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "_Qrupa Cavab Ver"
-
-#: mail/folder-browser.c:1811 ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "_Hamısına Cavab Ver"
-
-#: mail/folder-browser.c:1812
-msgid "_Forward"
-msgstr "_Çatdır"
-
-#: mail/folder-browser.c:1816
-msgid "Follo_w Up..."
-msgstr ""
-
-#: mail/folder-browser.c:1817
-#, fuzzy
-msgid "Fla_g Completed"
-msgstr "Bitirmə Tarixi"
-
-#: mail/folder-browser.c:1818
-#, fuzzy
-msgid "Cl_ear Flag"
-msgstr "Təmizlə"
-
-#. separator here?
-#: mail/folder-browser.c:1822 ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Oxun_muş olaraq İşarələ"
-
-#: mail/folder-browser.c:1823
-#, fuzzy
-msgid "Mark as _Unread"
-msgstr "Ox_unmamış olaraq İşarələ"
-
-#: mail/folder-browser.c:1824
-msgid "Mark as _Important"
-msgstr "_Vacib olaraq İşarələ"
-
-#: mail/folder-browser.c:1825
-#, fuzzy
-msgid "_Mark as Unimportant"
-msgstr "_Qeyri-Vacib olaraq İşarələ"
-
-#: mail/folder-browser.c:1830
-#, fuzzy
-msgid "U_ndelete"
-msgstr "_Geri Gətir"
-
-#: mail/folder-browser.c:1834
-#, fuzzy
-msgid "Mo_ve to Folder..."
-msgstr "Qovluğa _Daşı ..."
-
-#: mail/folder-browser.c:1835 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "Qovluğa _Köçürt..."
-
-#: mail/folder-browser.c:1843
-#, fuzzy
-msgid "Add Sender to Address_book"
-msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
-
-#: mail/folder-browser.c:1847
-#, fuzzy
-msgid "Appl_y Filters"
-msgstr "Süzgəclər Əlavə Et"
-
-#: mail/folder-browser.c:1851
-#, fuzzy
-msgid "Crea_te Rule From Message"
-msgstr "İsmarışdan Qa_yda Yarat"
-
-#: mail/folder-browser.c:2110
-#, fuzzy
-msgid "VFolder on M_ailing List"
-msgstr "Məktublaşma Qrupundakı VFolder"
-
-#: mail/folder-browser.c:2112
-#, fuzzy, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Məktublaşma Qrupunda Süz (%s)"
-
-#: mail/folder-browser.c:2113
-#, fuzzy, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "(%s) Məktublaşma Qrupundakı VFolder"
-
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-#, fuzzy
-msgid "Default"
-msgstr "Ə_sas"
-
-#: mail/folder-browser-ui.c:475
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\"in Seçənəkləri"
-
-#: mail/folder-browser-ui.c:477
-msgid "Properties"
-msgstr "Seçənəklər"
-
 #: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Qovluq Məlumatı Alınır"
@@ -12902,17 +12614,17 @@ msgstr "Ə_sas"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Fəal"
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 #, fuzzy
 msgid "Account name"
 msgstr "_Hesab adı:"
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Riko"
@@ -12957,221 +12669,6 @@ msgstr ""
 "    '%s'\n"
 "Və güncəlləndilər."
 
-#: mail/mail-callbacks.c:101
-msgid "Don't show this message again."
-msgstr "Bu ismarışı bir də göstərmə."
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Məktub alıcısını hələ quraşdırmamısınız.\n"
-"Məktub yazmaq, almaq, göndərmədən əvvəl \n"
-"bunu quraşdırmalısınız.\n"
-"Bunu indi quraşdırmaq istəyirsiniz?"
-
-#: mail/mail-callbacks.c:212
-#, fuzzy
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-"ePoçt göndərməkdən əvvəl bir \n"
-"şəxs tanıtmalısan."
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"ePoçt göndərməkdən əvvəl bir \n"
-"şəxs tanıtmalısan."
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"ePoçt göndərməkdən əvvəl bir ePoçt\n"
-"nəqliyyatını qurmalısan."
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-#, fuzzy
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-"HTML şəklində imsarış göndərirsiniz, amma aşağıdakı alıcılar HTML şəklində "
-"məktub istəmirlər:\n"
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "Yenə də yollayaq?"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Bu ismarışın mövzusu yoxdur .\n"
-"Həqiqətən də göndərim?"
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-"Nə vaxta qədər ki, əlaqə siyahınız qrup ünvanıarını gizləyəcək şəkildə "
-"sazlanıb, bi ismarış təkcə Bcc alıcılar daxil edəcək."
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "İsmarış təkcə Bcc alıcıları daxil edir."
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-"Ola bilsin ki, məktub vericisi alıcılara Aydın-Yollayan başlığı ilə "
-"məlumatlndırmaq istəsin.\n"
-"Yenə də göndərək?"
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Məktubu göndərə bilmək üçün alıcını da bildirməlisən."
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Bu hesab üçün lahiyə cərgəsə açıla bilmədi.\n"
-"Əsas lahiyə cərgəsini işlətmək istəyirsiniz?"
-
-#: mail/mail-callbacks.c:1190
-msgid "an unknown sender"
-msgstr "naməlum yollayan"
-
-#. translators: attribution string used when quoting messages
-#: mail/mail-callbacks.c:1199
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a, %Y-%m-%d at %H:%M, tarixidə %%s yazmışdır ki:"
-
-#: mail/mail-callbacks.c:1706 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "İsmarış(ları) buraya daşı "
-
-#: mail/mail-callbacks.c:1708 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "İsmarış(ları) buraya köçürt"
-
-#: mail/mail-callbacks.c:2350
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "Bütün `%d' ismarışlarını düzəltmək istəyirsiniz?"
-
-#: mail/mail-callbacks.c:2366
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
-"ismarışları düzəldə bilərsiniz."
-
-#: mail/mail-callbacks.c:2399
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Sadəcə olaraq Göndərilən cərgəsinə qeyd edilən\n"
-"ismarışları yeniden gönderebilirsiniz."
-
-#: mail/mail-callbacks.c:2409
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "Həqiqətən də bütün `%d' ismarışı yenidən yollamaq istəyirsən?"
-
-#: mail/mail-callbacks.c:2430
-msgid "No Message Selected"
-msgstr "Heç İsmarış Seçilmədi"
-
-#: mail/mail-callbacks.c:2471
-#, fuzzy, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"İSmarıc alına bilmir: %s\n"
-"   %s"
-
-#: mail/mail-callbacks.c:2476
-#, fuzzy, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"%s onsuz da mövcuddur.\n"
-"Üstünə yazmaq istəyirsiniz?"
-
-#: mail/mail-callbacks.c:2517
-msgid "Save Message As..."
-msgstr "İsmarışı Fərqli Qeyd Et..."
-
-#: mail/mail-callbacks.c:2519
-msgid "Save Messages As..."
-msgstr "İsmarışları Fərqli Qeyd Et..."
-
-#: mail/mail-callbacks.c:2692
-#, fuzzy
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"Bu əməliyyat silinəcəklər deyə işarələnmiş bütün məktubları həmişəlik "
-"siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə bilməyəcəksiniz.\n"
-"\n"
-"İsmarışları həqiqətən də silək?"
-
-#: mail/mail-callbacks.c:2787
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Süzgəc məlumatını yükləmə xətası:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2795
-msgid "Filters"
-msgstr "Süzgəclər"
-
-#: mail/mail-callbacks.c:2836
-#, fuzzy, c-format
-msgid "Page %d of %d"
-msgstr "%d İsmarışın %d qədərə alınır"
-
-#: mail/mail-callbacks.c:2892
-msgid "Print Message"
-msgstr "İsmarışı Çap Et"
-
-#: mail/mail-callbacks.c:2960
-msgid "Printing of message failed"
-msgstr "İsmarıların çap edilməsi bacarılmadı"
-
-#: mail/mail-callbacks.c:3155
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "Bütün %d ismarışlarını başqa pəncərədə açmaq istəyirsiniz?"
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 #, fuzzy
@@ -13412,6 +12909,11 @@ msgstr ""
 msgid "De_fault"
 msgstr "Ə_sas"
 
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Ə_sas"
+
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
@@ -13912,204 +13414,11 @@ msgstr ""
 msgid "description"
 msgstr "izah"
 
-#: mail/mail-display.c:197
-#, fuzzy, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Eyni adlı bir fayl onsuz da vardır.\n"
-"Üstünə yazım mı?"
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr "Yapışdırılmış Faylı Qeyd Et"
-
-#: mail/mail-display.c:411
-#, fuzzy, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
-
-#: mail/mail-display.c:461
-#, fuzzy, c-format
-msgid "%s is not a valid directory name."
-msgstr "`%s' məktub qovluğu faylı deyildir."
-
-#: mail/mail-display.c:508
-msgid "Select Directory for Attachments"
-msgstr ""
-
-#: mail/mail-display.c:582
-#, fuzzy
-msgid "Save Attachment..."
-msgstr "Yapışdırılmış Faylı Qeyd Et"
-
-#: mail/mail-display.c:583
-#, fuzzy
-msgid "Save all attachments..."
-msgstr "Yapışdırılmış Faylı Qeyd Et"
-
-#: mail/mail-display.c:584
-msgid "View Inline"
-msgstr "İçərisini Göstər"
-
-#: mail/mail-display.c:585
-#, c-format
-msgid "Open in %s..."
-msgstr "%s da(də) Aç ..."
-
-#: mail/mail-display.c:652
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "İçərisini Göstər (%s ilə)"
-
-#: mail/mail-display.c:656
-msgid "Hide"
-msgstr "Gizlə"
-
-#: mail/mail-display.c:678
-msgid "External Viewer"
-msgstr "Xarici Göstərici"
-
-#: mail/mail-display.c:1484
-#, fuzzy
-msgid "Downloading images"
-msgstr "_Rəsmləri Yüklə"
-
-#: mail/mail-display.c:1661
-msgid "Loading message content"
-msgstr "İsmarış içindəkilər yüklənir"
-
-#: mail/mail-display.c:2003
-#, fuzzy
-msgid "Overdue:"
-msgstr "Ge_cikmiş işlər:"
-
-#: mail/mail-display.c:2007
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/mail-display.c:2371
-msgid "Open Link in Browser"
-msgstr "Körpünü Səyyahda Aç"
-
-#: mail/mail-display.c:2372
-msgid "Copy Link Location"
-msgstr "Körpü Ünvanınə Köçür"
-
-#: mail/mail-display.c:2374
-msgid "Save Link as (FIXME)"
-msgstr "Körpünü Fərqli qeyd et"
-
-#: mail/mail-display.c:2376
-msgid "Save Image as..."
-msgstr "Rəsmi Fərqli qeyd et..."
-
 #: mail/mail-folder-cache.c:832
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "%s daranır"
 
-#: mail/mail-format.c:666
-#, c-format
-msgid "%s attachment"
-msgstr "%s yapışdırılmış fayl"
-
-#: mail/mail-format.c:708 mail/mail-format.c:1412 mail/mail-format.c:1483
-#: mail/mail-format.c:1603 mail/mail-format.c:1727 mail/mail-format.c:1752
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME ismarışı açıla bilmədi: Mənbə kodu gösteriliyor."
-
-#: mail/mail-format.c:794 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Tarix"
-
-#. Timezone conversion crossed midnight. Show day
-#. translators: strftime format for local time equivalent in Date header display
-#: mail/mail-format.c:811
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#: mail/mail-format.c:813
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/mail-format.c:906
-msgid "Bad Address"
-msgstr "Səhv Ünvan"
-
-#: mail/mail-format.c:947 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Göndərən"
-
-#: mail/mail-format.c:951
-msgid "Reply-To"
-msgstr "Cavablama"
-
-#: mail/mail-format.c:956 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Gn:"
-
-#: mail/mail-format.c:961
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/mail-format.c:966
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/mail-format.c:1526
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Bu ismarış digital olaraq imzalanmışdır. Ətraflı məlumat üçün qıfıl "
-"timsalına tıqla."
-
-#: mail/mail-format.c:1554
-#, fuzzy
-msgid "Could not create a PGP verfication context"
-msgstr "PGP təsdiq məzmunu yaradıla bilmir."
-
-#: mail/mail-format.c:1562
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Bu ismarış digital olaraq imzalanmışdır və original olduğu düşünülür."
-
-#: mail/mail-format.c:1569
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Bu ismarış digital olaraq imzalanmışdır amma original olduğu düşünülmür."
-
-#: mail/mail-format.c:1833
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP saytını göstərən ox (%s)"
-
-#: mail/mail-format.c:1844
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Yerli faylyi göstərən (%s) oxu \"%s\" saytında hökmlüdür"
-
-#: mail/mail-format.c:1847
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Yerli faylyi göstərən ox (%s)"
-
-#: mail/mail-format.c:1874
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Uzaq verilənlər (%s) nişanı"
-
-#: mail/mail-format.c:1880
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Naməlum xarici məlumatı göstərən ox (\"%s\" növündə "
-
-#: mail/mail-format.c:1882
-msgid "Malformed external-body part."
-msgstr "Xəsərli xarici proqram parçası."
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, fuzzy, c-format
 msgid "Local folders/%s"
@@ -14190,119 +13499,119 @@ msgstr "Qovluq Süzülür"
 msgid "Fetching Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-ops.c:559
+#: mail/mail-ops.c:557
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Məktubların müvəqqəti %s fayllında saxlanma xətası: %s"
 
-#: mail/mail-ops.c:580
+#: mail/mail-ops.c:578
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:589
+#: mail/mail-ops.c:587
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Məktubların müvəqqəti %s fayllında saxlanma xətası: %s"
 
-#: mail/mail-ops.c:631
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" Göndərilir"
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarış göndərilir"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d ismarışda xəta"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr "Qurtadı."
 
-#: mail/mail-ops.c:864
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) daşınır"
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
 
-#: mail/mail-ops.c:1058
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" dakı qovluqlar daranır"
 
-#: mail/mail-ops.c:1246
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-ops.c:1289
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1361
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr "%s qaynağı açılır"
 
-#: mail/mail-ops.c:1439
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1533
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1620 mail/mail-ops.c:1671
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr "Qovluq açılır"
 
-#: mail/mail-ops.c:1668
+#: mail/mail-ops.c:1666
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "%s %s olaraq idxal edilir"
 
-#: mail/mail-ops.c:1669 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-ops.c:1744
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d ismarış alınır"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d ismarış qeyd edilir"
 
-#: mail/mail-ops.c:1948
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14311,7 +13620,7 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1976
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14320,11 +13629,11 @@ msgstr ""
 "İsmarışların buraya qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Yapışdırılmış Fayl Qeyd Edilir"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14333,53 +13642,21 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2094
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Data yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Adsız İsmarış)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Adsız İsmarış"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Boş İsmarış"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "İsmarışda Axtar"
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr "Böyük Kiçik Hərfə Həssas"
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "İrəliyə Axtar"
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr "Axtar:"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Oxşayır:"
-
 #: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr "Ləğv Edilir ..."
@@ -14529,15 +13806,6 @@ msgstr "Mövcud olmayan '%s' vfolder-i düzəldilməyə çalışılır."
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Mövzusuz)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - İsmarış"
-
 #: mail/message-list.c:900
 msgid "Unseen"
 msgstr "Görülməmiş"
@@ -14602,6 +13870,10 @@ msgstr "%b %d %Y"
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Tarix"
+
 #: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
@@ -14620,6 +13892,10 @@ msgstr "Bayraqlı"
 msgid "Follow Up Flag"
 msgstr ""
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Göndərən"
+
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
@@ -14633,6 +13909,10 @@ msgstr "Alındı"
 msgid "Size"
 msgstr "Böyüklük"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Gn:"
+
 #: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
@@ -14698,39 +13978,6 @@ msgstr "Aidiyyət"
 msgid "_Flag:"
 msgstr "Fayl adı:"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "%s altındakı qovluqlar daranır (\"%s\" üstündəki)"
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "\"%s\" üstündəki kök səviyyəsi qovluqlar daranır"
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "\"%s\" qovluğuna qeydiyyat silinir"
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Qovluq"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "Heç verici seçilməyib"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Verici seçin."
-
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -27843,6 +27090,10 @@ msgstr ""
 msgid "Checkbox"
 msgstr ""
 
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Qovluq"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -28312,7 +27563,7 @@ msgstr "Seçili ismarışları başqa bir cərgəyə daşı"
 msgid "Move to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "Ara yaddaşı yapışdır"
 
@@ -28320,7 +27571,7 @@ msgstr "Ara yaddaşı yapışdır"
 msgid "Previews the contacts to be printed"
 msgstr "Çap ediləcək əlaqəni nümayiş etdirər"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
@@ -28367,7 +27618,7 @@ msgstr "Yükləməni Dayandır"
 msgid "View the current contact"
 msgstr "indiki vaxt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:30
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
@@ -28377,6 +27628,10 @@ msgstr "indiki vaxt"
 msgid "_Actions"
 msgstr "_Gedişlər"
 
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "Qovluğa _Köçürt..."
+
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "Əlaqənı _Çatdır..."
@@ -28449,49 +27704,54 @@ msgstr "Xüsusi bir tarixə get"
 msgid "Go to today"
 msgstr "Bugünə get"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "Ay"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr "Çap ediləcək təqvimi nümayiş etdirər"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Bu təqvimi çap et"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Bu təqcimdə Sərbəst/Məşğul məlumatını dərc et"
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Qaynaqlar"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Görüş və hadisələri daxil edən qovluq"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Show as list"
+msgstr "Təfsilatı Göstər"
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr "Bir günü göstər"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr "Bir ayı göstər"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr "Bir həftəni göster"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "İş həftəsini göstər"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr "Həftə"
 
@@ -29026,6 +28286,10 @@ msgstr "Mətn böyüklüyün artıq"
 msgid "Load _Images"
 msgstr "_Rəsmləri Yüklə"
 
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr "Oxun_muş olaraq İşarələ"
+
 #: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr "_Vacib olaraq İşarələ"
@@ -29143,6 +28407,14 @@ msgstr ""
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Seçili ismarışı birinə çatdır"
 
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "_Hamısına Cavab Ver"
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr "_Qrupa Cavab Ver"
+
 #: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr "Mətni əsl böyüklüyünə sıfırla"
@@ -29280,6 +28552,10 @@ msgstr "Əvvəlki İsmarış"
 msgid "_Quoted"
 msgstr "Sitatlandırılmış"
 
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr "Göndərənə _Cavab Ver"
+
 #: ui/evolution-mail-message.xml.h:119
 #, fuzzy
 msgid "_Resend..."
@@ -30106,6 +29382,520 @@ msgstr "Evolutionun İcracı mündəricat parçası."
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 
+#~ msgid "Chair Persons"
+#~ msgstr "İştirakçılar"
+
+#~ msgid "Required Participants"
+#~ msgstr "Lazımi İştirakçılar"
+
+#~ msgid "Optional Participants"
+#~ msgstr "Ehtiyatdakı İştirakçılar"
+
+#, fuzzy
+#~ msgid "Resources"
+#~ msgstr "Mənbə"
+
+#~ msgid "Individual"
+#~ msgstr "Şəxsi"
+
+#~ msgid "Group"
+#~ msgstr "Qrup"
+
+#~ msgid "Resource"
+#~ msgstr "Mənbə"
+
+#~ msgid "Room"
+#~ msgstr "Otaq"
+
+#~ msgid "Chair"
+#~ msgstr "Stul"
+
+#~ msgid "Required Participant"
+#~ msgstr "Lazımi İştirakçılar"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Ehtiyatdakı İştirakçılar"
+
+#~ msgid "Non-Participant"
+#~ msgstr "Qeyri İştirakçılar"
+
+#~ msgid "Needs Action"
+#~ msgstr "Hərəkət Lazımdır"
+
+#~ msgid "Delegated"
+#~ msgstr "Temsil Edildi"
+
+#~ msgid "In Process"
+#~ msgstr "İşləyir"
+
+#~ msgid "Could not create temporary directory: %s"
+#~ msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
+
+#~ msgid "%d new"
+#~ msgstr "%d yeni"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "%d hidden"
+#~ msgstr "%d gizli"
+
+#~ msgid "%d selected"
+#~ msgstr "%d seçili"
+
+#~ msgid "%d unsent"
+#~ msgstr "%d yollanmamış"
+
+#~ msgid "%d sent"
+#~ msgstr "%d yollanmış"
+
+#~ msgid "%d total"
+#~ msgstr "cəmi %d"
+
+#, fuzzy
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "İsmarışdan _Virtual Qovluq Yarat"
+
+#~ msgid "VFolder on _Subject"
+#~ msgstr "_Mövzudakı vFolder"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "Gön_dərəndəki vFolder"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "_Alıcıdakı vFolder"
+
+#~ msgid "VFolder on Mailing _List"
+#~ msgstr "Məktublaşma Q_rupundakı VFolder"
+
+#~ msgid "Filter on Sub_ject"
+#~ msgstr "Mö_vzudakı Süzgəc"
+
+#~ msgid "Filter on Sen_der"
+#~ msgstr "Gön_dərəndəki  Süzgəc"
+
+#~ msgid "Filter on Re_cipients"
+#~ msgstr "_Alıcıdakı Süzgəc"
+
+#~ msgid "Filter on _Mailing List"
+#~ msgstr "_Məktublaşma Qrupundakı Süzgəc"
+
+#~ msgid "_Edit as New Message..."
+#~ msgstr "Yeni İsmarış olaraq _Düzəlt ..."
+
+#~ msgid "_Print"
+#~ msgstr "_Çap Et"
+
+#~ msgid "_Forward"
+#~ msgstr "_Çatdır"
+
+#, fuzzy
+#~ msgid "Fla_g Completed"
+#~ msgstr "Bitirmə Tarixi"
+
+#, fuzzy
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Təmizlə"
+
+#, fuzzy
+#~ msgid "Mark as _Unread"
+#~ msgstr "Ox_unmamış olaraq İşarələ"
+
+#~ msgid "Mark as _Important"
+#~ msgstr "_Vacib olaraq İşarələ"
+
+#, fuzzy
+#~ msgid "_Mark as Unimportant"
+#~ msgstr "_Qeyri-Vacib olaraq İşarələ"
+
+#, fuzzy
+#~ msgid "U_ndelete"
+#~ msgstr "_Geri Gətir"
+
+#, fuzzy
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "Qovluğa _Daşı ..."
+
+#, fuzzy
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
+
+#, fuzzy
+#~ msgid "Appl_y Filters"
+#~ msgstr "Süzgəclər Əlavə Et"
+
+#, fuzzy
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "İsmarışdan Qa_yda Yarat"
+
+#, fuzzy
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "Məktublaşma Qrupundakı VFolder"
+
+#, fuzzy
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Məktublaşma Qrupunda Süz (%s)"
+
+#, fuzzy
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "(%s) Məktublaşma Qrupundakı VFolder"
+
+#~ msgid "Properties for \"%s\""
+#~ msgstr "\"%s\"in Seçənəkləri"
+
+#~ msgid "Properties"
+#~ msgstr "Seçənəklər"
+
+#~ msgid "Don't show this message again."
+#~ msgstr "Bu ismarışı bir də göstərmə."
+
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "Məktub alıcısını hələ quraşdırmamısınız.\n"
+#~ "Məktub yazmaq, almaq, göndərmədən əvvəl \n"
+#~ "bunu quraşdırmalısınız.\n"
+#~ "Bunu indi quraşdırmaq istəyirsiniz?"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to configure an account\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "ePoçt göndərməkdən əvvəl bir \n"
+#~ "şəxs tanıtmalısan."
+
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "ePoçt göndərməkdən əvvəl bir \n"
+#~ "şəxs tanıtmalısan."
+
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "ePoçt göndərməkdən əvvəl bir ePoçt\n"
+#~ "nəqliyyatını qurmalısan."
+
+#, fuzzy
+#~ msgid ""
+#~ "You are sending an HTML-formatted message. Please make sure that\n"
+#~ "the following recipients are willing and able to receive HTML mail:\n"
+#~ msgstr ""
+#~ "HTML şəklində imsarış göndərirsiniz, amma aşağıdakı alıcılar HTML "
+#~ "şəklində məktub istəmirlər:\n"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Yenə də yollayaq?"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Bu ismarışın mövzusu yoxdur .\n"
+#~ "Həqiqətən də göndərim?"
+
+#~ msgid ""
+#~ "Since the contact list you are sending to is configured to hide the "
+#~ "list's addresses, this message will contain only Bcc recipients."
+#~ msgstr ""
+#~ "Nə vaxta qədər ki, əlaqə siyahınız qrup ünvanıarını gizləyəcək şəkildə "
+#~ "sazlanıb, bi ismarış təkcə Bcc alıcılar daxil edəcək."
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "İsmarış təkcə Bcc alıcıları daxil edir."
+
+#~ msgid ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "Ola bilsin ki, məktub vericisi alıcılara Aydın-Yollayan başlığı ilə "
+#~ "məlumatlndırmaq istəsin.\n"
+#~ "Yenə də göndərək?"
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "Məktubu göndərə bilmək üçün alıcını da bildirməlisən."
+
+#~ msgid ""
+#~ "Unable to open the drafts folder for this account.\n"
+#~ "Would you like to use the default drafts folder?"
+#~ msgstr ""
+#~ "Bu hesab üçün lahiyə cərgəsə açıla bilmədi.\n"
+#~ "Əsas lahiyə cərgəsini işlətmək istəyirsiniz?"
+
+#~ msgid "an unknown sender"
+#~ msgstr "naməlum yollayan"
+
+#, fuzzy
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "%a, %Y-%m-%d at %H:%M, tarixidə %%s yazmışdır ki:"
+
+#~ msgid "Move message(s) to"
+#~ msgstr "İsmarış(ları) buraya daşı "
+
+#~ msgid "Copy message(s) to"
+#~ msgstr "İsmarış(ları) buraya köçürt"
+
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "Bütün `%d' ismarışlarını düzəltmək istəyirsiniz?"
+
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
+#~ "ismarışları düzəldə bilərsiniz."
+
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Sadəcə olaraq Göndərilən cərgəsinə qeyd edilən\n"
+#~ "ismarışları yeniden gönderebilirsiniz."
+
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr "Həqiqətən də bütün `%d' ismarışı yenidən yollamaq istəyirsən?"
+
+#~ msgid "No Message Selected"
+#~ msgstr "Heç İsmarış Seçilmədi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "İSmarıc alına bilmir: %s\n"
+#~ "   %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "%s onsuz da mövcuddur.\n"
+#~ "Üstünə yazmaq istəyirsiniz?"
+
+#~ msgid "Save Message As..."
+#~ msgstr "İsmarışı Fərqli Qeyd Et..."
+
+#~ msgid "Save Messages As..."
+#~ msgstr "İsmarışları Fərqli Qeyd Et..."
+
+#, fuzzy
+#~ msgid ""
+#~ "This operation will permanently erase all messages marked as\n"
+#~ "deleted. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "Bu əməliyyat silinəcəklər deyə işarələnmiş bütün məktubları həmişəlik "
+#~ "siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə bilməyəcəksiniz.\n"
+#~ "\n"
+#~ "İsmarışları həqiqətən də silək?"
+
+#~ msgid ""
+#~ "Error loading filter information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Süzgəc məlumatını yükləmə xətası:\n"
+#~ "%s"
+
+#~ msgid "Filters"
+#~ msgstr "Süzgəclər"
+
+#, fuzzy
+#~ msgid "Page %d of %d"
+#~ msgstr "%d İsmarışın %d qədərə alınır"
+
+#~ msgid "Print Message"
+#~ msgstr "İsmarışı Çap Et"
+
+#~ msgid "Printing of message failed"
+#~ msgstr "İsmarıların çap edilməsi bacarılmadı"
+
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr "Bütün %d ismarışlarını başqa pəncərədə açmaq istəyirsiniz?"
+
+#, fuzzy
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Eyni adlı bir fayl onsuz da vardır.\n"
+#~ "Üstünə yazım mı?"
+
+#~ msgid "Save Attachment"
+#~ msgstr "Yapışdırılmış Faylı Qeyd Et"
+
+#, fuzzy
+#~ msgid "Could not create temporary file '%s': %s"
+#~ msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
+
+#, fuzzy
+#~ msgid "%s is not a valid directory name."
+#~ msgstr "`%s' məktub qovluğu faylı deyildir."
+
+#, fuzzy
+#~ msgid "Save Attachment..."
+#~ msgstr "Yapışdırılmış Faylı Qeyd Et"
+
+#, fuzzy
+#~ msgid "Save all attachments..."
+#~ msgstr "Yapışdırılmış Faylı Qeyd Et"
+
+#~ msgid "View Inline"
+#~ msgstr "İçərisini Göstər"
+
+#~ msgid "Open in %s..."
+#~ msgstr "%s da(də) Aç ..."
+
+#~ msgid "View Inline (via %s)"
+#~ msgstr "İçərisini Göstər (%s ilə)"
+
+#~ msgid "Hide"
+#~ msgstr "Gizlə"
+
+#~ msgid "External Viewer"
+#~ msgstr "Xarici Göstərici"
+
+#, fuzzy
+#~ msgid "Downloading images"
+#~ msgstr "_Rəsmləri Yüklə"
+
+#~ msgid "Loading message content"
+#~ msgstr "İsmarış içindəkilər yüklənir"
+
+#, fuzzy
+#~ msgid "Overdue:"
+#~ msgstr "Ge_cikmiş işlər:"
+
+#, fuzzy
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "%b %d %l:%M %p"
+
+#~ msgid "Open Link in Browser"
+#~ msgstr "Körpünü Səyyahda Aç"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "Körpü Ünvanınə Köçür"
+
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Körpünü Fərqli qeyd et"
+
+#~ msgid "Save Image as..."
+#~ msgstr "Rəsmi Fərqli qeyd et..."
+
+#~ msgid "%s attachment"
+#~ msgstr "%s yapışdırılmış fayl"
+
+#~ msgid "Could not parse MIME message. Displaying as source."
+#~ msgstr "MIME ismarışı açıla bilmədi: Mənbə kodu gösteriliyor."
+
+#~ msgid "Bad Address"
+#~ msgstr "Səhv Ünvan"
+
+#~ msgid "Reply-To"
+#~ msgstr "Cavablama"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Bu ismarış digital olaraq imzalanmışdır. Ətraflı məlumat üçün qıfıl "
+#~ "timsalına tıqla."
+
+#, fuzzy
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "PGP təsdiq məzmunu yaradıla bilmir."
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr ""
+#~ "Bu ismarış digital olaraq imzalanmışdır və original olduğu düşünülür."
+
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr ""
+#~ "Bu ismarış digital olaraq imzalanmışdır amma original olduğu düşünülmür."
+
+#~ msgid "Pointer to FTP site (%s)"
+#~ msgstr "FTP saytını göstərən ox (%s)"
+
+#~ msgid "Pointer to local file (%s) valid at site \"%s\""
+#~ msgstr "Yerli faylyi göstərən (%s) oxu \"%s\" saytında hökmlüdür"
+
+#~ msgid "Pointer to local file (%s)"
+#~ msgstr "Yerli faylyi göstərən ox (%s)"
+
+#~ msgid "Pointer to remote data (%s)"
+#~ msgstr "Uzaq verilənlər (%s) nişanı"
+
+#~ msgid "Pointer to unknown external data (\"%s\" type)"
+#~ msgstr "Naməlum xarici məlumatı göstərən ox (\"%s\" növündə "
+
+#~ msgid "Malformed external-body part."
+#~ msgstr "Xəsərli xarici proqram parçası."
+
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Adsız İsmarış)"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Adsız İsmarış"
+
+#~ msgid "Empty Message"
+#~ msgstr "Boş İsmarış"
+
+#~ msgid "Find in Message"
+#~ msgstr "İsmarışda Axtar"
+
+#~ msgid "Case Sensitive"
+#~ msgstr "Böyük Kiçik Hərfə Həssas"
+
+#~ msgid "Search Forward"
+#~ msgstr "İrəliyə Axtar"
+
+#~ msgid "Find:"
+#~ msgstr "Axtar:"
+
+#~ msgid "Matches:"
+#~ msgstr "Oxşayır:"
+
+#~ msgid "(No subject)"
+#~ msgstr "(Mövzusuz)"
+
+#~ msgid "%s - Message"
+#~ msgstr "%s - İsmarış"
+
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "%s altındakı qovluqlar daranır (\"%s\" üstündəki)"
+
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "\"%s\" üstündəki kök səviyyəsi qovluqlar daranır"
+
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
+
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "\"%s\" qovluğuna qeydiyyat silinir"
+
+#~ msgid "No server has been selected"
+#~ msgstr "Heç verici seçilməyib"
+
+#~ msgid "Please select a server."
+#~ msgstr "Verici seçin."
+
 #~ msgid "That person is already attending the meeting!"
 #~ msgstr "Bu şəxs onsuz da iclasın dinləyicisidir!"
 
diff --git a/po/be.po b/po/be.po
index e7088f3008..224d0590a4 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,14 +4,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.be\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-15 23:12+0200\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2003-05-25 19:42GMT+2\n"
 "Last-Translator: Vital Khilko <dojlid@mova.org>\n"
 "Language-Team: belarusian <i18n@mova.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.0\n"
 
 #: addressbook/backend/ebook/e-card.c:1306
@@ -86,7 +86,6 @@ msgid "Title"
 msgstr "Пасада"
 
 #: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Роля"
@@ -122,7 +121,7 @@ msgstr "Супруг(а)"
 msgid "Anniversary"
 msgstr "Юбілей"
 
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:998
+#: addressbook/backend/ebook/e-card.c:1436
 msgid "Mailer"
 msgstr "Паштавік"
 
@@ -167,7 +166,7 @@ msgstr "Жадае HTML"
 msgid "Wants HTML set"
 msgstr "Жадае усталяваць HTML"
 
-#: addressbook/backend/ebook/e-card.c:1506
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
 msgid "List"
 msgstr "Сьпіс"
 
@@ -979,7 +978,7 @@ msgstr "Межы _пошуку:"
 
 #: addressbook/gui/component/ldap-config.glade.h:34
 #: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:611
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr "Пошук"
 
@@ -1215,7 +1214,7 @@ msgstr "Аб_межаваньне загрузкі:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:33 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -1444,10 +1443,10 @@ msgstr "_Катэгорыі..."
 #: calendar/gui/dialogs/meeting-page.c:634
 #: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
 #: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: mail/folder-browser.c:1829 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:32 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:45
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Вы_даліць"
 
@@ -2972,7 +2971,6 @@ msgid "VCard for %s"
 msgstr "VCard для %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
@@ -3632,7 +3630,7 @@ msgstr "Высокі"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:806
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
 #: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Нармальны"
@@ -3776,7 +3774,7 @@ msgstr "Немагчыма ініцыялізаваць gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "Немагчыма стварыць вытворчасьць паслугі нагадваньня"
 
-#: calendar/gui/calendar-commands.c:366
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3788,54 +3786,54 @@ msgstr ""
 "\n"
 "Выдаліць гэтыя заданьні?"
 
-#: calendar/gui/calendar-commands.c:372
+#: calendar/gui/calendar-commands.c:382
 #, fuzzy
 msgid "Purge events older than"
 msgstr "вяртае менш за"
 
-#: calendar/gui/calendar-commands.c:377
+#: calendar/gui/calendar-commands.c:387
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "дні"
 
-#: calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:478 calendar/gui/e-day-view.c:1364
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
 #: calendar/gui/e-day-view-top-item.c:266
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:485
-#: calendar/gui/calendar-commands.c:487
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:498 calendar/gui/calendar-commands.c:505
-#: calendar/gui/calendar-commands.c:511 calendar/gui/calendar-commands.c:513
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:503
+#: calendar/gui/calendar-commands.c:518
 #: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:901
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Неатрымалася стварыць акно каляндара. Калі ласка, праверце вашу усталёўку "
 "ORBit і OAF."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1527
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3939,6 +3937,11 @@ msgstr "Прагляд тыдню"
 msgid "Month View"
 msgstr "Прагляд месяцу"
 
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Прагляд карыстальніка"
+
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Агульныя зьвесткі утрымліваюць"
@@ -3951,7 +3954,7 @@ msgstr "Апісаньне ўтрымлівае"
 msgid "Comment contains"
 msgstr "Камэнтар утрымлівае"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1122
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
 msgid "Unmatched"
 msgstr "Іншая пошта"
 
@@ -3967,16 +3970,16 @@ msgstr "Мэтад не падтрымліваецца  калі адкрыва�
 msgid "Permission denied to open the calendar"
 msgstr "Адсутнічаюць правы на адкрыцьцё каляндара"
 
-#: calendar/gui/control-factory.c:122
+#: calendar/gui/control-factory.c:125
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Немагчыма адчыніць тэчку у '%s'"
 
-#: calendar/gui/control-factory.c:168
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "URI, які будзе адлюстроўваць каляндар"
 
-#: calendar/gui/control-factory.c:175
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr "Тып прагляду"
 
@@ -4254,7 +4257,7 @@ msgid "Wednesday"
 msgstr "Серада"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr "Працоўны тыдзень"
 
@@ -4706,10 +4709,9 @@ msgstr "_Час пачатку:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2082
-#: mail/folder-browser.c:1791 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
@@ -4732,54 +4734,6 @@ msgstr "Патрабуе хаця б аднаго удзельніка."
 msgid "_Delegate To..."
 msgstr "_Дэлегаваць у..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Удзельнік"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Клікніце тутака каб дадаць удзельніка"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Агульная назва"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Дэлегаваць з"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Дэлегаваць у"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Мова"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Удзельнік"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Стан"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4943,7 +4897,7 @@ msgstr ""
 "\n"
 "Вы жадаеце захаваць зьмены?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1588
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr "_Адкінуць зьмены"
 
@@ -4978,8 +4932,7 @@ msgstr "% Завершана"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-tasks.c:250
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
 #: calendar/gui/print.c:2311
 msgid "Completed"
 msgstr "Выканана"
@@ -5149,15 +5102,16 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для невядомага тыпу трэггера"
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:281
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
 msgid "Public"
 msgstr "Публічнае"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
 msgid "Private"
 msgstr "Прыватнае"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
 msgid "Confidential"
 msgstr "Сакрэтнае"
 
@@ -5221,8 +5175,7 @@ msgstr "Выдаленьне вылучаных аб'ектаў"
 
 #: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
 #: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
-#: mail/folder-browser.c:1802 shell/e-shortcuts-view.c:422
-#: ui/evolution-addressbook.xml.h:36
+#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Адкрыць"
 
@@ -5233,14 +5186,14 @@ msgstr "Адкрыць паведамленьне"
 
 #: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
 #: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: mail/folder-browser.c:1804 ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Save As..."
 msgstr "Захаваць _як..."
 
 #: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
 #: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
 #: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
@@ -5255,7 +5208,7 @@ msgstr "Вы_разаць"
 
 #: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
 #: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:31
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
 #: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
@@ -5264,7 +5217,7 @@ msgstr "_Капіяваць"
 #: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
 #: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
 #: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Уставіць"
@@ -5337,6 +5290,12 @@ msgstr "Прыярытэт"
 msgid "Start Date"
 msgstr "Дата пачатку"
 
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Стан"
+
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
@@ -5356,22 +5315,29 @@ msgstr "колер"
 msgid "component"
 msgstr "Сустрэча"
 
-#: calendar/gui/e-cal-model.c:808
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Невядома"
+
+#: calendar/gui/e-cal-model.c:828
 msgid "Recurring"
 msgstr "Паўтор"
 
-#: calendar/gui/e-cal-model.c:810
+#: calendar/gui/e-cal-model.c:830
 msgid "Assigned"
 msgstr "Прызначана"
 
-#: calendar/gui/e-cal-model.c:812 calendar/gui/e-cal-model-tasks.c:933
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
 msgid "Yes"
 msgstr "Так"
 
-#: calendar/gui/e-cal-model.c:812 calendar/gui/e-cal-model-tasks.c:933
-#: calendar/gui/e-meeting-model.c:278 calendar/gui/e-meeting-model.c:788
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
 msgid "No"
 msgstr "Не"
 
@@ -5426,7 +5392,7 @@ msgstr "Перайсьці да _сёньня"
 msgid "_Go to Date..."
 msgstr "Пера_йсьці да даты..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:36
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr "_Апублікаваць інфармацыю \"Вольны/Заняты\""
 
@@ -5633,9 +5599,7 @@ msgstr "Мейсца:"
 msgid "Status:"
 msgstr "Стан:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:801
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Прынята"
 
@@ -5643,23 +5607,11 @@ msgstr "Прынята"
 msgid "Tentatively Accepted"
 msgstr "Прынята для спробы"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:802
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Адхілена"
 
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:759
-#: calendar/gui/e-meeting-model.c:775 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:347
-#: mail/mail-display.c:1044 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Невядома"
-
 #: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
 #: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
 #: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
@@ -5689,6 +5641,11 @@ msgstr "Прыняць для спробы"
 msgid "Decline"
 msgstr "Адхіліць"
 
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
 #: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr "Даслаць інфармацыю \"Вольны/Заняты\""
@@ -5993,81 +5950,10 @@ msgstr "дата-завяршэньня"
 msgid "date-start"
 msgstr "дата-пачатку"
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr "Кіраўнікі"
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1639
-msgid "Required Participants"
-msgstr "Патрабаваныя ўдзельнікі"
-
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
-msgstr "Дадатковыя ўдзельнікі"
-
-#: calendar/gui/e-meeting-model.c:82
-msgid "Resources"
-msgstr "Рэсурсы"
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:755
-msgid "Individual"
-msgstr "Асабіста"
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:756
-msgid "Group"
-msgstr "Група"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:757
-msgid "Resource"
-msgstr "Рэсурс"
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:758
-msgid "Room"
-msgstr "Пакой"
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:771
-msgid "Chair"
-msgstr "Кіраўнік"
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:772
-msgid "Required Participant"
-msgstr "Патрабаваны ўдзельнік"
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
-msgid "Optional Participant"
-msgstr "Дадатковы удзельнік"
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
-msgid "Non-Participant"
-msgstr "Неудзельнічае"
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:800
-msgid "Needs Action"
-msgstr "Неабходна дзеяньне"
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:803 calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Пробны"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:804
-msgid "Delegated"
-msgstr "Дэлегаваны"
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
-msgstr "У выкананьні"
-
 #: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Пакінуу офіс"
@@ -6143,6 +6029,34 @@ msgstr "%A, %B %d, %Y"
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Удзельнік"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Клікніце тутака каб дадаць удзельніка"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Агульная назва"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Дэлегаваць з"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Дэлегаваць у"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Мова"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Удзельнік"
+
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
@@ -6191,12 +6105,12 @@ msgstr "Немагчыма загрузіць заданьне ў \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "Мэтад неабходны для загрузкі \"%s\" не падтрымліваецца"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1684
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Вы ня маеце правоў для адкрыцьця тэчкі ў `%s'"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1898
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6217,22 +6131,22 @@ msgstr "Выдаленьне вылучаных аб'ектаў..."
 msgid "Expunging"
 msgstr "Выкрэсьленьне"
 
-#: calendar/gui/gnome-cal.c:1656
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Немагчыма адчыніць тэчку \"%s\""
 
-#: calendar/gui/gnome-cal.c:1670
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Мэтад неабходны для адкрыцьця \"%s\" не падтрымліваецца"
 
-#: calendar/gui/gnome-cal.c:1726
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Даданьне нагадваньня для %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6243,7 +6157,7 @@ msgstr ""
 "%s\n"
 "павалілася. Вы мусіце перазагрузіць \"Эвалюцыю\" і паспрабаваць яшчэ раз"
 
-#: calendar/gui/gnome-cal.c:1924
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6254,21 +6168,21 @@ msgstr ""
 "%s\n"
 "павалілася. Вы мусіце перазагрузіць \"Эвалюцыю\" і паспрабаваць яшчэ раз"
 
-#: calendar/gui/gnome-cal.c:2130
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Адкрыцьцё календара %s"
 
-#: calendar/gui/gnome-cal.c:2151
+#: calendar/gui/gnome-cal.c:2197
 msgid "Opening default tasks folder"
 msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
 
-#: calendar/gui/gnome-cal.c:3035
+#: calendar/gui/gnome-cal.c:3094
 #, fuzzy, c-format
 msgid "Purging event %s"
 msgstr "Зандаваньне %s"
 
-#: calendar/gui/gnome-cal.c:3119
+#: calendar/gui/gnome-cal.c:3178
 #, fuzzy
 msgid "Purging"
 msgstr "Турэцкае"
@@ -6514,8 +6428,7 @@ msgid "Contacts: "
 msgstr "Кантакты: "
 
 #: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2954
-#: my-evolution/e-summary.c:649
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Перадпрагляд друку"
 
@@ -10566,7 +10479,7 @@ msgstr "Дастаўка пошты SMTP праз %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Немагчыма даслаць паведамленьне: памылковая адрэса адпраўляльніка."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr "Адпраўка паведамленьня"
 
@@ -10580,61 +10493,61 @@ msgstr ""
 "Неатрымліваецца даслаць паведамленьне: пазначаны адзін ці некалькі "
 "некарэктных атрымоўцаў"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr "Вітаньне SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Перавышаны час чаканьня адказу на запыт HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:950
 msgid "HELO response error"
 msgstr "Памылка адказу на HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "Аўтарызацыя SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "Памылка стварэньня аб'екта аўтарызацыі SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1040
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Перавышаны час чаканьня адказу на запыт AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1061
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "Памылка запыту AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1122
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Адмоўны адказ ідэнтыфікацыі ад паслужніка.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1147
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Перавышаны час чаканьня адказу на MAIL FROM: %s: пошта не даслана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1167
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr "Памылка адказу на MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1191
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Перавышаны час чаканьня адказу на RCPT TO: %s: пошта не даслана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> ня атрымалася"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Перавышаны час чаканьня адказу на DATA: %s: пошта не даслана"
@@ -10642,36 +10555,36 @@ msgstr "Перавышаны час чаканьня адказу на DATA: %s:
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1272
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 msgid "DATA response error"
 msgstr "Памылка адказу на DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Перавышаны час адпраўкі DATA: паведамленьне перарвана: %s: пошта не даслана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 msgid "DATA termination response error"
 msgstr "Збой адказу пад час перарываньня DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Перавышаны час чаканьня адказу на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "RSET response error"
 msgstr "Памылка адказу на RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Перавышаны час чаканьня адказу на запыт QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "QUIT response error"
 msgstr "Памылка адказу на QUIT"
 
@@ -10690,8 +10603,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:300 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "укладаньне"
 
@@ -10748,30 +10660,30 @@ msgstr ""
 "Памылка пад час чытаньня файла %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr "Файл існуе, перапісаць?"
 
-#: composer/e-msg-composer.c:1222
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Памылка захаваньня файла: %s"
 
-#: composer/e-msg-composer.c:1245
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Памылка пад час загрузкі файла: %s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Памылка доступу да файла: %s"
 
-#: composer/e-msg-composer.c:1291
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
 
-#: composer/e-msg-composer.c:1298
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10780,7 +10692,7 @@ msgstr ""
 "Немагчыма зрушыць па файле: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1305
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10789,7 +10701,7 @@ msgstr ""
 "Немагчыма усекчы файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1314
+#: composer/e-msg-composer.c:1325
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10798,7 +10710,7 @@ msgstr ""
 "Немагчыма скапіяваць дэскрыптар файла: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1323
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10807,7 +10719,7 @@ msgstr ""
 "Памылка аўтазахаваньня паведамленьня: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10815,7 +10727,7 @@ msgstr ""
 "\"Эвалюцыя\" адшукала незахаваныя файлы з папярэдняга сэанса.\n"
 "Жадаеце пспрабаваць аднавіць іх?"
 
-#: composer/e-msg-composer.c:1583
+#: composer/e-msg-composer.c:1594
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10826,28 +10738,28 @@ msgstr ""
 "\n"
 "Жадаеце захаваць зьмены?"
 
-#: composer/e-msg-composer.c:1592
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr "Увага: Зьмененае паведамленьне"
 
-#: composer/e-msg-composer.c:1624
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Адкрыцьцё файла"
 
-#: composer/e-msg-composer.c:2043
+#: composer/e-msg-composer.c:2054
 msgid "Signature:"
 msgstr "Подпіс:"
 
-#: composer/e-msg-composer.c:2083 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "Створана аўтаматычна"
 
-#: composer/e-msg-composer.c:2263 composer/e-msg-composer.c:2959
-#: composer/e-msg-composer.c:2960
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Стварыць паведамленьне"
 
-#: composer/e-msg-composer.c:2991
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10855,7 +10767,7 @@ msgstr ""
 "Немагчыма стварыць акно рэдактара.\n"
 "Немагчыма актывізаваць кіраваньне выбарам адрэсы."
 
-#: composer/e-msg-composer.c:3019
+#: composer/e-msg-composer.c:3030
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10867,7 +10779,7 @@ msgstr ""
 "Калі ласка, праверце карэктнасьць усталяванае вэрсыі\n"
 "gtkhtml і libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3089
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10875,7 +10787,7 @@ msgstr ""
 "Неатрымалася стварыць акно рэдактара:\n"
 "Неатрымалася актывізаваць HTML-кампанэнт рэдактара."
 
-#: composer/e-msg-composer.c:4099
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10958,7 +10870,6 @@ msgstr "Даслаць на:"
 msgid "Posting destination"
 msgstr "Мейсца прызначэньня"
 
-#: composer/e-msg-composer-select-file.c:102
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Укласьці файл(ы)"
@@ -11125,7 +11036,7 @@ msgstr ""
 "Файл з гэтай назвай ужо існуе.\n"
 "Перапісаць?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "Перапісаць файл?"
 
@@ -11703,7 +11614,7 @@ msgstr "Выраз"
 msgid "Follow Up"
 msgstr "Падняцца вышэй"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1839
+#: filter/libfilter-i18n.h:18
 msgid "Label"
 msgstr "Адмеціна"
 
@@ -11752,7 +11663,7 @@ msgstr "Адказана на"
 msgid "Score"
 msgstr "Лік"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1826
+#: filter/libfilter-i18n.h:30
 msgid "Sender"
 msgstr "Адпраўляльнік"
 
@@ -11780,8 +11691,8 @@ msgstr "Спэцыфічны загаловак"
 msgid "Stop Processing"
 msgstr "Спыніць апрацоўку"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:969
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Тэма"
 
@@ -11947,9 +11858,8 @@ msgstr "Сканаваньне %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
 #: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/folder-browser-ui.c:362 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Пошта"
 
@@ -12016,7 +11926,7 @@ msgstr "\"Эвалюцыя\" імпартуе вашыя старыя даньн
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1108 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Сьметніца"
 
@@ -12144,191 +12054,6 @@ msgstr "Далучэньне..."
 msgid "Cannot register storage with shell"
 msgstr "Неатрымалася зарэгістраваць сховішча з дапамогай абалонкі"
 
-#: mail/folder-browser.c:329 mail/mail-display.c:396 mail/mail-display.c:1033
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Неатрымалася стварыць часовы каталёг: %s"
-
-#: mail/folder-browser.c:804
-#, c-format
-msgid "%d new"
-msgstr "%d новыя"
-
-#: mail/folder-browser.c:807 mail/folder-browser.c:815
-#: mail/folder-browser.c:818
-msgid ", "
-msgstr ", "
-
-#: mail/folder-browser.c:809
-#, c-format
-msgid "%d hidden"
-msgstr "%d схаваныя"
-
-#: mail/folder-browser.c:811
-#, c-format
-msgid "%d visible"
-msgstr "%d бачныя"
-
-#: mail/folder-browser.c:816
-#, c-format
-msgid "%d selected"
-msgstr "%d выбраныя"
-
-#: mail/folder-browser.c:821
-#, c-format
-msgid "%d unsent"
-msgstr "%d недасланыя"
-
-#: mail/folder-browser.c:823
-#, c-format
-msgid "%d sent"
-msgstr "%d дасланыя"
-
-#: mail/folder-browser.c:825
-#, c-format
-msgid "%d total"
-msgstr "%d агулам"
-
-#: mail/folder-browser.c:1204
-msgid "Create _Virtual Folder From Search..."
-msgstr "Стварыць _віртуальную тэчку вынікаў пошуку..."
-
-#: mail/folder-browser.c:1775
-msgid "VFolder on _Subject"
-msgstr "Віртуальная тэчка па тэме"
-
-#: mail/folder-browser.c:1776
-msgid "VFolder on Se_nder"
-msgstr "Віртуальная тэчка па адпраўляльніку"
-
-#: mail/folder-browser.c:1777
-msgid "VFolder on _Recipients"
-msgstr "Віртуальная тэчка па атрымоўцы"
-
-#: mail/folder-browser.c:1778
-msgid "VFolder on Mailing _List"
-msgstr "Віртуальная тэчка па сьпісе рассылкі"
-
-#: mail/folder-browser.c:1782
-msgid "Filter on Sub_ject"
-msgstr "Фільтар па тэме"
-
-#: mail/folder-browser.c:1783
-msgid "Filter on Sen_der"
-msgstr "Фільтар па адпраўляльніку"
-
-#: mail/folder-browser.c:1784
-msgid "Filter on Re_cipients"
-msgstr "Фільтар па атрымоўцы"
-
-#: mail/folder-browser.c:1785 mail/folder-browser.c:2109
-msgid "Filter on _Mailing List"
-msgstr "Фільтар па сьпісе рассылкі"
-
-#: mail/folder-browser.c:1803
-msgid "_Edit as New Message..."
-msgstr "Зьмяніць як новае паведамленьне..."
-
-#: mail/folder-browser.c:1805
-msgid "_Print"
-msgstr "_Друк"
-
-#: mail/folder-browser.c:1809 ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "Адказаць адпраўляльніку"
-
-#: mail/folder-browser.c:1810 ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "Адказаць у сьпіс"
-
-#: mail/folder-browser.c:1811 ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "Адказаць усім"
-
-#: mail/folder-browser.c:1812
-msgid "_Forward"
-msgstr "_Перадаслаць"
-
-#: mail/folder-browser.c:1816
-msgid "Follo_w Up..."
-msgstr "Падняцца вышэй..."
-
-#: mail/folder-browser.c:1817
-msgid "Fla_g Completed"
-msgstr "Выкананы сьцяг"
-
-#: mail/folder-browser.c:1818
-msgid "Cl_ear Flag"
-msgstr "Ачысьціць сьцяг"
-
-#. separator here?
-#: mail/folder-browser.c:1822 ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Пазначыць як чытанае"
-
-#: mail/folder-browser.c:1823
-msgid "Mark as _Unread"
-msgstr "Пазначыць як нечытанае"
-
-#: mail/folder-browser.c:1824
-msgid "Mark as _Important"
-msgstr "Пазначыць як важнае"
-
-#: mail/folder-browser.c:1825
-msgid "_Mark as Unimportant"
-msgstr "Пазначыць як неважнае"
-
-#: mail/folder-browser.c:1830
-msgid "U_ndelete"
-msgstr "_Вярнуць"
-
-#: mail/folder-browser.c:1834
-msgid "Mo_ve to Folder..."
-msgstr "Перамясьціць у тэчку..."
-
-#: mail/folder-browser.c:1835 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "_Капіяваць у тэчку..."
-
-#: mail/folder-browser.c:1843
-msgid "Add Sender to Address_book"
-msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
-
-#: mail/folder-browser.c:1847
-msgid "Appl_y Filters"
-msgstr "_Ужыць фільтары"
-
-#: mail/folder-browser.c:1851
-msgid "Crea_te Rule From Message"
-msgstr "Стварыць правіла з паведамленьня"
-
-#: mail/folder-browser.c:2110
-msgid "VFolder on M_ailing List"
-msgstr "Віртуальная тэчка па сьпісе рассылкі"
-
-#: mail/folder-browser.c:2112
-#, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Фільтар па сьпісе рассылкі (%s)"
-
-#: mail/folder-browser.c:2113
-#, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "Віртуальная тэчка па сьпісе рассылкі (%s)"
-
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Дапомна"
-
-#: mail/folder-browser-ui.c:475
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Уласьцівасьці для \"%s\""
-
-#: mail/folder-browser-ui.c:477
-msgid "Properties"
-msgstr "Уласьцівасьці"
-
 #: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Атрыманьне інфармацыі па тэчке"
@@ -12507,16 +12232,16 @@ msgstr "[Дапомна]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Уключана"
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 msgid "Account name"
 msgstr "Назва уліковага запіса"
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 msgid "Protocol"
 msgstr "Пратакол"
 
@@ -12559,215 +12284,6 @@ msgstr ""
 "    '%s'\n"
 "І будзе абноўлена."
 
-#: mail/mail-callbacks.c:101
-msgid "Don't show this message again."
-msgstr "Неадлюстроўваць гэтае паведамленьне нанова."
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Вы не наладзілі паштовага кліента.\n"
-"Вам трэба зрабіць гэта да тагочасу, як вы здолееце\n"
-"дасылаць, атрымліваць ці рэдагаваць пошту.\n"
-"Вы жадаеце наладзіць гэта зараз?"
-
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-"Вы мусіце наладзіць уліковы запіс\n"
-"да таго як стварыць паведамленьне."
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Вы мусіце наладзіць карыстальніка\n"
-"да таго як вы здолееце дасылаць пошту."
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Вы мусіце наладзіць перадачу пошты\n"
-"да таго як вы здолееце даслаць пошту."
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-"Вы дасылаеце паведамленьне фарматаванае ў HTML. Калі ласка,\n"
-"упэўніцеся што наступныя атрымоўцы жадаюць і могуць атрымліваць\n"
-"пошту у фармаце HTML:\n"
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "Даслаць у любым выпадку?"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Гэтае паведамленьне ня мае тэмы.\n"
-"Даслаць яго?"
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "Гэтае паведамленьне утрымлівае толькі атрымоўцаў схаванае копіі."
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Вы мусіце пазначыць атрымоўцаў, каб даслаць гэтае паведамленьне."
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Неатрымалася адкрыць тэчку чарнавікоў для гэтага рахунка.\n"
-"Жадаеце дапомна выкарыстоўваць тэчку чарнавікоў?"
-
-#: mail/mail-callbacks.c:1190
-msgid "an unknown sender"
-msgstr "невядомы адпраўляльнік"
-
-#. translators: attribution string used when quoting messages
-#: mail/mail-callbacks.c:1199
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a, %Y-%m-%d у %H:%M, %%s піша:"
-
-#: mail/mail-callbacks.c:1706 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "Перамясьціць паведамленьне(і) ў"
-
-#: mail/mail-callbacks.c:1708 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "Капіяваць паведамленьне(і) ў"
-
-#: mail/mail-callbacks.c:2350
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "Вы упэўненыя што жадаеце даслаць усе %d паведамленьні?"
-
-#: mail/mail-callbacks.c:2366
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Вы можаце даслаць толькі паведамленьні\n"
-"захаваныя ў тэчцы \"Чарнавікі\"."
-
-#: mail/mail-callbacks.c:2399
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Вы можаце толькі перадасылаць паведамленьні\n"
-"з тэчкі \"Дасланыя\"."
-
-#: mail/mail-callbacks.c:2409
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "Вы упэўненыя што жадаеце перадаслаць усе %d паведамленьні?"
-
-#: mail/mail-callbacks.c:2430
-msgid "No Message Selected"
-msgstr "Паведамленьне ня выбрана"
-
-#: mail/mail-callbacks.c:2471
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"Немагчыма захаваць у `%s'\n"
-" %s"
-
-#: mail/mail-callbacks.c:2476
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"`%s' ужо існуе.\n"
-"Перазапісаць?"
-
-#: mail/mail-callbacks.c:2517
-msgid "Save Message As..."
-msgstr "Захаваць паведамлеьне як..."
-
-#: mail/mail-callbacks.c:2519
-msgid "Save Messages As..."
-msgstr "Захаваць паведамленьні як..."
-
-#: mail/mail-callbacks.c:2692
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"Гэтая апэрацыя прывядзе да поўнага вынішчэньня усіх паведамленьняў\n"
-"пазначаных як выдаленыя. Калі вы працягніце, гэтае нельга будзе аднавіць.\n"
-"\n"
-"Сапраўды сьцёрці паведамленьні?"
-
-#: mail/mail-callbacks.c:2787
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Памылка пад час загрузкі інфармацыі фільтара:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2795
-msgid "Filters"
-msgstr "Фільтары"
-
-#: mail/mail-callbacks.c:2836
-#, c-format
-msgid "Page %d of %d"
-msgstr "Аркуш %d з %d"
-
-#: mail/mail-callbacks.c:2892
-msgid "Print Message"
-msgstr "Друк паведамленьня"
-
-#: mail/mail-callbacks.c:2960
-msgid "Printing of message failed"
-msgstr "Збой друку паведамленьня"
-
-#: mail/mail-callbacks.c:3155
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr ""
-"Вы упэўненыя што жадаеце адкрыць усе %d паведамленьні ў асобных вокнах?"
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12976,6 +12492,10 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Дапомна"
 
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Дапомна"
+
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Дапомныя паводзіны"
@@ -13425,202 +12945,11 @@ msgstr "Выкарыстоўваць тойжа шрыфт што і аснат�
 msgid "description"
 msgstr "апісаньне"
 
-#: mail/mail-display.c:197
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Файл `%s' ужо існуе.\n"
-"Перапісаць яго?"
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr "Захаваць укладаньне"
-
-#: mail/mail-display.c:411
-#, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "Немагчыма стварыць часовы файл '%s': %s"
-
-#: mail/mail-display.c:461
-#, fuzzy, c-format
-msgid "%s is not a valid directory name."
-msgstr "\"%s\" не зьяўляецца паштовым каталёгам."
-
-#: mail/mail-display.c:508
-msgid "Select Directory for Attachments"
-msgstr ""
-
-#: mail/mail-display.c:582
-msgid "Save Attachment..."
-msgstr "Захаваць укладаньне..."
-
-#: mail/mail-display.c:583
-#, fuzzy
-msgid "Save all attachments..."
-msgstr "Захаваць укладаньне..."
-
-#: mail/mail-display.c:584
-msgid "View Inline"
-msgstr "Убудаваны прагляд"
-
-#: mail/mail-display.c:585
-#, c-format
-msgid "Open in %s..."
-msgstr "Адкрыць у %s..."
-
-#: mail/mail-display.c:652
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Убудаваны прагляд (праз %s)"
-
-#: mail/mail-display.c:656
-msgid "Hide"
-msgstr "Схаваць"
-
-#: mail/mail-display.c:678
-msgid "External Viewer"
-msgstr "Вонкавы праглядальнік"
-
-#: mail/mail-display.c:1484
-msgid "Downloading images"
-msgstr "Загрузка відарысаў"
-
-#: mail/mail-display.c:1661
-msgid "Loading message content"
-msgstr "Загрузка зьместу паведамленьня"
-
-#: mail/mail-display.c:2003
-msgid "Overdue:"
-msgstr "Пратэрмінавана:"
-
-#: mail/mail-display.c:2007
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "да %B %d, %Y, %l:%M %P"
-
-#: mail/mail-display.c:2371
-msgid "Open Link in Browser"
-msgstr "Адкрыць спасылку ў аглядальніке"
-
-#: mail/mail-display.c:2372
-msgid "Copy Link Location"
-msgstr "Скапіяваць спасылку"
-
-#: mail/mail-display.c:2374
-msgid "Save Link as (FIXME)"
-msgstr "Захаваць спасылку як"
-
-#: mail/mail-display.c:2376
-msgid "Save Image as..."
-msgstr "Захаваць відарыс як..."
-
 #: mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Зандаваньне %s"
 
-#: mail/mail-format.c:666
-#, c-format
-msgid "%s attachment"
-msgstr "%s укладаньне"
-
-#: mail/mail-format.c:708 mail/mail-format.c:1412 mail/mail-format.c:1483
-#: mail/mail-format.c:1603 mail/mail-format.c:1727 mail/mail-format.c:1752
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
-
-#: mail/mail-format.c:794 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
-
-#. Timezone conversion crossed midnight. Show day
-#. translators: strftime format for local time equivalent in Date header display
-#: mail/mail-format.c:811
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#: mail/mail-format.c:813
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/mail-format.c:906
-msgid "Bad Address"
-msgstr "Кепская адрэса"
-
-#: mail/mail-format.c:947 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Ад каго"
-
-#: mail/mail-format.c:951
-msgid "Reply-To"
-msgstr "Адказаць на"
-
-#: mail/mail-format.c:956 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Каму"
-
-#: mail/mail-format.c:961
-msgid "Cc"
-msgstr "Копія"
-
-#: mail/mail-format.c:966
-msgid "Bcc"
-msgstr "Сх.копія"
-
-#: mail/mail-format.c:1526
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Гэта паведамленьне мае лічбавы подпіс. Клікніце па значке замка для "
-"дадатковых зьвестак."
-
-#: mail/mail-format.c:1554
-msgid "Could not create a PGP verfication context"
-msgstr "Неатрымалася стварыць кантэкст праверкі PGP"
-
-#: mail/mail-format.c:1562
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-"Гэта паведамленьне з лічбавым подпісам, які прайшоў праверку тоеснасьці."
-
-#: mail/mail-format.c:1569
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
-"тоеснасьць."
-
-#: mail/mail-format.c:1833
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Указальнік на FTP сайт (%s)"
-
-#: mail/mail-format.c:1844
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Указальнік на лякальны файл (%s), даступны на сайце \"%s\""
-
-#: mail/mail-format.c:1847
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Указальнік на лакальны файл (%s)"
-
-#: mail/mail-format.c:1874
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Указальнік на аддаленыя даньні (%s)"
-
-#: mail/mail-format.c:1880
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Указальнік на невядомыя вонкавыя даньні (тыпа \"%s\")"
-
-#: mail/mail-format.c:1882
-msgid "Malformed external-body part."
-msgstr "Часка external-body памылкова сфармаваная"
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
@@ -13697,119 +13026,119 @@ msgstr "Фільтраваньне тэчкі"
 msgid "Fetching Mail"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-ops.c:559
+#: mail/mail-ops.c:557
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:580
+#: mail/mail-ops.c:578
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:589
+#: mail/mail-ops.c:587
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:631
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Адпраўленьне \"%s\""
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Адпраўленьне паведамленьня %d з %d"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Збой на паведамленьні %d з %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr "Выканана."
 
-#: mail/mail-ops.c:864
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "Захаваньне паведамленьня ў тэчцы"
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перамяшчэньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Капіяваньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:1058
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканаваньне тэчак у \"%s\""
 
-#: mail/mail-ops.c:1246
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr "Перадасланыя паведамленьні"
 
-#: mail/mail-ops.c:1289
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/mail-ops.c:1361
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr "Адкрыцьцё сховішча %s"
 
-#: mail/mail-ops.c:1439
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr "Выдаленьне тэчкі %s"
 
-#: mail/mail-ops.c:1533
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr "Абнаўленьне тэчкі"
 
-#: mail/mail-ops.c:1620 mail/mail-ops.c:1671
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr "Выкрэсьленьне тэчкі"
 
-#: mail/mail-ops.c:1668
+#: mail/mail-ops.c:1666
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Спусташэньне сьметніцы ў \"%s\""
 
-#: mail/mail-ops.c:1669 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Лакальныя тэчкі"
 
-#: mail/mail-ops.c:1744
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Атрыманьне паведамленьня %s"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Атрыманьне %d паведамленьняў"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Захаваньне %d паведамленьняў"
 
-#: mail/mail-ops.c:1948
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13818,7 +13147,7 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1976
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13827,11 +13156,11 @@ msgstr ""
 "Памылка захаваньня паведамленьняў у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Захаваньне ўкладаньня"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13840,53 +13169,21 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2094
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Адлучэньне ад %s"
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Перадалучэньне да %s"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Паведамленьне бяз назвы)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Паведамленьне бяз назвы"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Пустое паведамленьне"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "Пошук у паведамленьні"
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr "Улічваць рэгістар"
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "Пошук наперад"
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr "Пошук:"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Супадзеньні:"
-
 #: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr "Адмена..."
@@ -14031,15 +13328,6 @@ msgstr "Спроба рэдагаваць віртуальную тэчку '%s'
 msgid "New VFolder"
 msgstr "Новая віртуальная тэчка"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Бяз тэмы)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - Паведамленьне"
-
 #: mail/message-list.c:900
 msgid "Unseen"
 msgstr "Нечытанае"
@@ -14104,6 +13392,10 @@ msgstr "%b %d %Y"
 msgid "Generating message list"
 msgstr "Стварэньне сьпісу паведамленьняў"
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Дата"
+
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Умоўлена да"
@@ -14120,6 +13412,10 @@ msgstr "Пазначана"
 msgid "Follow Up Flag"
 msgstr "Сьцяг \"Да выкананьня\""
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Ад каго"
+
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Зыходнае разьмяшчэньне"
@@ -14132,6 +13428,10 @@ msgstr "Атрымана"
 msgid "Size"
 msgstr "Памер"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Каму"
+
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Выклік"
@@ -14190,39 +13490,6 @@ msgstr "Умоўлена да:"
 msgid "_Flag:"
 msgstr "_Сьцяг:"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "Сканаваньне тэчак у %s на \"%s\""
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "Сканаваньне карэнных тэчак у \"%s\""
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Падпісваньне на тэчку \"%s\""
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Адмаўленьне ад тэчкі \"%s\""
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Тэчка"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "Небыў выбраны паслужнік"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Калі ласка, выбярыце паслужнік."
-
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Тэчка з падпіскамі"
@@ -26940,6 +26207,10 @@ msgstr "Гэтая апэрацыя не працуе ў адлучаным рэ
 msgid "Checkbox"
 msgstr "Пазначальнік"
 
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Тэчка"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -27387,7 +26658,7 @@ msgstr "Перамясьціць кантакты у іншую тэчку"
 msgid "Move to Folder..."
 msgstr "Перамясьціць у тэчку..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "Уставіць з буфэра абмену"
 
@@ -27395,7 +26666,7 @@ msgstr "Уставіць з буфэра абмену"
 msgid "Previews the contacts to be printed"
 msgstr "Прагледзіць выгляд кантактаў у друку"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
@@ -27441,7 +26712,7 @@ msgstr "Спыніць загрузку"
 msgid "View the current contact"
 msgstr "Прагледзіць бягучы кантакт"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:30
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
@@ -27451,6 +26722,10 @@ msgstr "Прагледзіць бягучы кантакт"
 msgid "_Actions"
 msgstr "_Дзеяньні"
 
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "_Капіяваць у тэчку..."
+
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Перадаслаць кантакт..."
@@ -27519,49 +26794,54 @@ msgstr "Ісьці да пазначанай даты"
 msgid "Go to today"
 msgstr "Перайсьці да сёньня"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "Месяц"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr "Прагледзіць выгляд каляндара ў друку"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Надрукаваць гэты каляндар"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Апублікаваць інфармацыю \"Вольны/Заняты\" для гэтага каляндара"
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Старонка"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Публічная тэчка утрымлівае сустрэчы і падзеі"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Show as list"
+msgstr "Паказаць падрабязнасьці"
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr "Паказаць адзень"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr "Паказаць адзін месяц"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr "Паказаць адзін тыдзень"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Паказаць працоўны тыдзень"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr "Тыдзень"
 
@@ -28082,6 +27362,10 @@ msgstr "Павялічыць памер тэкста"
 msgid "Load _Images"
 msgstr "Загрузіць відарысы"
 
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr "Пазначыць як чытанае"
+
 #: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr "Пазначыць як важнае"
@@ -28187,6 +27471,14 @@ msgstr "Пера_накіраваць"
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "Адказаць усім"
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr "Адказаць у сьпіс"
+
 #: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr "Скінуць тэкст да ягонага арыгінальнага памера"
@@ -28317,6 +27609,10 @@ msgstr "Папярэдняе паведамленьне"
 msgid "_Quoted"
 msgstr "_Цытавана"
 
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr "Адказаць адпраўляльніку"
+
 #: ui/evolution-mail-message.xml.h:119
 msgid "_Resend..."
 msgstr "Перадаслаць..."
@@ -29101,6 +28397,489 @@ msgstr "Праграма лакальнага каляндара \"Эвалюц�
 msgid "Evolution Addressbook local file backend"
 msgstr "Праграма лакальнай кнігі адрэсаў \"Эвалюцыі\""
 
+#~ msgid "Chair Persons"
+#~ msgstr "Кіраўнікі"
+
+#~ msgid "Required Participants"
+#~ msgstr "Патрабаваныя ўдзельнікі"
+
+#~ msgid "Optional Participants"
+#~ msgstr "Дадатковыя ўдзельнікі"
+
+#~ msgid "Resources"
+#~ msgstr "Рэсурсы"
+
+#~ msgid "Individual"
+#~ msgstr "Асабіста"
+
+#~ msgid "Group"
+#~ msgstr "Група"
+
+#~ msgid "Resource"
+#~ msgstr "Рэсурс"
+
+#~ msgid "Room"
+#~ msgstr "Пакой"
+
+#~ msgid "Chair"
+#~ msgstr "Кіраўнік"
+
+#~ msgid "Required Participant"
+#~ msgstr "Патрабаваны ўдзельнік"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Дадатковы удзельнік"
+
+#~ msgid "Non-Participant"
+#~ msgstr "Неудзельнічае"
+
+#~ msgid "Needs Action"
+#~ msgstr "Неабходна дзеяньне"
+
+#~ msgid "Delegated"
+#~ msgstr "Дэлегаваны"
+
+#~ msgid "In Process"
+#~ msgstr "У выкананьні"
+
+#~ msgid "Could not create temporary directory: %s"
+#~ msgstr "Неатрымалася стварыць часовы каталёг: %s"
+
+#~ msgid "%d new"
+#~ msgstr "%d новыя"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "%d hidden"
+#~ msgstr "%d схаваныя"
+
+#~ msgid "%d visible"
+#~ msgstr "%d бачныя"
+
+#~ msgid "%d selected"
+#~ msgstr "%d выбраныя"
+
+#~ msgid "%d unsent"
+#~ msgstr "%d недасланыя"
+
+#~ msgid "%d sent"
+#~ msgstr "%d дасланыя"
+
+#~ msgid "%d total"
+#~ msgstr "%d агулам"
+
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "Стварыць _віртуальную тэчку вынікаў пошуку..."
+
+#~ msgid "VFolder on _Subject"
+#~ msgstr "Віртуальная тэчка па тэме"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "Віртуальная тэчка па адпраўляльніку"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "Віртуальная тэчка па атрымоўцы"
+
+#~ msgid "VFolder on Mailing _List"
+#~ msgstr "Віртуальная тэчка па сьпісе рассылкі"
+
+#~ msgid "Filter on Sub_ject"
+#~ msgstr "Фільтар па тэме"
+
+#~ msgid "Filter on Sen_der"
+#~ msgstr "Фільтар па адпраўляльніку"
+
+#~ msgid "Filter on Re_cipients"
+#~ msgstr "Фільтар па атрымоўцы"
+
+#~ msgid "Filter on _Mailing List"
+#~ msgstr "Фільтар па сьпісе рассылкі"
+
+#~ msgid "_Edit as New Message..."
+#~ msgstr "Зьмяніць як новае паведамленьне..."
+
+#~ msgid "_Print"
+#~ msgstr "_Друк"
+
+#~ msgid "_Forward"
+#~ msgstr "_Перадаслаць"
+
+#~ msgid "Follo_w Up..."
+#~ msgstr "Падняцца вышэй..."
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "Выкананы сьцяг"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Ачысьціць сьцяг"
+
+#~ msgid "Mark as _Unread"
+#~ msgstr "Пазначыць як нечытанае"
+
+#~ msgid "Mark as _Important"
+#~ msgstr "Пазначыць як важнае"
+
+#~ msgid "_Mark as Unimportant"
+#~ msgstr "Пазначыць як неважнае"
+
+#~ msgid "U_ndelete"
+#~ msgstr "_Вярнуць"
+
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "Перамясьціць у тэчку..."
+
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
+
+#~ msgid "Appl_y Filters"
+#~ msgstr "_Ужыць фільтары"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Стварыць правіла з паведамленьня"
+
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "Віртуальная тэчка па сьпісе рассылкі"
+
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Фільтар па сьпісе рассылкі (%s)"
+
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "Віртуальная тэчка па сьпісе рассылкі (%s)"
+
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Уласьцівасьці для \"%s\""
+
+#~ msgid "Properties"
+#~ msgstr "Уласьцівасьці"
+
+#~ msgid "Don't show this message again."
+#~ msgstr "Неадлюстроўваць гэтае паведамленьне нанова."
+
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "Вы не наладзілі паштовага кліента.\n"
+#~ "Вам трэба зрабіць гэта да тагочасу, як вы здолееце\n"
+#~ "дасылаць, атрымліваць ці рэдагаваць пошту.\n"
+#~ "Вы жадаеце наладзіць гэта зараз?"
+
+#~ msgid ""
+#~ "You need to configure an account\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Вы мусіце наладзіць уліковы запіс\n"
+#~ "да таго як стварыць паведамленьне."
+
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Вы мусіце наладзіць карыстальніка\n"
+#~ "да таго як вы здолееце дасылаць пошту."
+
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Вы мусіце наладзіць перадачу пошты\n"
+#~ "да таго як вы здолееце даслаць пошту."
+
+#~ msgid ""
+#~ "You are sending an HTML-formatted message. Please make sure that\n"
+#~ "the following recipients are willing and able to receive HTML mail:\n"
+#~ msgstr ""
+#~ "Вы дасылаеце паведамленьне фарматаванае ў HTML. Калі ласка,\n"
+#~ "упэўніцеся што наступныя атрымоўцы жадаюць і могуць атрымліваць\n"
+#~ "пошту у фармаце HTML:\n"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Даслаць у любым выпадку?"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Гэтае паведамленьне ня мае тэмы.\n"
+#~ "Даслаць яго?"
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "Гэтае паведамленьне утрымлівае толькі атрымоўцаў схаванае копіі."
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "Вы мусіце пазначыць атрымоўцаў, каб даслаць гэтае паведамленьне."
+
+#~ msgid ""
+#~ "Unable to open the drafts folder for this account.\n"
+#~ "Would you like to use the default drafts folder?"
+#~ msgstr ""
+#~ "Неатрымалася адкрыць тэчку чарнавікоў для гэтага рахунка.\n"
+#~ "Жадаеце дапомна выкарыстоўваць тэчку чарнавікоў?"
+
+#~ msgid "an unknown sender"
+#~ msgstr "невядомы адпраўляльнік"
+
+#, fuzzy
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "%a, %Y-%m-%d у %H:%M, %%s піша:"
+
+#~ msgid "Move message(s) to"
+#~ msgstr "Перамясьціць паведамленьне(і) ў"
+
+#~ msgid "Copy message(s) to"
+#~ msgstr "Капіяваць паведамленьне(і) ў"
+
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "Вы упэўненыя што жадаеце даслаць усе %d паведамленьні?"
+
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Вы можаце даслаць толькі паведамленьні\n"
+#~ "захаваныя ў тэчцы \"Чарнавікі\"."
+
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Вы можаце толькі перадасылаць паведамленьні\n"
+#~ "з тэчкі \"Дасланыя\"."
+
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr "Вы упэўненыя што жадаеце перадаслаць усе %d паведамленьні?"
+
+#~ msgid "No Message Selected"
+#~ msgstr "Паведамленьне ня выбрана"
+
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Немагчыма захаваць у `%s'\n"
+#~ " %s"
+
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "`%s' ужо існуе.\n"
+#~ "Перазапісаць?"
+
+#~ msgid "Save Message As..."
+#~ msgstr "Захаваць паведамлеьне як..."
+
+#~ msgid "Save Messages As..."
+#~ msgstr "Захаваць паведамленьні як..."
+
+#~ msgid ""
+#~ "This operation will permanently erase all messages marked as\n"
+#~ "deleted. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "Гэтая апэрацыя прывядзе да поўнага вынішчэньня усіх паведамленьняў\n"
+#~ "пазначаных як выдаленыя. Калі вы працягніце, гэтае нельга будзе "
+#~ "аднавіць.\n"
+#~ "\n"
+#~ "Сапраўды сьцёрці паведамленьні?"
+
+#~ msgid ""
+#~ "Error loading filter information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Памылка пад час загрузкі інфармацыі фільтара:\n"
+#~ "%s"
+
+#~ msgid "Filters"
+#~ msgstr "Фільтары"
+
+#~ msgid "Page %d of %d"
+#~ msgstr "Аркуш %d з %d"
+
+#~ msgid "Print Message"
+#~ msgstr "Друк паведамленьня"
+
+#~ msgid "Printing of message failed"
+#~ msgstr "Збой друку паведамленьня"
+
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr ""
+#~ "Вы упэўненыя што жадаеце адкрыць усе %d паведамленьні ў асобных вокнах?"
+
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Файл `%s' ужо існуе.\n"
+#~ "Перапісаць яго?"
+
+#~ msgid "Save Attachment"
+#~ msgstr "Захаваць укладаньне"
+
+#~ msgid "Could not create temporary file '%s': %s"
+#~ msgstr "Немагчыма стварыць часовы файл '%s': %s"
+
+#, fuzzy
+#~ msgid "%s is not a valid directory name."
+#~ msgstr "\"%s\" не зьяўляецца паштовым каталёгам."
+
+#~ msgid "Save Attachment..."
+#~ msgstr "Захаваць укладаньне..."
+
+#, fuzzy
+#~ msgid "Save all attachments..."
+#~ msgstr "Захаваць укладаньне..."
+
+#~ msgid "View Inline"
+#~ msgstr "Убудаваны прагляд"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Адкрыць у %s..."
+
+#~ msgid "View Inline (via %s)"
+#~ msgstr "Убудаваны прагляд (праз %s)"
+
+#~ msgid "Hide"
+#~ msgstr "Схаваць"
+
+#~ msgid "External Viewer"
+#~ msgstr "Вонкавы праглядальнік"
+
+#~ msgid "Downloading images"
+#~ msgstr "Загрузка відарысаў"
+
+#~ msgid "Loading message content"
+#~ msgstr "Загрузка зьместу паведамленьня"
+
+#~ msgid "Overdue:"
+#~ msgstr "Пратэрмінавана:"
+
+#, fuzzy
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "да %B %d, %Y, %l:%M %P"
+
+#~ msgid "Open Link in Browser"
+#~ msgstr "Адкрыць спасылку ў аглядальніке"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "Скапіяваць спасылку"
+
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Захаваць спасылку як"
+
+#~ msgid "Save Image as..."
+#~ msgstr "Захаваць відарыс як..."
+
+#~ msgid "%s attachment"
+#~ msgstr "%s укладаньне"
+
+#~ msgid "Could not parse MIME message. Displaying as source."
+#~ msgstr ""
+#~ "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
+
+#~ msgid "Bad Address"
+#~ msgstr "Кепская адрэса"
+
+#~ msgid "Reply-To"
+#~ msgstr "Адказаць на"
+
+#~ msgid "Cc"
+#~ msgstr "Копія"
+
+#~ msgid "Bcc"
+#~ msgstr "Сх.копія"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Гэта паведамленьне мае лічбавы подпіс. Клікніце па значке замка для "
+#~ "дадатковых зьвестак."
+
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "Неатрымалася стварыць кантэкст праверкі PGP"
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr ""
+#~ "Гэта паведамленьне з лічбавым подпісам, які прайшоў праверку тоеснасьці."
+
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr ""
+#~ "Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
+#~ "тоеснасьць."
+
+#~ msgid "Pointer to FTP site (%s)"
+#~ msgstr "Указальнік на FTP сайт (%s)"
+
+#~ msgid "Pointer to local file (%s) valid at site \"%s\""
+#~ msgstr "Указальнік на лякальны файл (%s), даступны на сайце \"%s\""
+
+#~ msgid "Pointer to local file (%s)"
+#~ msgstr "Указальнік на лакальны файл (%s)"
+
+#~ msgid "Pointer to remote data (%s)"
+#~ msgstr "Указальнік на аддаленыя даньні (%s)"
+
+#~ msgid "Pointer to unknown external data (\"%s\" type)"
+#~ msgstr "Указальнік на невядомыя вонкавыя даньні (тыпа \"%s\")"
+
+#~ msgid "Malformed external-body part."
+#~ msgstr "Часка external-body памылкова сфармаваная"
+
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Паведамленьне бяз назвы)"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Паведамленьне бяз назвы"
+
+#~ msgid "Empty Message"
+#~ msgstr "Пустое паведамленьне"
+
+#~ msgid "Find in Message"
+#~ msgstr "Пошук у паведамленьні"
+
+#~ msgid "Case Sensitive"
+#~ msgstr "Улічваць рэгістар"
+
+#~ msgid "Search Forward"
+#~ msgstr "Пошук наперад"
+
+#~ msgid "Find:"
+#~ msgstr "Пошук:"
+
+#~ msgid "Matches:"
+#~ msgstr "Супадзеньні:"
+
+#~ msgid "(No subject)"
+#~ msgstr "(Бяз тэмы)"
+
+#~ msgid "%s - Message"
+#~ msgstr "%s - Паведамленьне"
+
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "Сканаваньне тэчак у %s на \"%s\""
+
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "Сканаваньне карэнных тэчак у \"%s\""
+
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "Падпісваньне на тэчку \"%s\""
+
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "Адмаўленьне ад тэчкі \"%s\""
+
+#~ msgid "No server has been selected"
+#~ msgstr "Небыў выбраны паслужнік"
+
+#~ msgid "Please select a server."
+#~ msgstr "Калі ласка, выбярыце паслужнік."
+
 #~ msgid "That person is already attending the meeting!"
 #~ msgstr "Гэты чалавек ужо ўдзельнічае у нарадзе!"
 
diff --git a/po/bg.po b/po/bg.po
index 824cae441b..b24bd8c268 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-15 23:12+0200\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2002-08-16 02:00+0300\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 0.9.6\n"
 
 #: addressbook/backend/ebook/e-card.c:1306
@@ -93,7 +93,6 @@ msgid "Title"
 msgstr "Титла"
 
 #: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Роля"
@@ -129,7 +128,7 @@ msgstr "Съпруг(а)"
 msgid "Anniversary"
 msgstr "Годишнина"
 
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:998
+#: addressbook/backend/ebook/e-card.c:1436
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -181,7 +180,7 @@ msgstr ""
 msgid "Wants HTML set"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1506
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "List"
 msgstr "Листа"
@@ -1034,7 +1033,7 @@ msgstr "Обхват на търсенето: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
 #: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:611
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr "Търся"
 
@@ -1226,7 +1225,7 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:33 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -1471,10 +1470,10 @@ msgstr "Ка_тегорий..."
 #: calendar/gui/dialogs/meeting-page.c:634
 #: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
 #: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: mail/folder-browser.c:1829 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:32 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:45
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Изтрий"
 
@@ -3033,7 +3032,6 @@ msgid "VCard for %s"
 msgstr "VCard за %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
@@ -3713,7 +3711,7 @@ msgstr "Високо"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:806
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
 #: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Нормално"
@@ -3854,7 +3852,7 @@ msgstr "Не мога да инициализирам gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:366
+#: calendar/gui/calendar-commands.c:376
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3867,54 +3865,54 @@ msgstr ""
 "\n"
 "Действително ли да изтрия съобщенията?"
 
-#: calendar/gui/calendar-commands.c:372
+#: calendar/gui/calendar-commands.c:382
 #, fuzzy
 msgid "Purge events older than"
 msgstr "е по малко от"
 
-#: calendar/gui/calendar-commands.c:377
+#: calendar/gui/calendar-commands.c:387
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "дни"
 
-#: calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:478 calendar/gui/e-day-view.c:1364
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
 #: calendar/gui/e-day-view-top-item.c:266
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:485
-#: calendar/gui/calendar-commands.c:487
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:498 calendar/gui/calendar-commands.c:505
-#: calendar/gui/calendar-commands.c:511 calendar/gui/calendar-commands.c:513
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:503
+#: calendar/gui/calendar-commands.c:518
 #: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:901
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Не мога да създам календарен изглед. Моля проверете настройките на ORBit и "
 "OAF"
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1527
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -4031,6 +4029,11 @@ msgstr "Изглед за Седмица"
 msgid "Month View"
 msgstr "Изгел за Месец"
 
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "_Текущ Преглед"
+
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Съдържания на Обобщен"
@@ -4043,7 +4046,7 @@ msgstr "Съдържания на описание"
 msgid "Comment contains"
 msgstr "Съдържание на Коментар"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1122
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
 msgid "Unmatched"
 msgstr "Несъвпадащ"
 
@@ -4061,16 +4064,16 @@ msgstr ""
 msgid "Permission denied to open the calendar"
 msgstr "Отказан достъп"
 
-#: calendar/gui/control-factory.c:122
+#: calendar/gui/control-factory.c:125
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/control-factory.c:168
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "URI, което ще се показва в календара"
 
-#: calendar/gui/control-factory.c:175
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr ""
 
@@ -4357,7 +4360,7 @@ msgid "Wednesday"
 msgstr "Сряда"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr "Работна Седмица"
 
@@ -4816,10 +4819,9 @@ msgstr "Начало:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2082
-#: mail/folder-browser.c:1791 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
@@ -4842,55 +4844,6 @@ msgstr "Необходим е поне един участник."
 msgid "_Delegate To..."
 msgstr "_Делегира На.."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-#, fuzzy
-msgid "Click here to add an attendee"
-msgstr "* Натиснете тук за да добавите контакт *"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Общо име"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Делегиран От"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Делегиран На"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Език"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Член"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Статус"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -5060,7 +5013,7 @@ msgstr ""
 "\n"
 "Искате ли да запазите промените?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1588
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5099,8 +5052,7 @@ msgstr "% Приключено"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-tasks.c:250
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
 #: calendar/gui/print.c:2311
 msgid "Completed"
 msgstr "Приключено"
@@ -5270,15 +5222,16 @@ msgstr "%s в %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s е неизвестен тип за превключване"
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:281
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
 msgid "Public"
 msgstr "Публичен"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
 msgid "Private"
 msgstr "Частен"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
 msgid "Confidential"
 msgstr "Конфиденциален"
 
@@ -5342,8 +5295,7 @@ msgstr "Изтрий избраните обекти"
 
 #: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
 #: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
-#: mail/folder-browser.c:1802 shell/e-shortcuts-view.c:422
-#: ui/evolution-addressbook.xml.h:36
+#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Отвори"
 
@@ -5354,14 +5306,14 @@ msgstr "Отваря _Съобщение"
 
 #: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
 #: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: mail/folder-browser.c:1804 ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Save As..."
 msgstr "Запази като..."
 
 #: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
 #: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
 #: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
@@ -5376,7 +5328,7 @@ msgstr "Отрежи"
 
 #: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
 #: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:31
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
 #: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
@@ -5385,7 +5337,7 @@ msgstr "Копирай"
 #: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
 #: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
 #: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Постави"
@@ -5461,6 +5413,12 @@ msgstr "Приоритет"
 msgid "Start Date"
 msgstr "Начална Дата"
 
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Статус"
+
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
@@ -5481,22 +5439,29 @@ msgstr " цвят"
 msgid "component"
 msgstr "Среща"
 
-#: calendar/gui/e-cal-model.c:808
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Неизвестен"
+
+#: calendar/gui/e-cal-model.c:828
 msgid "Recurring"
 msgstr "Повтарям"
 
-#: calendar/gui/e-cal-model.c:810
+#: calendar/gui/e-cal-model.c:830
 msgid "Assigned"
 msgstr "Назначен"
 
-#: calendar/gui/e-cal-model.c:812 calendar/gui/e-cal-model-tasks.c:933
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
 msgid "Yes"
 msgstr "Да"
 
-#: calendar/gui/e-cal-model.c:812 calendar/gui/e-cal-model-tasks.c:933
-#: calendar/gui/e-meeting-model.c:278 calendar/gui/e-meeting-model.c:788
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
 msgid "No"
 msgstr "Не"
 
@@ -5552,7 +5517,7 @@ msgstr "Отиди на _Днес"
 msgid "_Go to Date..."
 msgstr "Отиди _на Дата..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:36
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr "_Потребителска Информация"
 
@@ -5773,9 +5738,7 @@ msgstr "_Местонахождение: "
 msgid "Status:"
 msgstr "_Статус:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:801
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Приет"
 
@@ -5784,23 +5747,11 @@ msgstr "Приет"
 msgid "Tentatively Accepted"
 msgstr "Временно приема"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:802
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Отказан"
 
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:759
-#: calendar/gui/e-meeting-model.c:775 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:347
-#: mail/mail-display.c:1044 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Неизвестен"
-
 #: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
 #: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
 #: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
@@ -5830,6 +5781,11 @@ msgstr "Временно приема"
 msgid "Decline"
 msgstr "Откажи"
 
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
 #: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr "Изпрати Информация Свободен/Зает"
@@ -6139,82 +6095,10 @@ msgstr "крайна дата"
 msgid "date-start"
 msgstr "начална дата"
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr "Председателствуващ"
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1639
-msgid "Required Participants"
-msgstr "Членове"
-
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
-msgstr "Допълнителни Членове"
-
-#: calendar/gui/e-meeting-model.c:82
-#, fuzzy
-msgid "Resources"
-msgstr "Ресурс"
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:755
-msgid "Individual"
-msgstr "Индивидуално"
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:756
-msgid "Group"
-msgstr "Група"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:757
-msgid "Resource"
-msgstr "Ресурс"
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:758
-msgid "Room"
-msgstr "Помещение"
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:771
-msgid "Chair"
-msgstr "Председателствуващ"
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:772
-msgid "Required Participant"
-msgstr "Заявен Участник"
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
-msgid "Optional Participant"
-msgstr "Допълнителен Участник"
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
-msgid "Non-Participant"
-msgstr "Не Участник"
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:800
-msgid "Needs Action"
-msgstr "Необходими Действия"
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:803 calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Пробен"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:804
-msgid "Delegated"
-msgstr "Делегиран"
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
-msgstr "В Прогрес"
-
 #: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Извън Офиса"
@@ -6290,6 +6174,35 @@ msgstr "%A, %B %d, %Y"
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Натиснете тук за да добавите контакт *"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Общо име"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Делегиран От"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Делегиран На"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Език"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Член"
+
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
@@ -6338,12 +6251,12 @@ msgstr "Не мога да заредя задачи в `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Метода заявен за зареждане на `%s' не се подържа"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1684
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1898
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6365,22 +6278,22 @@ msgstr "Изтрий избраните обекти"
 msgid "Expunging"
 msgstr "Изтриване на папка"
 
-#: calendar/gui/gnome-cal.c:1656
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/gnome-cal.c:1670
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метода заявен за отваряне на `%s' не се подържа"
 
-#: calendar/gui/gnome-cal.c:1726
+#: calendar/gui/gnome-cal.c:1772
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Аларма на %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6388,7 +6301,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1924
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6396,22 +6309,22 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2130
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Отвори календар в %s"
 
-#: calendar/gui/gnome-cal.c:2151
+#: calendar/gui/gnome-cal.c:2197
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Отваряне на папка %s"
 
-#: calendar/gui/gnome-cal.c:3035
+#: calendar/gui/gnome-cal.c:3094
 #, fuzzy, c-format
 msgid "Purging event %s"
 msgstr "Сканира на \"%s\""
 
-#: calendar/gui/gnome-cal.c:3119
+#: calendar/gui/gnome-cal.c:3178
 #, fuzzy
 msgid "Purging"
 msgstr "Торино"
@@ -6667,8 +6580,7 @@ msgid "Contacts: "
 msgstr "Контакти:"
 
 #: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2954
-#: my-evolution/e-summary.c:649
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Печатен Преглед"
 
@@ -10724,7 +10636,7 @@ msgstr "SMTP поща през %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Не мога да изпратя съобщение: невалиден адрес на изпращача."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr "Изпращане на съпбщението"
 
@@ -10737,63 +10649,63 @@ msgstr "Не мога да изпратя съобщение: няма зада�
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Не мога да изпратя съобщение: няма зададен получател"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr "SMTP Поздравления"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "AUTH заявка по таймаут: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:950
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET върна грешка: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "SMTP Удостоверение"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "Грешка при създаване на SASL оторизация"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1040
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH заявка по таймаут: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1061
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "AUTH заявката пропадна"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1122
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Лош отговор за оторизация от сървъра.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1147
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM от заявката таймаут %s пощата не е изпратена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1167
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM грешен отговор  %s: пощата не е изпратена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1191
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10801,38 +10713,38 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1272
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET върна грешка: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Грешна оторизация отговори сървъра."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET върна грешка: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH заявка по таймаут: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET върна грешка: %s"
@@ -10852,8 +10764,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:300 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "прикачен"
 
@@ -10912,30 +10823,30 @@ msgstr ""
 "Грешка при четеен на файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr "Файла съществува. Да го презапиша?"
 
-#: composer/e-msg-composer.c:1222
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Грешка при съхранението на файл: %s"
 
-#: composer/e-msg-composer.c:1245
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Грешка при зареждането на файл: %s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Грешка при достъп на файл: %s"
 
-#: composer/e-msg-composer.c:1291
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Не мога да получа съобщение от редактора"
 
-#: composer/e-msg-composer.c:1298
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10944,7 +10855,7 @@ msgstr ""
 "Не мога да намеря във файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1305
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10953,7 +10864,7 @@ msgstr ""
 "Не мога да отрежа файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1314
+#: composer/e-msg-composer.c:1325
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10962,7 +10873,7 @@ msgstr ""
 "Не мога да намеря във файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1323
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10971,7 +10882,7 @@ msgstr ""
 "Грешка при автоматичното запазване на файл: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10979,7 +10890,7 @@ msgstr ""
 "Ximian Evolution намери незапазени файлове от предишната сесия.\n"
 "Искате ли да се опитам да ги възстановя?"
 
-#: composer/e-msg-composer.c:1583
+#: composer/e-msg-composer.c:1594
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10990,35 +10901,35 @@ msgstr ""
 "\n"
 "Искате ли да запазите промените?"
 
-#: composer/e-msg-composer.c:1592
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr "Предупреждение: Модифицирано Съобщение"
 
-#: composer/e-msg-composer.c:1624
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Отвори файл"
 
-#: composer/e-msg-composer.c:2043
+#: composer/e-msg-composer.c:2054
 #, fuzzy
 msgid "Signature:"
 msgstr "Запазва сигнатура"
 
-#: composer/e-msg-composer.c:2083 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2263 composer/e-msg-composer.c:2959
-#: composer/e-msg-composer.c:2960
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Напиши Съобщение"
 
-#: composer/e-msg-composer.c:2991
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3019
+#: composer/e-msg-composer.c:3030
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11026,13 +10937,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3089
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4099
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11115,7 +11026,6 @@ msgstr "Порто"
 msgid "Posting destination"
 msgstr "Няма Описание"
 
-#: composer/e-msg-composer-select-file.c:102
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -11284,7 +11194,7 @@ msgstr ""
 "Файл със същото име вече съществува.\n"
 "Да го презапиша ли?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "Презаписване на файл?"
 
@@ -11882,7 +11792,7 @@ msgstr "Израз"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1839
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Label"
 msgstr "Лаурел"
@@ -11934,7 +11844,7 @@ msgstr "Отговаря на"
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1826
+#: filter/libfilter-i18n.h:30
 msgid "Sender"
 msgstr "Изпращач:"
 
@@ -11963,8 +11873,8 @@ msgstr "Специфично заглавие"
 msgid "Stop Processing"
 msgstr "Прекрати Обработката"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:969
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Тема"
 
@@ -12141,9 +12051,8 @@ msgstr "Сканира на \"%s\""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
 #: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/folder-browser-ui.c:362 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Поща"
 
@@ -12210,7 +12119,7 @@ msgstr "Evolution импортира вашите стари дани от Netsc
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1108 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Кошче"
 
@@ -12349,202 +12258,6 @@ msgstr "Свързване със сървъра..."
 msgid "Cannot register storage with shell"
 msgstr "Не мога да регистрирам хранилището със shell"
 
-#: mail/folder-browser.c:329 mail/mail-display.c:396 mail/mail-display.c:1033
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Не мога да създам временна директория: %s"
-
-#: mail/folder-browser.c:804
-#, c-format
-msgid "%d new"
-msgstr "%d нов"
-
-#: mail/folder-browser.c:807 mail/folder-browser.c:815
-#: mail/folder-browser.c:818
-msgid ", "
-msgstr ", "
-
-#: mail/folder-browser.c:809
-#, c-format
-msgid "%d hidden"
-msgstr "%d скрит"
-
-#: mail/folder-browser.c:811
-#, c-format
-msgid "%d visible"
-msgstr ""
-
-#: mail/folder-browser.c:816
-#, c-format
-msgid "%d selected"
-msgstr " %d избрано"
-
-#: mail/folder-browser.c:821
-#, c-format
-msgid "%d unsent"
-msgstr " %d неизпратено"
-
-#: mail/folder-browser.c:823
-#, c-format
-msgid "%d sent"
-msgstr " %d изпратено"
-
-#: mail/folder-browser.c:825
-#, c-format
-msgid "%d total"
-msgstr "%d общо"
-
-#: mail/folder-browser.c:1204
-#, fuzzy
-msgid "Create _Virtual Folder From Search..."
-msgstr "Създава Виртуална _Папка От Съобщение"
-
-#: mail/folder-browser.c:1775
-msgid "VFolder on _Subject"
-msgstr "VFolder върху _Тема"
-
-#: mail/folder-browser.c:1776
-msgid "VFolder on Se_nder"
-msgstr "_vПапка на Изпращач"
-
-#: mail/folder-browser.c:1777
-msgid "VFolder on _Recipients"
-msgstr "v_Папка на Получатели"
-
-#: mail/folder-browser.c:1778
-msgid "VFolder on Mailing _List"
-msgstr "Филтър върху _Mailing List"
-
-#: mail/folder-browser.c:1782
-msgid "Filter on Sub_ject"
-msgstr "Филтър върху Т_ема"
-
-#: mail/folder-browser.c:1783
-msgid "Filter on Sen_der"
-msgstr "Филтър върху Из_пращач"
-
-#: mail/folder-browser.c:1784
-msgid "Filter on Re_cipients"
-msgstr "Филтър върху По_лучатели"
-
-#: mail/folder-browser.c:1785 mail/folder-browser.c:2109
-msgid "Filter on _Mailing List"
-msgstr "Филтър върху Mailing _List"
-
-#: mail/folder-browser.c:1803
-msgid "_Edit as New Message..."
-msgstr "Редактирай като ново съобщение..."
-
-#: mail/folder-browser.c:1805
-msgid "_Print"
-msgstr "Печат"
-
-#: mail/folder-browser.c:1809 ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "Отговори на подателя"
-
-#: mail/folder-browser.c:1810 ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "Отговори на списъка"
-
-#: mail/folder-browser.c:1811 ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "Отговори на всички"
-
-#: mail/folder-browser.c:1812
-msgid "_Forward"
-msgstr "Препрати"
-
-#: mail/folder-browser.c:1816
-msgid "Follo_w Up..."
-msgstr ""
-
-#: mail/folder-browser.c:1817
-#, fuzzy
-msgid "Fla_g Completed"
-msgstr "Приключено"
-
-#: mail/folder-browser.c:1818
-#, fuzzy
-msgid "Cl_ear Flag"
-msgstr "Изчисти"
-
-#. separator here?
-#: mail/folder-browser.c:1822 ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Отбележи: прочетено"
-
-#: mail/folder-browser.c:1823
-#, fuzzy
-msgid "Mark as _Unread"
-msgstr "Отбележи: непрочетено"
-
-#: mail/folder-browser.c:1824
-msgid "Mark as _Important"
-msgstr "Маркира като В_ажно"
-
-#: mail/folder-browser.c:1825
-#, fuzzy
-msgid "_Mark as Unimportant"
-msgstr "Маркирай като Не_важни"
-
-#: mail/folder-browser.c:1830
-#, fuzzy
-msgid "U_ndelete"
-msgstr "Възстанови изтрито"
-
-#: mail/folder-browser.c:1834
-#, fuzzy
-msgid "Mo_ve to Folder..."
-msgstr "Премести в Папка..."
-
-#: mail/folder-browser.c:1835 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "Копирай в Папка..."
-
-#: mail/folder-browser.c:1843
-#, fuzzy
-msgid "Add Sender to Address_book"
-msgstr "Добави подателя в адресната книга"
-
-#: mail/folder-browser.c:1847
-#, fuzzy
-msgid "Appl_y Filters"
-msgstr "Приложи Филтри"
-
-#: mail/folder-browser.c:1851
-#, fuzzy
-msgid "Crea_te Rule From Message"
-msgstr "Създай правило от съобщението"
-
-#: mail/folder-browser.c:2110
-#, fuzzy
-msgid "VFolder on M_ailing List"
-msgstr "ВПапка по пощенски списък"
-
-#: mail/folder-browser.c:2112
-#, fuzzy, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Филтър по пощенски списък (%s)"
-
-#: mail/folder-browser.c:2113
-#, fuzzy, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "ВПапка по пощенски списък (%s)"
-
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "По подразбиране"
-
-#: mail/folder-browser-ui.c:475
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Свойства за \"%s\""
-
-#: mail/folder-browser-ui.c:477
-msgid "Properties"
-msgstr "Свойства"
-
 #: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Получавам информация за папка"
@@ -12739,17 +12452,17 @@ msgstr "По подразбиране"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Разрешен"
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 #, fuzzy
 msgid "Account name"
 msgstr "Потребителско име:"
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 #, fuzzy
 msgid "Protocol"
 msgstr "Пуерто Рико"
@@ -12790,218 +12503,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:101
-msgid "Don't show this message again."
-msgstr "Не показвай това съобщение отново."
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Не сте конфигурирали Вашият mail клиент.\n"
-"Трябва да го направите за да може да изпращате,\n"
-"получавате или пишете поща.\n"
-"Искате ли да го конфигурурате сега?"
-
-#: mail/mail-callbacks.c:212
-#, fuzzy
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-"Необходимо е да конфигурирате потребител\n"
-"преди да създадете поща."
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Необходимо е да конфигурирате потребител\n"
-"преди да създадете поща."
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Необходимо е да конфигурирате транспорт на поща\n"
-"преди да създадете поща."
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-#, fuzzy
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-"Вие изпращате HTML-форматирано съобщение, но следните получатели не искат "
-"HTML форматирана поща:\n"
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "Изпрати въпреки това?"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Съобщението няма Тема.\n"
-"Найстина ли да го изпратя?"
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "Това съобщение съдържа само Bcc получател."
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Трябва да укажете получател(и) за да може да изпратите съобщението."
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Не мога да отворя папката чернова за този акаунт.\n"
-"Искате ли да използвате подразбираща се?"
-
-#: mail/mail-callbacks.c:1190
-msgid "an unknown sender"
-msgstr "неизвестен изпрашач"
-
-#. translators: attribution string used when quoting messages
-#: mail/mail-callbacks.c:1199
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "На %a, %Y-%m-%d в %H:%M, %%s записа:"
-
-#: mail/mail-callbacks.c:1706 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "Премести съобщени(ето/ята) в"
-
-#: mail/mail-callbacks.c:1708 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "Копирай съобщени(ето/ята) в"
-
-#: mail/mail-callbacks.c:2350
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "Сигурен ли сте, че искате да редактирате всички %d съобщения?"
-
-#: mail/mail-callbacks.c:2366
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Можете да редактирате само съобщения записани\n"
-"в папката Drafts."
-
-#: mail/mail-callbacks.c:2399
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Можете да изпращате отново само съобщения записани\n"
-"в папката Sent."
-
-#: mail/mail-callbacks.c:2409
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "Сигурен ли сте, че искате да препратите всичките %d съобщения?"
-
-#: mail/mail-callbacks.c:2430
-msgid "No Message Selected"
-msgstr "Няма Избрано Съобщение"
-
-#: mail/mail-callbacks.c:2471
-#, fuzzy, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"Не мога да взема съобщение: %s\n"
-"  %s"
-
-#: mail/mail-callbacks.c:2476
-#, fuzzy, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"%s вече съществува\n"
-"Искате ли да го презапишете?"
-
-#: mail/mail-callbacks.c:2517
-msgid "Save Message As..."
-msgstr "Съхрани Съобщението Като..."
-
-#: mail/mail-callbacks.c:2519
-msgid "Save Messages As..."
-msgstr "Съхрани Съобщението Като..."
-
-#: mail/mail-callbacks.c:2692
-#, fuzzy
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"Тази операция ще изтрие за постоянно всички съобщения маркирани за "
-"изтриване. Ако продължите, вие няма да сте в състояние да възстановите тези "
-"съобщения.\n"
-"\n"
-"Действително ли да изтрия съобщенията?"
-
-#: mail/mail-callbacks.c:2787
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Грешка при зареждане информацията за финтъра:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2795
-msgid "Filters"
-msgstr "Филтри"
-
-#: mail/mail-callbacks.c:2836
-#, fuzzy, c-format
-msgid "Page %d of %d"
-msgstr "Получаване на съобщение номер %d от %d"
-
-#: mail/mail-callbacks.c:2892
-msgid "Print Message"
-msgstr "Отпечатай Съобщението"
-
-#: mail/mail-callbacks.c:2960
-msgid "Printing of message failed"
-msgstr "Отпечатването неуспешно"
-
-#: mail/mail-callbacks.c:3155
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr ""
-"Сигурен ли сте, че искате да отворите всички %d съобщения в отделни прозорци?"
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 #, fuzzy
@@ -13242,6 +12743,10 @@ msgstr ""
 msgid "De_fault"
 msgstr "По Подразбиране"
 
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "По подразбиране"
+
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
@@ -13741,209 +13246,11 @@ msgstr ""
 msgid "description"
 msgstr "описание"
 
-#: mail/mail-display.c:197
-#, fuzzy, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Файл със същото име вече съществува.\n"
-"Да го презапиша ли?"
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr "Запазва Прикачен"
-
-#: mail/mail-display.c:411
-#, fuzzy, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "Не мога да създам временна директория: %s"
-
-#: mail/mail-display.c:461
-#, fuzzy, c-format
-msgid "%s is not a valid directory name."
-msgstr "`%s' не е maildir директория."
-
-#: mail/mail-display.c:508
-msgid "Select Directory for Attachments"
-msgstr ""
-
-#: mail/mail-display.c:582
-#, fuzzy
-msgid "Save Attachment..."
-msgstr "Запазва Прикачен"
-
-#: mail/mail-display.c:583
-#, fuzzy
-msgid "Save all attachments..."
-msgstr "Запазва Прикачен"
-
-#: mail/mail-display.c:584
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:585
-#, c-format
-msgid "Open in %s..."
-msgstr "Отвори в %s..."
-
-#: mail/mail-display.c:652
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:656
-msgid "Hide"
-msgstr "Скрий"
-
-#: mail/mail-display.c:678
-msgid "External Viewer"
-msgstr "Външен Viewer"
-
-#: mail/mail-display.c:1484
-#, fuzzy
-msgid "Downloading images"
-msgstr "Зарежда _Картинки"
-
-#: mail/mail-display.c:1661
-msgid "Loading message content"
-msgstr "Зареждам съсдържанието на съобщението"
-
-#: mail/mail-display.c:2003
-#, fuzzy
-msgid "Overdue:"
-msgstr "П_ресрочени задачи:"
-
-#: mail/mail-display.c:2007
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/mail-display.c:2371
-msgid "Open Link in Browser"
-msgstr "_Отвори Указател в Браузер"
-
-#: mail/mail-display.c:2372
-msgid "Copy Link Location"
-msgstr "Копира местоположениет на указател"
-
-#: mail/mail-display.c:2374
-msgid "Save Link as (FIXME)"
-msgstr "Запазва указателя като (FIXME)"
-
-#: mail/mail-display.c:2376
-msgid "Save Image as..."
-msgstr "Съхрани картинка като..."
-
 #: mail/mail-folder-cache.c:832
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Сканира на \"%s\""
 
-#: mail/mail-format.c:666
-#, c-format
-msgid "%s attachment"
-msgstr "%s прикачен"
-
-#: mail/mail-format.c:708 mail/mail-format.c:1412 mail/mail-format.c:1483
-#: mail/mail-format.c:1603 mail/mail-format.c:1727 mail/mail-format.c:1752
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
-
-#: mail/mail-format.c:794 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
-
-#. Timezone conversion crossed midnight. Show day
-#. translators: strftime format for local time equivalent in Date header display
-#: mail/mail-format.c:811
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#: mail/mail-format.c:813
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/mail-format.c:906
-msgid "Bad Address"
-msgstr "Грешен Адрес"
-
-#: mail/mail-format.c:947 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "От"
-
-#: mail/mail-format.c:951
-msgid "Reply-To"
-msgstr "Отговор-До"
-
-#: mail/mail-format.c:956 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "До"
-
-#: mail/mail-format.c:961
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/mail-format.c:966
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/mail-format.c:1526
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
-"повече информация."
-
-#: mail/mail-format.c:1554
-#, fuzzy
-msgid "Could not create a PGP verfication context"
-msgstr "Не мога да създам контекст за проверка на PGP"
-
-#: mail/mail-format.c:1562
-#, fuzzy
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-"Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
-"повече информация."
-
-#: mail/mail-format.c:1569
-#, fuzzy
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
-"повече информация."
-
-#: mail/mail-format.c:1833
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Указател към FTP сайт (%s)"
-
-#: mail/mail-format.c:1844
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Указател към локален файл (%s) валиден на сайта \"%s\""
-
-#: mail/mail-format.c:1847
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Указател към локален файл (%s)"
-
-#: mail/mail-format.c:1874
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Указател към отдалечени данни (%s)"
-
-#: mail/mail-format.c:1880
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Указател към неизвестни външни данни (\"%s\" type)"
-
-#: mail/mail-format.c:1882
-msgid "Malformed external-body part."
-msgstr ""
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, fuzzy, c-format
 msgid "Local folders/%s"
@@ -14022,119 +13329,119 @@ msgstr "Филтър върху папка"
 msgid "Fetching Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-ops.c:559
+#: mail/mail-ops.c:557
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспех при запазване на поща във времен файл %s: %s"
 
-#: mail/mail-ops.c:580
+#: mail/mail-ops.c:578
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:589
+#: mail/mail-ops.c:587
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Неуспех при запазване на поща във времен файл %s: %s"
 
-#: mail/mail-ops.c:631
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Изпращане на \"%s\""
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Изпращане на съпбщение %d от %d"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Грешка на съобщение %d от %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr "Приключено."
 
-#: mail/mail-ops.c:864
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "Запазва съобщението в папка"
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премести съобщени в %s"
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копиране на съобщението в %s"
 
-#: mail/mail-ops.c:1058
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканиране на папки в \"%s\""
 
-#: mail/mail-ops.c:1246
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr "Препратени съобщения"
 
-#: mail/mail-ops.c:1289
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отваряне на папка %s"
 
-#: mail/mail-ops.c:1361
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr "Отваря хранилище %s"
 
-#: mail/mail-ops.c:1439
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr "Изтривам папка %s"
 
-#: mail/mail-ops.c:1533
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr "Освежаване на папка"
 
-#: mail/mail-ops.c:1620 mail/mail-ops.c:1671
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr "Изтриване на папка"
 
-#: mail/mail-ops.c:1668
+#: mail/mail-ops.c:1666
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Импортира %s като %s"
 
-#: mail/mail-ops.c:1669 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Локални Папки"
 
-#: mail/mail-ops.c:1744
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получавам съобщение %s"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Получавам %d съобщение"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Съхраняване на %d съобщения"
 
-#: mail/mail-ops.c:1948
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14143,7 +13450,7 @@ msgstr ""
 "Не мога да създам изходен файл: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1976
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14152,11 +13459,11 @@ msgstr ""
 "Грешка при запазване на съобщения в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Запазвам прикачено"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14165,53 +13472,21 @@ msgstr ""
 "Не мога да създам изходен файл: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2094
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Разкачване от %s"
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Отново връзка с %s"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Неименувано Съобщение)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Неименувано Съобщение"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Празно Съобщение"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "Търси в съобщението"
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr "Със значение на малки/големи букви"
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "Търси нататък"
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr "Намери:"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Съвпадения:"
-
 #: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr "Прекратяване..."
@@ -14356,15 +13631,6 @@ msgstr "Опит за редактиране на vпапка '%s' която н
 msgid "New VFolder"
 msgstr "Нов VFolder"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Няма тема)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - съобщение"
-
 #: mail/message-list.c:900
 msgid "Unseen"
 msgstr "Непрегледано"
@@ -14429,6 +13695,10 @@ msgstr "%b %d %Y"
 msgid "Generating message list"
 msgstr "Генерирам списък на съобщенията"
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Дата"
+
 #: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
@@ -14447,6 +13717,10 @@ msgstr "Маркирано"
 msgid "Follow Up Flag"
 msgstr ""
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "От"
+
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
@@ -14460,6 +13734,10 @@ msgstr "Получено"
 msgid "Size"
 msgstr "Размер"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "До"
+
 #: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
@@ -14525,39 +13803,6 @@ msgstr "Дължим"
 msgid "_Flag:"
 msgstr "Име на файл:"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "Сканиране на папки под %s на \"%s\""
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "Сканиране на папки в основно ниво на \"%s\""
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Абонамент за папка \"%s\""
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Отписване от папка \"%s\""
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Папка"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "Не е избран сървър"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Моля, изберете сървър."
-
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -26612,6 +25857,10 @@ msgstr ""
 msgid "Checkbox"
 msgstr "Чико"
 
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Папка"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -27083,7 +26332,7 @@ msgstr "Премести избраните съобщения в нова па�
 msgid "Move to Folder..."
 msgstr "Премести в Папка..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "Поставя съдържанието на буфера за обмен"
 
@@ -27091,7 +26340,7 @@ msgstr "Поставя съдържанието на буфера за обме�
 msgid "Previews the contacts to be printed"
 msgstr "Преглед на контактите за печат"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
@@ -27138,7 +26387,7 @@ msgstr "Прекрати Зареждането"
 msgid "View the current contact"
 msgstr "текущото време"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:30
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
@@ -27148,6 +26397,10 @@ msgstr "текущото време"
 msgid "_Actions"
 msgstr "_Действия"
 
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "Копирай в Папка..."
+
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Напред в Контакти..."
@@ -27220,49 +26473,54 @@ msgstr "Отва на определена дата"
 msgid "Go to today"
 msgstr "Отиди на днес"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "Месец"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr "Преглед на календар за печат"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Отпечатай този календар"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Публична Свободна/Заета информация за този календар"
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Бургес"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Папката съдържа срещи и събития"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Show as list"
+msgstr "Показва Детайли"
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr "Покажи един ден"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr "Покажи един месец"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr "Покажи една седмица"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Покажи работната седмица"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr "Седмица"
 
@@ -27797,6 +27055,10 @@ msgstr "Увеличава размера на текст"
 msgid "Load _Images"
 msgstr "Зарежда _Картинки"
 
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr "Отбележи: прочетено"
+
 #: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr "Маркира като Важно"
@@ -27914,6 +27176,14 @@ msgstr ""
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Препраща избраното съобщение за някой"
 
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "Отговори на всички"
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr "Отговори на списъка"
+
 #: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr "Възстановява текста в неговият оригинален размер"
@@ -28050,6 +27320,10 @@ msgstr "Предишно Съобщение"
 msgid "_Quoted"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr "Отговори на подателя"
+
 #: ui/evolution-mail-message.xml.h:119
 #, fuzzy
 msgid "_Resend..."
@@ -28876,6 +28150,502 @@ msgstr "Календар на Evolution iTip/iMip преглед"
 msgid "Evolution Addressbook local file backend"
 msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
 
+#~ msgid "Chair Persons"
+#~ msgstr "Председателствуващ"
+
+#~ msgid "Required Participants"
+#~ msgstr "Членове"
+
+#~ msgid "Optional Participants"
+#~ msgstr "Допълнителни Членове"
+
+#, fuzzy
+#~ msgid "Resources"
+#~ msgstr "Ресурс"
+
+#~ msgid "Individual"
+#~ msgstr "Индивидуално"
+
+#~ msgid "Group"
+#~ msgstr "Група"
+
+#~ msgid "Resource"
+#~ msgstr "Ресурс"
+
+#~ msgid "Room"
+#~ msgstr "Помещение"
+
+#~ msgid "Chair"
+#~ msgstr "Председателствуващ"
+
+#~ msgid "Required Participant"
+#~ msgstr "Заявен Участник"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Допълнителен Участник"
+
+#~ msgid "Non-Participant"
+#~ msgstr "Не Участник"
+
+#~ msgid "Needs Action"
+#~ msgstr "Необходими Действия"
+
+#~ msgid "Delegated"
+#~ msgstr "Делегиран"
+
+#~ msgid "In Process"
+#~ msgstr "В Прогрес"
+
+#~ msgid "Could not create temporary directory: %s"
+#~ msgstr "Не мога да създам временна директория: %s"
+
+#~ msgid "%d new"
+#~ msgstr "%d нов"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "%d hidden"
+#~ msgstr "%d скрит"
+
+#~ msgid "%d selected"
+#~ msgstr " %d избрано"
+
+#~ msgid "%d unsent"
+#~ msgstr " %d неизпратено"
+
+#~ msgid "%d sent"
+#~ msgstr " %d изпратено"
+
+#~ msgid "%d total"
+#~ msgstr "%d общо"
+
+#, fuzzy
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "Създава Виртуална _Папка От Съобщение"
+
+#~ msgid "VFolder on _Subject"
+#~ msgstr "VFolder върху _Тема"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "_vПапка на Изпращач"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "v_Папка на Получатели"
+
+#~ msgid "VFolder on Mailing _List"
+#~ msgstr "Филтър върху _Mailing List"
+
+#~ msgid "Filter on Sub_ject"
+#~ msgstr "Филтър върху Т_ема"
+
+#~ msgid "Filter on Sen_der"
+#~ msgstr "Филтър върху Из_пращач"
+
+#~ msgid "Filter on Re_cipients"
+#~ msgstr "Филтър върху По_лучатели"
+
+#~ msgid "Filter on _Mailing List"
+#~ msgstr "Филтър върху Mailing _List"
+
+#~ msgid "_Edit as New Message..."
+#~ msgstr "Редактирай като ново съобщение..."
+
+#~ msgid "_Print"
+#~ msgstr "Печат"
+
+#~ msgid "_Forward"
+#~ msgstr "Препрати"
+
+#, fuzzy
+#~ msgid "Fla_g Completed"
+#~ msgstr "Приключено"
+
+#, fuzzy
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Изчисти"
+
+#, fuzzy
+#~ msgid "Mark as _Unread"
+#~ msgstr "Отбележи: непрочетено"
+
+#~ msgid "Mark as _Important"
+#~ msgstr "Маркира като В_ажно"
+
+#, fuzzy
+#~ msgid "_Mark as Unimportant"
+#~ msgstr "Маркирай като Не_важни"
+
+#, fuzzy
+#~ msgid "U_ndelete"
+#~ msgstr "Възстанови изтрито"
+
+#, fuzzy
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "Премести в Папка..."
+
+#, fuzzy
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Добави подателя в адресната книга"
+
+#, fuzzy
+#~ msgid "Appl_y Filters"
+#~ msgstr "Приложи Филтри"
+
+#, fuzzy
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Създай правило от съобщението"
+
+#, fuzzy
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "ВПапка по пощенски списък"
+
+#, fuzzy
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Филтър по пощенски списък (%s)"
+
+#, fuzzy
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "ВПапка по пощенски списък (%s)"
+
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Свойства за \"%s\""
+
+#~ msgid "Properties"
+#~ msgstr "Свойства"
+
+#~ msgid "Don't show this message again."
+#~ msgstr "Не показвай това съобщение отново."
+
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "Не сте конфигурирали Вашият mail клиент.\n"
+#~ "Трябва да го направите за да може да изпращате,\n"
+#~ "получавате или пишете поща.\n"
+#~ "Искате ли да го конфигурурате сега?"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to configure an account\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Необходимо е да конфигурирате потребител\n"
+#~ "преди да създадете поща."
+
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Необходимо е да конфигурирате потребител\n"
+#~ "преди да създадете поща."
+
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Необходимо е да конфигурирате транспорт на поща\n"
+#~ "преди да създадете поща."
+
+#, fuzzy
+#~ msgid ""
+#~ "You are sending an HTML-formatted message. Please make sure that\n"
+#~ "the following recipients are willing and able to receive HTML mail:\n"
+#~ msgstr ""
+#~ "Вие изпращате HTML-форматирано съобщение, но следните получатели не искат "
+#~ "HTML форматирана поща:\n"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Изпрати въпреки това?"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Съобщението няма Тема.\n"
+#~ "Найстина ли да го изпратя?"
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "Това съобщение съдържа само Bcc получател."
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "Трябва да укажете получател(и) за да може да изпратите съобщението."
+
+#~ msgid ""
+#~ "Unable to open the drafts folder for this account.\n"
+#~ "Would you like to use the default drafts folder?"
+#~ msgstr ""
+#~ "Не мога да отворя папката чернова за този акаунт.\n"
+#~ "Искате ли да използвате подразбираща се?"
+
+#~ msgid "an unknown sender"
+#~ msgstr "неизвестен изпрашач"
+
+#, fuzzy
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "На %a, %Y-%m-%d в %H:%M, %%s записа:"
+
+#~ msgid "Move message(s) to"
+#~ msgstr "Премести съобщени(ето/ята) в"
+
+#~ msgid "Copy message(s) to"
+#~ msgstr "Копирай съобщени(ето/ята) в"
+
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "Сигурен ли сте, че искате да редактирате всички %d съобщения?"
+
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Можете да редактирате само съобщения записани\n"
+#~ "в папката Drafts."
+
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Можете да изпращате отново само съобщения записани\n"
+#~ "в папката Sent."
+
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr "Сигурен ли сте, че искате да препратите всичките %d съобщения?"
+
+#~ msgid "No Message Selected"
+#~ msgstr "Няма Избрано Съобщение"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Не мога да взема съобщение: %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "%s вече съществува\n"
+#~ "Искате ли да го презапишете?"
+
+#~ msgid "Save Message As..."
+#~ msgstr "Съхрани Съобщението Като..."
+
+#~ msgid "Save Messages As..."
+#~ msgstr "Съхрани Съобщението Като..."
+
+#, fuzzy
+#~ msgid ""
+#~ "This operation will permanently erase all messages marked as\n"
+#~ "deleted. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "Тази операция ще изтрие за постоянно всички съобщения маркирани за "
+#~ "изтриване. Ако продължите, вие няма да сте в състояние да възстановите "
+#~ "тези съобщения.\n"
+#~ "\n"
+#~ "Действително ли да изтрия съобщенията?"
+
+#~ msgid ""
+#~ "Error loading filter information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Грешка при зареждане информацията за финтъра:\n"
+#~ "%s"
+
+#~ msgid "Filters"
+#~ msgstr "Филтри"
+
+#, fuzzy
+#~ msgid "Page %d of %d"
+#~ msgstr "Получаване на съобщение номер %d от %d"
+
+#~ msgid "Print Message"
+#~ msgstr "Отпечатай Съобщението"
+
+#~ msgid "Printing of message failed"
+#~ msgstr "Отпечатването неуспешно"
+
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr ""
+#~ "Сигурен ли сте, че искате да отворите всички %d съобщения в отделни "
+#~ "прозорци?"
+
+#, fuzzy
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Файл със същото име вече съществува.\n"
+#~ "Да го презапиша ли?"
+
+#~ msgid "Save Attachment"
+#~ msgstr "Запазва Прикачен"
+
+#, fuzzy
+#~ msgid "Could not create temporary file '%s': %s"
+#~ msgstr "Не мога да създам временна директория: %s"
+
+#, fuzzy
+#~ msgid "%s is not a valid directory name."
+#~ msgstr "`%s' не е maildir директория."
+
+#, fuzzy
+#~ msgid "Save Attachment..."
+#~ msgstr "Запазва Прикачен"
+
+#, fuzzy
+#~ msgid "Save all attachments..."
+#~ msgstr "Запазва Прикачен"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Отвори в %s..."
+
+#~ msgid "Hide"
+#~ msgstr "Скрий"
+
+#~ msgid "External Viewer"
+#~ msgstr "Външен Viewer"
+
+#, fuzzy
+#~ msgid "Downloading images"
+#~ msgstr "Зарежда _Картинки"
+
+#~ msgid "Loading message content"
+#~ msgstr "Зареждам съсдържанието на съобщението"
+
+#, fuzzy
+#~ msgid "Overdue:"
+#~ msgstr "П_ресрочени задачи:"
+
+#, fuzzy
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "%b %d %l:%M %p"
+
+#~ msgid "Open Link in Browser"
+#~ msgstr "_Отвори Указател в Браузер"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "Копира местоположениет на указател"
+
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Запазва указателя като (FIXME)"
+
+#~ msgid "Save Image as..."
+#~ msgstr "Съхрани картинка като..."
+
+#~ msgid "%s attachment"
+#~ msgstr "%s прикачен"
+
+#~ msgid "Could not parse MIME message. Displaying as source."
+#~ msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
+
+#~ msgid "Bad Address"
+#~ msgstr "Грешен Адрес"
+
+#~ msgid "Reply-To"
+#~ msgstr "Отговор-До"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
+#~ "повече информация."
+
+#, fuzzy
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "Не мога да създам контекст за проверка на PGP"
+
+#, fuzzy
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr ""
+#~ "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
+#~ "повече информация."
+
+#, fuzzy
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr ""
+#~ "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
+#~ "повече информация."
+
+#~ msgid "Pointer to FTP site (%s)"
+#~ msgstr "Указател към FTP сайт (%s)"
+
+#~ msgid "Pointer to local file (%s) valid at site \"%s\""
+#~ msgstr "Указател към локален файл (%s) валиден на сайта \"%s\""
+
+#~ msgid "Pointer to local file (%s)"
+#~ msgstr "Указател към локален файл (%s)"
+
+#~ msgid "Pointer to remote data (%s)"
+#~ msgstr "Указател към отдалечени данни (%s)"
+
+#~ msgid "Pointer to unknown external data (\"%s\" type)"
+#~ msgstr "Указател към неизвестни външни данни (\"%s\" type)"
+
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Неименувано Съобщение)"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Неименувано Съобщение"
+
+#~ msgid "Empty Message"
+#~ msgstr "Празно Съобщение"
+
+#~ msgid "Find in Message"
+#~ msgstr "Търси в съобщението"
+
+#~ msgid "Case Sensitive"
+#~ msgstr "Със значение на малки/големи букви"
+
+#~ msgid "Search Forward"
+#~ msgstr "Търси нататък"
+
+#~ msgid "Find:"
+#~ msgstr "Намери:"
+
+#~ msgid "Matches:"
+#~ msgstr "Съвпадения:"
+
+#~ msgid "(No subject)"
+#~ msgstr "(Няма тема)"
+
+#~ msgid "%s - Message"
+#~ msgstr "%s - съобщение"
+
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "Сканиране на папки под %s на \"%s\""
+
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "Сканиране на папки в основно ниво на \"%s\""
+
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "Абонамент за папка \"%s\""
+
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "Отписване от папка \"%s\""
+
+#~ msgid "No server has been selected"
+#~ msgstr "Не е избран сървър"
+
+#~ msgid "Please select a server."
+#~ msgstr "Моля, изберете сървър."
+
 #~ msgid "That person is already attending the meeting!"
 #~ msgstr "Това лице вече е на срещата!"
 
diff --git a/po/ca.po b/po/ca.po
index c82c6a5527..22e939bc5d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2003-06-25 13:24-0400\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2000-11-01 00:40+0100\n"
 "Last-Translator: Quico Llach <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <linux@softcatala.org>\n"
@@ -15,70 +15,222 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
-msgid "Evolution VCard importer"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 #, fuzzy
 msgid "File As"
 msgstr "Arxiva com:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#, fuzzy
+msgid "Full Name"
+msgstr "Nom complet:"
+
 #: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nom"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Adreça:"
+
+#: addressbook/backend/ebook/e-card.c:1333
+#, fuzzy
+msgid "Address Label"
+msgstr "Adreça"
+
+#: addressbook/backend/ebook/e-card.c:1340
+#, fuzzy
+msgid "Phone"
+msgstr "Cap"
+
 #: addressbook/backend/ebook/e-card.c:1347
+#: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #, fuzzy
 msgid "Email"
 msgstr "Adreça electrònica 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr "Primari"
+#: addressbook/backend/ebook/e-card.c:1354
+#, fuzzy
+msgid "Birth date"
+msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:18
 #, fuzzy
-msgid "Prim"
-msgstr "Primari"
+msgid "URL"
+msgstr "URL:"
+
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organització"
 
+#: addressbook/backend/ebook/e-card.c:1374
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organització"
+
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#, fuzzy
+msgid "Office"
+msgstr "_Oficina"
+
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#, fuzzy
+msgid "Title"
+msgstr "_Títol:"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#, fuzzy
+msgid "Role"
+msgstr "Mòbil"
+
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#, fuzzy
+msgid "Manager"
+msgstr "Busca"
+
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#, fuzzy
+msgid "Nickname"
+msgstr "_Sobrenom:"
+
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#, fuzzy
+msgid "Spouse"
+msgstr "_Cònjuge:"
+
+#: addressbook/backend/ebook/e-card.c:1430
+#: addressbook/backend/ebook/e-card-simple.c:101
+#, fuzzy
+msgid "Anniversary"
+msgstr "Ani_versari:"
+
+#: addressbook/backend/ebook/e-card.c:1436
+#, fuzzy
+msgid "Mailer"
+msgstr "_Correu"
+
+#: addressbook/backend/ebook/e-card.c:1443
+#: addressbook/backend/ebook/e-card-simple.c:98
+#, fuzzy
+msgid "Calendar URI"
+msgstr "Agenda"
+
+#: addressbook/backend/ebook/e-card.c:1450
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "Imprimeix el missatge"
+
+#: addressbook/backend/ebook/e-card.c:1457
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Agenda"
+
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#, fuzzy
+msgid "Note"
+msgstr "Cap"
+
+#: addressbook/backend/ebook/e-card.c:1471
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Voleu suprimir el contacte?"
+
+#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: calendar/gui/e-calendar-table.etspec.h:4
+#, fuzzy
+msgid "Categories"
+msgstr "categories"
+
+#: addressbook/backend/ebook/e-card.c:1485
+#, fuzzy
+msgid "Category List"
+msgstr "categories"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "List"
+msgstr "és"
+
+#: addressbook/backend/ebook/e-card.c:1513
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Comprova l'adreça"
+
+#: addressbook/backend/ebook/e-card.c:1520
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Primari"
+
+#: addressbook/backend/ebook/e-card.c:1527
+#, fuzzy
+msgid "ID"
+msgstr "Si"
+
+#: addressbook/backend/ebook/e-card.c:1534
+#, fuzzy
+msgid "Last Use"
+msgstr "Enganxa"
+
+#: addressbook/backend/ebook/e-card.c:1545
+#, fuzzy
+msgid "Use Score"
+msgstr "Puntuació"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
+msgstr "Primari"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#, fuzzy
+msgid "Prim"
+msgstr "Primari"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -115,12 +267,6 @@ msgid "Home"
 msgstr "Particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organització"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
@@ -243,24 +389,10 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#, fuzzy
-msgid "Office"
-msgstr "_Oficina"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 #, fuzzy
 msgid "Off"
 msgstr "_Oficina"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#, fuzzy
-msgid "Title"
-msgstr "_Títol:"
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 #, fuzzy
@@ -272,13 +404,6 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#, fuzzy
-msgid "Manager"
-msgstr "Busca"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Man"
 msgstr "Dilluns"
@@ -288,37 +413,10 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#, fuzzy
-msgid "Nickname"
-msgstr "_Sobrenom:"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 #, fuzzy
 msgid "Nick"
 msgstr "_Sobrenom:"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#, fuzzy
-msgid "Spouse"
-msgstr "_Cònjuge:"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#, fuzzy
-msgid "Note"
-msgstr "Cap"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-#, fuzzy
-msgid "Calendar URI"
-msgstr "Agenda"
-
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
@@ -343,12 +441,6 @@ msgid "icsCalendar"
 msgstr "Agenda"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-#, fuzzy
-msgid "Anniversary"
-msgstr "Ani_versari:"
-
-#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr ""
 
@@ -357,13 +449,6 @@ msgstr ""
 msgid "Birth Date"
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-#, fuzzy
-msgid "Categories"
-msgstr "categories"
-
 #: addressbook/backend/ebook/e-card-simple.c:106
 #, fuzzy
 msgid "Family Name"
@@ -380,125 +465,33 @@ msgid "%x"
 msgstr "x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-destination.c:709
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Contacte _nou"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-#, fuzzy
-msgid "Full Name"
-msgstr "Nom complet:"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
-msgid "Address"
-msgstr "_Adreça:"
-
-#: addressbook/backend/ebook/e-card.c:1333
-#, fuzzy
-msgid "Address Label"
-msgstr "Adreça"
-
-#: addressbook/backend/ebook/e-card.c:1340
-#, fuzzy
-msgid "Phone"
-msgstr "Cap"
-
-#: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
-msgid "Birth date"
-msgstr "Data d'ini_ci:"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-#, fuzzy
-msgid "URL"
-msgstr "URL:"
-
-#: addressbook/backend/ebook/e-card.c:1374
-#, fuzzy
-msgid "Organizational Unit"
-msgstr "Organització"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-#, fuzzy
-msgid "Role"
-msgstr "Mòbil"
-
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr "_Correu"
-
-#: addressbook/backend/ebook/e-card.c:1450
-#, fuzzy
-msgid "Free/Busy URL"
-msgstr "Imprimeix el missatge"
-
-#: addressbook/backend/ebook/e-card.c:1457
-#, fuzzy
-msgid "ICS Calendar"
-msgstr "Agenda"
-
-#: addressbook/backend/ebook/e-card.c:1471
-#, fuzzy
-msgid "Related Contacts"
-msgstr "Voleu suprimir el contacte?"
-
-#: addressbook/backend/ebook/e-card.c:1485
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Category List"
-msgstr "categories"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
+msgid "Evolution LDIF importer"
+msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1506
-#, fuzzy
-msgid "List"
-msgstr "és"
-
-#: addressbook/backend/ebook/e-card.c:1513
-#, fuzzy
-msgid "List Show Addresses"
-msgstr "Comprova l'adreça"
-
-#: addressbook/backend/ebook/e-card.c:1520
-#, fuzzy
-msgid "Arbitrary"
-msgstr "Primari"
-
-#: addressbook/backend/ebook/e-card.c:1527
-#, fuzzy
-msgid "ID"
-msgstr "Si"
-
-#: addressbook/backend/ebook/e-card.c:1534
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Last Use"
-msgstr "Enganxa"
+msgid "Evolution VCard Importer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: addressbook/backend/ebook/e-card.c:1545
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 #, fuzzy
-msgid "Use Score"
-msgstr "Puntuació"
+msgid "Evolution VCard importer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:171
-msgid "Could not initialize Bonobo"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -564,14 +557,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
@@ -580,52 +573,125 @@ msgstr "No s'ha pogut iniciar el wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'adreça del Pilot"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
+#: addressbook/gui/component/addressbook.c:502
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Directory Servers"
-msgstr "N_ou servidor de directori"
+#: addressbook/gui/component/addressbook.c:512
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is unreachable."
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/addressbook.c:517
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:527
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the server\n"
+"is unreachable."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:547
+msgid "Unable to open addressbook"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook.c:607
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:652
 #, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Desa a la llibreta d'adreces"
+msgid "Failed to authenticate.\n"
+msgstr ""
+"No es pot autenticar davant del servidor IMAP.\n"
+"%s\n"
+"\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/gui/component/addressbook.c:660
+#: addressbook/gui/component/addressbook.c:663
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
+
+#: addressbook/gui/component/addressbook.c:794
 #, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Configuració del _correu..."
+msgid "Name begins with"
+msgstr "acaba amb"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/addressbook.c:795
 #, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
+msgid "Email begins with"
+msgstr "acaba amb"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook.c:796
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+msgid "Category is"
+msgstr "categories"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:797
+#: calendar/gui/cal-search-bar.c:49
 #, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+msgid "Any field contains"
+msgstr "El cos conté"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/addressbook.c:798
 #, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+msgid "Advanced..."
+msgstr "Afegeix..."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/addressbook.c:955
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:961
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:967
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:970
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:974
+msgid "This query did not complete successfully."
+msgstr ""
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1059
+#: calendar/gui/cal-search-bar.c:354
 #, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+msgid "Any Category"
+msgstr "categories"
+
+#: addressbook/gui/component/addressbook.c:1145
+msgid "The URI that the Folder Browser will display"
+msgstr "L'URI que mostrarà el navegador de carpetes"
 
 #: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:628
 #: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 #, fuzzy
@@ -663,32 +729,32 @@ msgstr ""
 "Error en carregar la informació del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:582
 #, fuzzy
 msgid "New Contact"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:582
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:583
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crea un nou contacte"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:586
 #, fuzzy
 msgid "New Contact List"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:586
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:587
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Crea un nou contacte"
@@ -754,123 +820,6 @@ msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 msgid "Other Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/addressbook.c:502
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:512
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is unreachable."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:517
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:527
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the server\n"
-"is unreachable."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:547
-msgid "Unable to open addressbook"
-msgstr "No es pot obrir la llibreta d'adreces"
-
-#: addressbook/gui/component/addressbook.c:607
-msgid "Accessing LDAP Server anonymously"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:652
-#, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr ""
-"No es pot autenticar davant del servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook.c:660
-#: addressbook/gui/component/addressbook.c:663
-#, fuzzy, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
-
-#: addressbook/gui/component/addressbook.c:794
-#, fuzzy
-msgid "Name begins with"
-msgstr "acaba amb"
-
-#: addressbook/gui/component/addressbook.c:795
-#, fuzzy
-msgid "Email begins with"
-msgstr "acaba amb"
-
-#: addressbook/gui/component/addressbook.c:796
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Category is"
-msgstr "categories"
-
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:797
-#: calendar/gui/cal-search-bar.c:49
-#, fuzzy
-msgid "Any field contains"
-msgstr "El cos conté"
-
-#: addressbook/gui/component/addressbook.c:798
-#, fuzzy
-msgid "Advanced..."
-msgstr "Afegeix..."
-
-#: addressbook/gui/component/addressbook.c:955
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:961
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:967
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:970
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:974
-msgid "This query did not complete successfully."
-msgstr ""
-
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1059
-#: calendar/gui/cal-search-bar.c:354
-#, fuzzy
-msgid "Any Category"
-msgstr "categories"
-
-#: addressbook/gui/component/addressbook.c:1145
-msgid "The URI that the Folder Browser will display"
-msgstr "L'URI que mostrarà el navegador de carpetes"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -901,37 +850,81 @@ msgstr "Crea un nou contacte"
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:914
+#: addressbook/gui/component/e-address-popup.c:917
 #, fuzzy
 msgid "Querying Addressbook..."
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/e-address-popup.c:998
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-popup.c:1001
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1028
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/e-address-popup.c:1053
+#: addressbook/gui/component/e-address-popup.c:1056
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "Adreça electrònica:"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 #, fuzzy
 msgid "Disable Queries"
 msgstr "Categories disponibles:"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Directory Servers"
+msgstr "N_ou servidor de directori"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Configuració del _correu..."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -1082,10 +1075,9 @@ msgstr ""
 msgid "S_earch scope: "
 msgstr "Cerca"
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1256
+#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 #, fuzzy
 msgid "Searching"
 msgstr "Cerca"
@@ -1277,11 +1269,11 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Edita"
 
@@ -1329,22 +1321,26 @@ msgstr "General"
 msgid "searching-tab"
 msgstr "Cerca"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+#: addressbook/gui/component/select-names/e-select-names.c:650
 #, fuzzy
-msgid "Remove All"
-msgstr "Elimina"
+msgid "Find contact in"
+msgstr "Cerca un contacte"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Elimina"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+#, fuzzy
+msgid "Remove All"
+msgstr "Elimina"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
@@ -1371,14 +1367,10 @@ msgstr "Contacte _nou"
 msgid "Source"
 msgstr "Font"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Find contact in"
-msgstr "Cerca un contacte"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -1460,7 +1452,7 @@ msgid "D_epartment:"
 msgstr "_Departament:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:197
+#: calendar/gui/dialogs/task-editor.c:200
 msgid "Details"
 msgstr "Detalls"
 
@@ -1532,11 +1524,13 @@ msgid "_Categories..."
 msgstr "Ca_tegories..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
-#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Suprimeix"
 
@@ -1583,15 +1577,15 @@ msgid "_Web page address:"
 msgstr "Adreça de pàgina web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
+#: addressbook/gui/widgets/e-minicard.c:183
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #, fuzzy
 msgid "Editable"
 msgstr "Filtres d'edició"
@@ -2694,18 +2688,18 @@ msgstr ""
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #, fuzzy
 msgid "Book"
 msgstr "Cos"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
+#: addressbook/gui/widgets/e-minicard-widget.c:93
 #, fuzzy
 msgid "Card"
 msgstr "Cotxe"
@@ -2947,7 +2941,7 @@ msgstr "Nou"
 msgid "Contact List Editor"
 msgstr "Contacta l'editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Desa com a VCard"
@@ -2994,7 +2988,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 #, fuzzy
 msgid "Advanced Search"
@@ -3016,10 +3010,10 @@ msgid "%d cards"
 msgstr " segons"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #, fuzzy
 msgid "Query"
 msgstr "maig"
@@ -3029,282 +3023,281 @@ msgstr "maig"
 msgid "Error getting book view"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 #, fuzzy
 msgid "Model"
 msgstr "Mòbil"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 #, fuzzy
 msgid "Error modifying card"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: shell/evolution-shell-component.c:1183
 #, fuzzy
 msgid "Success"
 msgstr "Fonts"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 #, fuzzy
 msgid "Repository offline"
 msgstr "S'està movent"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1210
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Permís denegat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
 msgid "Card not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 #, fuzzy
 msgid "Protocol not supported"
 msgstr "Operació no suportada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:785
-#: camel/camel-service.c:875 camel/camel-service.c:917
-#: camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
+#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autenticació:"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autenticació:"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 #, fuzzy
 msgid "Other error"
 msgstr "Error d'E/S"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 #, fuzzy
 msgid "_Discard"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 #, fuzzy
 msgid "Error adding list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 #, fuzzy
 msgid "Error adding card"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #, fuzzy
 msgid "Error modifying list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 #, fuzzy
 msgid "Error removing list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 #, fuzzy
 msgid "Error removing card"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 #, fuzzy
 msgid "Move card to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 #, fuzzy
 msgid "Copy card to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 #, fuzzy
 msgid "Move cards to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 #, fuzzy
 msgid "Copy cards to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Mou el missatge"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 #, fuzzy
 msgid "Type"
 msgstr "Tipus:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.c:398
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 #, fuzzy
 msgid "Addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-#: addressbook/gui/widgets/e-addressbook-view.c:895
-#: addressbook/gui/widgets/e-addressbook-view.c:1879
+#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1883
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 #, fuzzy
 msgid "New Contact..."
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Vés a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #, fuzzy
 msgid "Import..."
 msgstr "S'està movent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Cerca contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Afegeix una font"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Paràmetres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Reenvia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:901
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimeix el missatge..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Copia a la carpeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Mou a la carpeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:912
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Cut"
 msgstr "Personalitzat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Enganxa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: calendar/gui/e-cal-view.c:1109
 #, fuzzy
 msgid "Current View"
 msgstr "l'hora actual"
@@ -3313,7 +3306,7 @@ msgstr "l'hora actual"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:949
+#: addressbook/gui/widgets/e-addressbook-view.c:953
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3321,11 +3314,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:954
+#: addressbook/gui/widgets/e-addressbook-view.c:958
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1352
+#: addressbook/gui/widgets/e-addressbook-view.c:1356
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3407,36 +3400,46 @@ msgstr "Contacte _nou"
 msgid "Primary Phone"
 msgstr "Primari"
 
-#: addressbook/gui/widgets/e-minicard-control.c:204
-#, c-format
-msgid "and %d other cards."
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:206
-msgid "and one other card."
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:318
-msgid "Save in addressbook"
-msgstr "Desa a la llibreta d'adreces"
-
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #, fuzzy
 msgid "Width"
 msgstr "Amplada:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #, fuzzy
 msgid "Height"
 msgstr "Alçada:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Suprimeix"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Tasques"
+
+#: addressbook/gui/widgets/e-minicard-control.c:204
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:206
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:318
+msgid "Save in addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3455,10 +3458,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-view.c:141
 #, fuzzy
 msgid ""
@@ -3492,15 +3491,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "després de"
 
-#: addressbook/gui/widgets/e-minicard.c:169
-#, fuzzy
-msgid "Selected"
-msgstr "Suprimeix"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Tasques"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 #, fuzzy
@@ -3512,23 +3505,23 @@ msgstr "Cotxe"
 msgid "GTK Tree View"
 msgstr "Setmana"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-#, fuzzy
-msgid "Print envelope"
-msgstr "Imprimeix el missatge..."
-
-#: addressbook/printing/e-contact-print.c:1139
+#: addressbook/printing/e-contact-print.c:1158
 #, fuzzy
 msgid "Print cards"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/printing/e-contact-print.c:1204
-#: addressbook/printing/e-contact-print.c:1226
+#: addressbook/printing/e-contact-print.c:1224
+#: addressbook/printing/e-contact-print.c:1250
 #, fuzzy
 msgid "Print card"
 msgstr "Imprimeix l'agenda"
 
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+#, fuzzy
+msgid "Print envelope"
+msgstr "Imprimeix el missatge..."
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3700,6 +3693,63 @@ msgstr "Amplada:"
 msgid "_Font..."
 msgstr "Lletra..."
 
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "No iniciat"
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Error d'E/S"
+
 #: calendar/cal-util/cal-component.c:1218
 #, fuzzy
 msgid "Untitled appointment"
@@ -3830,28 +3880,30 @@ msgid "31st"
 msgstr "31"
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:912
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
+#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:910
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr ""
 
@@ -3859,13 +3911,13 @@ msgstr ""
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'agenda del Pilot"
 
@@ -3874,88 +3926,35 @@ msgstr "No s'ha pogut llegir el bloc d'aplicació d'agenda del Pilot"
 msgid "Default Priority:"
 msgstr "_Prioritat:"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de coses per fer del Pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "_Paràmetres"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "_Paràmetres"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks component"
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Configuració del correu"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Conducte de l'agenda de l'Evolution"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 #, fuzzy
 msgid "Starting:"
 msgstr "_Paràmetres"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 #, fuzzy
 msgid "Ending:"
 msgstr "Ombrejat"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-#, fuzzy
-msgid "invalid time"
-msgstr "Hora de _finalització:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "Alarmes"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 #, fuzzy
 msgid "C_lose"
 msgstr "Tanca"
@@ -3974,18 +3973,27 @@ msgstr "Durada de l'snooze (minuts)"
 msgid "_Edit appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 #, fuzzy
 msgid "No description available."
 msgstr "No hi ha cap resum disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 #, fuzzy
 msgid "Warning"
 msgstr "S'està movent"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3993,7 +4001,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4004,60 +4012,68 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Envia aquest missatge"
 
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize Bonobo"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:176
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
+#: calendar/gui/alarm-notify/notify-main.c:185
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: calendar/gui/cal-search-bar.c:50
-#, fuzzy
-msgid "Summary contains"
-msgstr "conté"
-
-#: calendar/gui/cal-search-bar.c:51
-#, fuzzy
-msgid "Description contains"
-msgstr "Descripció:"
+#: calendar/gui/calendar-commands.c:376
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/calendar-commands.c:382
 #, fuzzy
-msgid "Comment contains"
-msgstr "conté"
+msgid "Purge events older than"
+msgstr "és més petit que"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
-msgid "Unmatched"
-msgstr ""
+#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "dies"
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:485
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
+#: calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d de %B de %Y"
@@ -4065,17 +4081,17 @@ msgstr "%A, %d de %B de %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:518
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:849
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -4095,11 +4111,11 @@ msgstr "Agenda"
 msgid "Public folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Tasques"
@@ -4178,112 +4194,6 @@ msgstr "Nova cita..."
 msgid "Create a new all-day appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Públic"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-#, fuzzy
-msgid "Free"
-msgstr "setmana"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1204
-msgid "Busy"
-msgstr "Ocupat"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr "No iniciat"
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr "En procés"
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-#, fuzzy
-msgid "Completed"
-msgstr "% comp_let:"
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"La posició geogràfica s'ha d'introduir amb el format: \n"
-"\n"
-"45.436845,125.862501"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
-#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
-msgstr "Cap"
-
-#: calendar/gui/calendar-model.c:1711
-#, fuzzy
-msgid "Recurring"
-msgstr "Recurrència"
-
-#: calendar/gui/calendar-model.c:1713
-#, fuzzy
-msgid "Assigned"
-msgstr "Assigna una puntuació"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-#, fuzzy
-msgid "No"
-msgstr "Ara"
-
 #: calendar/gui/calendar-view-factory.c:118
 #, fuzzy
 msgid "Day View"
@@ -4304,55 +4214,79 @@ msgstr "Setmana"
 msgid "Month View"
 msgstr "Mes"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Cerca personalitzada"
+
+#: calendar/gui/cal-search-bar.c:50
+#, fuzzy
+msgid "Summary contains"
+msgstr "conté"
+
+#: calendar/gui/cal-search-bar.c:51
+#, fuzzy
+msgid "Description contains"
+msgstr "Descripció:"
+
+#: calendar/gui/cal-search-bar.c:52
+#, fuzzy
+msgid "Comment contains"
+msgstr "conté"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:462
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Permís denegat"
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:125
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrarà l'agenda"
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:420
+#: calendar/gui/dialogs/alarm-options.c:466
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "Alarmes acústiques"
 
-#: calendar/gui/dialogs/alarm-options.c:429
+#: calendar/gui/dialogs/alarm-options.c:475
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Destinataris del missatge"
 
-#: calendar/gui/dialogs/alarm-options.c:438
+#: calendar/gui/dialogs/alarm-options.c:484
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Opcions de visualització"
 
-#: calendar/gui/dialogs/alarm-options.c:447
+#: calendar/gui/dialogs/alarm-options.c:493
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:456
+#: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -4394,10 +4328,6 @@ msgstr "Envia \"%s\""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "dies"
-
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr ""
@@ -4411,7 +4341,8 @@ msgstr "_Actualitza lliure/ocupat"
 msgid "hours"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minuts"
 
@@ -4427,12 +4358,12 @@ msgstr "Enganxa"
 msgid "Date/Time:"
 msgstr "Data d'enviament"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 #, fuzzy
 msgid "Display a message"
 msgstr "Visualitza l'UID del missatge \"%s\""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr ""
 
@@ -4440,7 +4371,7 @@ msgstr ""
 msgid "Reminders"
 msgstr "Recordatoris"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 #, fuzzy
 msgid "Run a program"
 msgstr "_Executa el programa:"
@@ -4452,7 +4383,8 @@ msgstr "S'està recollint el correu des de %s"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Resum:"
 
@@ -4544,7 +4476,7 @@ msgstr "Dies"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr "Divendres"
 
@@ -4558,7 +4490,7 @@ msgstr "Minuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -4569,7 +4501,7 @@ msgstr "dg."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr "Dissabte"
 
@@ -4584,7 +4516,7 @@ msgstr "Mostra els números de les setmanes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -4605,7 +4537,7 @@ msgstr "Tasques"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr "Dijous"
 
@@ -4624,7 +4556,7 @@ msgstr "Format de l'hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr "Dimarts"
 
@@ -4634,12 +4566,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr "Dimecres"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "Work Week"
 msgstr "Setmana de treball"
@@ -4772,78 +4704,50 @@ msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Error desconegut: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
-#, fuzzy
-msgid " (Completed "
-msgstr "% comp_let:"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
-#, fuzzy
-msgid "Completed "
-msgstr "% comp_let:"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
-#, fuzzy
-msgid "Due "
-msgstr "Data de venciment"
-
 #: calendar/gui/dialogs/comp-editor.c:334
 #, fuzzy
 msgid "Could not update invalid object"
@@ -4891,21 +4795,50 @@ msgid "No summary"
 msgstr "Sense resum"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
-#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/dialogs/comp-editor.c:1406
-#: calendar/gui/dialogs/comp-editor.c:1432
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1459
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Error desconegut: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
+#, fuzzy
+msgid " (Completed "
+msgstr "% comp_let:"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
+#, fuzzy
+msgid "Completed "
+msgstr "% comp_let:"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
+#, fuzzy
+msgid "Due "
+msgstr "Data de venciment"
+
 #: calendar/gui/dialogs/delete-comp.c:96
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -5032,34 +4965,34 @@ msgstr "Suprimeix"
 msgid "Enter Delegate"
 msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
 #, fuzzy
 msgid "Appointment"
 msgstr "Cites:"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Recurrència"
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 #, fuzzy
 msgid "Scheduling"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancel·lat"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data d'ini_ci:"
@@ -5098,9 +5031,8 @@ msgid "Classification"
 msgstr "Classificació"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
-msgid "Con_fidential"
+msgid "Co_nfidential"
 msgstr "Confidencial"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
@@ -5130,7 +5062,6 @@ msgid "Pu_blic"
 msgstr "Pú_blic"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "Mostra"
@@ -5149,83 +5080,35 @@ msgstr "Hora de _finalització:"
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr "Cap"
+
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:630
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-#, fuzzy
-msgid "Attendee"
-msgstr "Tots els assistents"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-#, fuzzy
-msgid "Click here to add an attendee"
-msgstr "<feu clic aquí per seleccionar una data>"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-#, fuzzy
-msgid "Common Name"
-msgstr "Completat"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-#, fuzzy
-msgid "Delegated From"
-msgstr "Suprimeix"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-#, fuzzy
-msgid "Delegated To"
-msgstr "Suprimeix"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-#, fuzzy
-msgid "Language"
-msgstr "Busca"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-#, fuzzy
-msgid "Member"
-msgstr "desembre"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
-#: mail/message-list.etspec.h:12
-#, fuzzy
-msgid "Status"
-msgstr "_Estat:"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
@@ -5238,7 +5121,7 @@ msgid "_Change Organizer"
 msgstr "Organització:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Invita a altres..."
 
@@ -5403,7 +5286,7 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5428,57 +5311,88 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "% comp_let:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
 #, fuzzy, no-c-format
-msgid "% Complete"
+msgid "% _Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
-msgstr "Data completa:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311
+#, fuzzy
+msgid "Completed"
+msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
+msgid "In Progress"
+msgstr "En procés"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305
+msgid "Not Started"
+msgstr "No iniciat"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
 msgid "Progress"
 msgstr "En procés"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
-msgid "URL:"
-msgstr "URL:"
+msgid "_Date Completed:"
+msgstr "Data completa:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Prioritat:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "Adreça de pàgina web:"
+
+#: calendar/gui/dialogs/task-editor.c:193
 #, fuzzy
 msgid "Basic"
 msgstr "Enganxa"
 
-#: calendar/gui/dialogs/task-editor.c:204
-#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 #, fuzzy
 msgid "Assignment"
 msgstr "Assigna una puntuació"
 
-#: calendar/gui/dialogs/task-page.c:480
+#: calendar/gui/dialogs/task-page.c:482
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.c:542
+msgid "Due date is before start date!"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Confidencial"
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Descripció:"
@@ -5492,243 +5406,280 @@ msgstr "Data d'ini_ci:"
 msgid "_Due Date:"
 msgstr "_Data de venciment:"
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "dies"
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 #, fuzzy
 msgid "1 day"
 msgstr "Mostra 1 dia"
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "setmanes"
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 #, fuzzy
 msgid "1 week"
 msgstr "Mostra 1 setmana"
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "hores"
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 #, fuzzy
 msgid "1 hour"
 msgstr "hora"
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "minuts"
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 #, fuzzy
 msgid "1 minute"
 msgstr "10 minuts"
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " segons"
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 #, fuzzy
 msgid "1 second"
 msgstr " segons"
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 #, fuzzy
 msgid "Send an email"
 msgstr "S'està recollint el correu des de %s"
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 #, fuzzy
 msgid "Unknown action to be performed"
 msgstr "Error desconegut"
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, fuzzy, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, fuzzy, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, fuzzy, c-format
 msgid "%s at the start of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, fuzzy, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, fuzzy, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, fuzzy, c-format
 msgid "%s at the end of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, fuzzy, c-format
 msgid "%s at %s"
 msgstr "%2$s%1$s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
+msgid "Public"
+msgstr "Públic"
+
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1933
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
+#, fuzzy
+msgid "Free"
+msgstr "setmana"
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:393
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Ocupat"
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
-#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Open"
 msgstr "_Obre"
 
-#: calendar/gui/e-calendar-table.c:959
+#: calendar/gui/e-calendar-table.c:989
+#, fuzzy
+msgid "Open _Web Page"
+msgstr "FIXME: _Obre la pàgina web"
+
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+#: ui/evolution-mail-message.xml.h:120
 #, fuzzy
-msgid "_Save as..."
+msgid "_Save As..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
+#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
-#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Personalitzat"
 
-#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
+#: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Copy"
 msgstr "Copia"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
-#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
+#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 #, fuzzy
 msgid "_Paste"
 msgstr "Enganxa"
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1001
 #, fuzzy
 msgid "_Assign Task"
 msgstr "_Tasca (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
-#: calendar/gui/e-week-view.c:4335
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Feu clic aquí per a la llibreta d'adreces"
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% comp_let:"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
 #, fuzzy
 msgid "Complete"
 msgstr "% comp_let:"
@@ -5739,13 +5690,13 @@ msgid "Completion Date"
 msgstr "Completat"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr "Data de venciment"
+#, fuzzy
+msgid "Description"
+msgstr "Descripció:"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-#, fuzzy
-msgid "End Date"
-msgstr "Hora de _finalització:"
+msgid "Due Date"
+msgstr "Data de venciment"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
@@ -5755,651 +5706,706 @@ msgstr ""
 msgid "Priority"
 msgstr "Prioritat"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Start Date"
 msgstr "Data d'ini_ci:"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+#, fuzzy
+msgid "Status"
+msgstr "_Estat:"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, fuzzy
 msgid "Task sort"
 msgstr "Tasques"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr "Colors"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+#: calendar/gui/e-calendar-table.etspec.h:20
+#, fuzzy
+msgid "component"
+msgstr "Cites:"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: calendar/gui/e-cal-model.c:828
+#, fuzzy
+msgid "Recurring"
+msgstr "Recurrència"
+
+#: calendar/gui/e-cal-model.c:830
+#, fuzzy
+msgid "Assigned"
+msgstr "Assigna una puntuació"
+
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "Yes"
 msgstr ""
-"La data s'ha d'introduir amb el format: \n"
-"\n"
-"%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisions de minut"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+#, fuzzy
+msgid "No"
+msgstr "Ara"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
-msgid "%A %d %B"
-msgstr "%A, %d de %B"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "N"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "S"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr "E"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "O"
 
-#: calendar/gui/e-day-view.c:3694
+#: calendar/gui/e-cal-model-tasks.c:550
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"La posició geogràfica s'ha d'introduir amb el format: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
 #, fuzzy
-msgid "New _Appointment"
+msgid "New _Appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
 #, fuzzy
 msgid "New Meeting"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
 #, fuzzy
 msgid "New Task"
 msgstr "Tasca"
 
-#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Imprimeix..."
-
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
+#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
 #: ui/evolution-calendar.xml.h:13
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Vés a avui"
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Vés a una data"
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
-#: ui/evolution-calendar.xml.h:34
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
+#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
 #: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Paràmetres"
 
-#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
-#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
-#, fuzzy
-msgid "_Save As..."
-msgstr "Anomena i desa..."
-
-#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
+#: calendar/gui/e-cal-view.c:1139
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
+#: calendar/gui/e-cal-view.c:1140
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
+#: calendar/gui/e-cal-view.c:1145
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix-ne aquesta aparició"
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/e-itip-control.c:706
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"La data s'ha d'introduir amb el format: \n"
+"\n"
+"%s"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
+msgid "%A %d %B"
+msgstr "%A, %d de %B"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisions de minut"
+
+#: calendar/gui/e-itip-control.c:676
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Recurrència simple"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 #, fuzzy
 msgid "Every day"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "dies"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "Every week"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "setmanes"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "setmanes"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 #, fuzzy
 msgid " and "
 msgstr "_Envia"
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 #, fuzzy
 msgid "every month"
 msgstr "mes"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 #, fuzzy
 msgid "Every year"
 msgstr "Cada"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora de _finalització de la reunió:"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Descripció:"
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Cap informació"
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 #, fuzzy
 msgid "An unknown person"
 msgstr "Error desconegut"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1005
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 #, fuzzy
 msgid "Location:"
 msgstr "_Accions"
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 #, fuzzy
 msgid "Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 #, fuzzy
 msgid "Accepted"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 #, fuzzy
 msgid "Declined"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
-#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Desconegut"
-
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 #, fuzzy
 msgid "Update"
 msgstr "ha estat després de"
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Accept"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 #, fuzzy
 msgid "Decline"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1172
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1309
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _finalització de la reunió:"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "FIXME: Pe_tició de cita"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "_Edita el missatge"
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 #, fuzzy
 msgid "Task Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 #, fuzzy
 msgid "Task Proposal"
 msgstr "TaskPad"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1381
 #, fuzzy
 msgid "Task Update"
 msgstr "ha estat després de"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 #, fuzzy
 msgid "Task Update Request"
 msgstr "FIXME: _Petició de tasca"
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 #, fuzzy
 msgid "Task Reply"
 msgstr "Respon"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1402
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Cancel·lat"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Cap informació"
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "_Aquesta és l'adreça de correu"
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "No es pot executar el Bug Buddy."
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Data completa:"
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data d'enviament"
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccioneu una carpeta"
@@ -6447,266 +6453,295 @@ msgstr ""
 msgid "date-start"
 msgstr "Inici del dia:"
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
-#, fuzzy
-msgid "Required Participants"
-msgstr "Persones _requerides"
-
-#: calendar/gui/e-meeting-model.c:81
-#, fuzzy
-msgid "Optional Participants"
-msgstr "Persones _requerides"
-
-#: calendar/gui/e-meeting-model.c:82
-#, fuzzy
-msgid "Resources"
-msgstr "Font"
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
-msgid "Individual"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
-#, fuzzy
-msgid "Group"
-msgstr "Grup %i"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
-#, fuzzy
-msgid "Resource"
-msgstr "Font"
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
-msgid "Room"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
-#, fuzzy
-msgid "Chair"
-msgstr "Cotxe"
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
-#, fuzzy
-msgid "Required Participant"
-msgstr "Persones _requerides"
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
-msgid "Optional Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
-#, fuzzy
-msgid "Needs Action"
-msgstr "Elimina una acció"
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
-#, fuzzy
-msgid "Delegated"
-msgstr "Suprimeix"
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#, fuzzy
-msgid "In Process"
-msgstr "En procés"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Cap informació"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "_Options"
 msgstr "_Opcions"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _Only Working Hours"
 msgstr "Mostra _només les hores de treball"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Mostra-ho reduint el zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update Free/Busy"
 msgstr "_Actualitza lliure/ocupat"
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "Tria automàtica"
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
+#: calendar/gui/e-meeting-time-sel.c:541
 msgid "_All People and Resources"
 msgstr "_Totes les persones i recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:563
+#: calendar/gui/e-meeting-time-sel.c:550
 msgid "All _People and One Resource"
 msgstr "Totes les persones i un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:572
+#: calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required People"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "Required People and _One Resource"
 msgstr "Persones requerides i _un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "Meeting _start time:"
 msgstr "Hora d'_inici de la reunió:"
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Meeting _end time:"
 msgstr "Hora de _finalització de la reunió:"
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
-#: calendar/gui/gnome-cal.c:2017
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2054
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2087
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Tots els assistents"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "<feu clic aquí per seleccionar una data>"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#, fuzzy
+msgid "Common Name"
+msgstr "Completat"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#, fuzzy
+msgid "Delegated From"
+msgstr "Suprimeix"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#, fuzzy
+msgid "Delegated To"
+msgstr "Suprimeix"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#, fuzzy
+msgid "Language"
+msgstr "Busca"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#, fuzzy
+msgid "Member"
+msgstr "desembre"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-tasks.c:151
+#, fuzzy
+msgid "invalid time"
+msgstr "Hora de _finalització:"
+
+#: calendar/gui/e-tasks.c:221
+#, fuzzy
+msgid "Start Date:"
+msgstr "Data d'ini_ci:"
+
+#: calendar/gui/e-tasks.c:237
+msgid "Due Date:"
+msgstr "Data de venciment:"
+
+#. write priority
+#: calendar/gui/e-tasks.c:265
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioritat:"
+
+#. URL
+#: calendar/gui/e-tasks.c:321
+#, fuzzy
+msgid "Web Page:"
+msgstr "Pàgina"
+
+#: calendar/gui/e-tasks.c:702
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:746
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El mètode necessari per carregar `%s' no està suportat"
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:899
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Completat"
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:922
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1017
 #, fuzzy
 msgid "Expunging"
 msgstr "_Esborra"
 
-#: calendar/gui/e-week-view.c:3581
-#, fuzzy
-msgid "New _Appointment..."
-msgstr "Nova cita..."
-
-#: calendar/gui/gnome-cal.c:1481
+#: calendar/gui/gnome-cal.c:1702
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1716
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El mètode necessari per carregar `%s' no està suportat"
 
-#: calendar/gui/gnome-cal.c:1556
+#: calendar/gui/gnome-cal.c:1772
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmes"
 
-#: calendar/gui/gnome-cal.c:1748
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1757
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1988
+#: calendar/gui/gnome-cal.c:2176
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Obre l'agenda"
 
-#: calendar/gui/gnome-cal.c:2028
+#: calendar/gui/gnome-cal.c:2197
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
+#: calendar/gui/gnome-cal.c:3094
+#, fuzzy, c-format
+msgid "Purging event %s"
+msgstr "S'està examinant %s"
+
+#: calendar/gui/gnome-cal.c:3178
+#, fuzzy
+msgid "Purging"
+msgstr "Tasca"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "_Paràmetres"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "_Paràmetres"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Configuració del correu"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
 #: calendar/gui/goto-dialog.glade.h:1
 #, fuzzy
 msgid "April"
@@ -6835,7 +6870,7 @@ msgstr "Cap informació"
 msgid "iCalendar information"
 msgstr "Cap informació"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6868,88 +6903,87 @@ msgid "Sa"
 msgstr "Ds"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1882
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1919
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1927
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1934
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2262
 #, fuzzy
 msgid "Task"
 msgstr "Tasca"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2321
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Estat:"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2338
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioritat:"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2350
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Marca la tasca com a completa"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2362
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2376
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr "categories"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2387
 #, fuzzy
 msgid "Contacts: "
 msgstr "_Contactes..."
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Previsualització d'impressió"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2559
 #, fuzzy
 msgid "Print Item"
 msgstr "Imprimeix aquest element"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2632
 #, fuzzy
 msgid "Print Setup"
 msgstr "Configuració de la pàgina:"
@@ -6959,7 +6993,7 @@ msgstr "Configuració de la pàgina:"
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrarà l'agenda"
 
-#: calendar/gui/tasks-control.c:465
+#: calendar/gui/tasks-control.c:448
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6967,12 +7001,12 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:468
+#: calendar/gui/tasks-control.c:451
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Envia aquest missatge"
 
-#: calendar/gui/tasks-control.c:610
+#: calendar/gui/tasks-control.c:593
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimeix l'agenda"
@@ -8699,32 +8733,32 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:167
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:207
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:251
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:293
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:331
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:363
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
@@ -8759,7 +8793,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "S'estan escanejant les carpetes de \"%s\""
@@ -8780,62 +8818,62 @@ msgstr "No s'ha pogut crear el conducte a %s: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 #, fuzzy
 msgid "Syncing folders"
 msgstr "S'està sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'està sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'està escrivint el missatge %d de %d"
@@ -8860,61 +8898,66 @@ msgstr "adjunció"
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-folder-search.c:346
+#: camel/camel-folder.c:585
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1163
 #, fuzzy, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
+msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:356
+#: camel/camel-folder.c:1203
 #, fuzzy, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
+msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
-msgid "(match-all) requires a single bool result"
-msgstr ""
+#: camel/camel-folder.c:1321
+#, fuzzy
+msgid "Moving messages"
+msgstr "Còpia de missatges"
 
-#: camel/camel-folder-search.c:653
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
+#: camel/camel-folder.c:1321
+#, fuzzy
+msgid "Copying messages"
+msgstr "Còpia de missatges"
 
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
+#: camel/camel-folder.c:1571
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/camel-folder.c:1161
+#: camel/camel-folder-search.c:348
 #, fuzzy, c-format
-msgid "Unsupported operation: search by expression: for %s"
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1201
+#: camel/camel-folder-search.c:358
 #, fuzzy, c-format
-msgid "Unsupported operation: search by uids: for %s"
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1319
-#, fuzzy
-msgid "Moving messages"
-msgstr "Còpia de missatges"
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+msgid "(match-all) requires a single bool result"
+msgstr ""
 
-#: camel/camel-folder.c:1319
-#, fuzzy
-msgid "Copying messages"
-msgstr "Còpia de missatges"
+#: camel/camel-folder-search.c:650
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
 
 #: camel/camel-gpg-context.c:762
 #, c-format
@@ -8941,7 +8984,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel·lat"
@@ -8996,26 +9039,6 @@ msgstr "Missatge de _correu (FIXME)"
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-lock-client.c:111
-#, fuzzy, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "No s'ha pogut crear el conducte: %s"
-
-#: camel/camel-lock-client.c:124
-#, fuzzy, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "No es pot bifurcar %s: %s"
-
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr ""
-
-#: camel/camel-lock-client.c:215
-#, fuzzy, c-format
-msgid "Could not lock '%s'"
-msgstr "No s'ha pogut bifurcar: %s"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9038,6 +9061,26 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
+#: camel/camel-lock-client.c:100
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "No s'ha pogut crear el conducte: %s"
+
+#: camel/camel-lock-client.c:113
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:204
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "No s'ha pogut bifurcar: %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9104,11 +9147,11 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 #, fuzzy
 msgid "parse error"
 msgstr "Error d'E/S"
@@ -9183,11 +9226,11 @@ msgstr ""
 "Això us connectarà al servidor POP i utilitzarà el Kerberos 4 per autenticar-"
 "vos-hi."
 
-#: camel/camel-sasl-digest-md5.c:46
+#: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:50
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
@@ -9286,7 +9329,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1207
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
@@ -9353,24 +9396,24 @@ msgstr ""
 msgid "PLAIN"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 #, fuzzy
 msgid "POP Source URI"
 msgstr "Font"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
@@ -9379,56 +9422,56 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Error en escriure a la bústia de correu temporal: %s"
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:285
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:293
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de camí"
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:738
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "S'està comprovant \"%s\""
 
-#: camel/camel-service.c:783 camel/camel-service.c:915
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-service.c:818
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:880
+#: camel/camel-service.c:860
 #, fuzzy
 msgid "Resolving address"
 msgstr "S'està comprovant \"%s\""
 
-#: camel/camel-service.c:949
+#: camel/camel-service.c:929
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:952
+#: camel/camel-service.c:932
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9440,12 +9483,12 @@ msgstr "Proveïdor de correu de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hi ha cap proveïdor disponible per al protocol `%s'"
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9492,139 +9535,139 @@ msgstr "Missatge de _correu (FIXME)"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:212
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Fitxer de signatura:"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Error en carregar el fitxer: %s"
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 #, fuzzy
 msgid "Out of memory"
 msgstr "Fora de l'oficina"
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "adjunció"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9633,15 +9676,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9654,7 +9697,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9664,28 +9707,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9699,17 +9742,17 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprova si hi ha nou correu"
@@ -9737,13 +9780,13 @@ msgstr "No es pot bifurcar %s: %s"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2806
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2809
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor ha rebutjat el nom d'usuari"
@@ -9781,39 +9824,39 @@ msgstr "La resposta del servidor IMAP no contenia la informació %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No s'ha pogut carregar el resum per a %s"
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "S'estan desant els canvis al missatge..."
 
-#: camel/providers/imap/camel-imap-folder.c:1883
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9822,28 +9865,28 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
 #, fuzzy
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/imap/camel-imap-folder.c:1943
-#: camel/providers/imap/camel-imap-folder.c:2539
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Aquest missatge no té cap assumpte.\n"
 "Voleu que l'enviï igualment?"
 
-#: camel/providers/imap/camel-imap-folder.c:2203
-#: camel/providers/imap/camel-imap-folder.c:2273
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2577
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -9897,95 +9940,111 @@ msgstr "Nom:"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "Comprova si hi ha nou correu"
+
+#: camel/providers/imap/camel-imap-provider.c:65
 #, fuzzy
 msgid "IMAP"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Contrasenya"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aquesta opció es connectarà al servidor IMAP mitjançant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/imap/camel-imap-store.c:589
+#: camel/providers/imap/camel-imap-store.c:821
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "Cancel·lat"
 
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:655
+#: camel/providers/imap/camel-imap-store.c:686
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/pop3/camel-pop3-store.c:220
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operació no suportada"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:687
 #: camel/providers/pop3/camel-pop3-store.c:261
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autenticació:"
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:824
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "No s'ha pogut connectar al servidor POP en %s."
+
+#: camel/providers/imap/camel-imap-store.c:1237
 #, fuzzy, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticació sol·licitat."
 
-#: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticació:"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSi us plau, introduïu la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9996,42 +10055,71 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1660
+#: camel/providers/imap/camel-imap-store.c:1802
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2003
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2015
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2051
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+#, fuzzy
+msgid "Message storage"
+msgstr "Cos del missatge"
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAPv4"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "No s'ha pogut connectar al servidor POP en %s."
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "FIXME: Nou _missatge per contactar"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:379
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%2$s%1$s"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:383
+#: camel/providers/local/camel-local-folder.c:386
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "No es pot obrir la bústia de correu temporal: %s"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:390
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%2$s%1$s"
@@ -10093,50 +10181,54 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' no és un fitxer habitual."
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
@@ -10150,18 +10242,18 @@ msgstr "No s'ha pogut obrir el resum %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr ""
 
@@ -10177,7 +10269,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -10246,30 +10338,30 @@ msgstr "Còpia de missatges"
 msgid "Storing folder"
 msgstr "S'està sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-spool-folder.c:148
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:289
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:349
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:352
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -10278,15 +10370,15 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -10295,7 +10387,16 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr ""
+"No s'ha pogut crear el directori %s:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -10304,14 +10405,15 @@ msgstr ""
 "No s'ha pogut crear el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' no és un fitxer habitual."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -10320,11 +10422,36 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no és buida. No s'ha suprimit."
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "No s'ha pogut crear el directori %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
+
+#: camel/providers/local/camel-mbox-store.c:427
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "El nom de carpeta indicat no és vàlid."
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
@@ -10358,7 +10485,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "No es pot obrir la bústia de correu temporal: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
@@ -10375,40 +10502,40 @@ msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Incongruència del resum, s'està interrompent la sincronització"
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error en escriure a la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error en escriure a la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
@@ -10488,6 +10615,64 @@ msgid ""
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr "El servidor ha rebutjat el nom d'usuari"
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+msgid "Failed to send username to server"
+msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr ""
+"No es pot recuperar el missatge: %s\n"
+"  %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+#, fuzzy
+msgid "User cancelled"
+msgstr "Obre l'agenda"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr "No s'ha pogut aconseguir la llista de grups del servidor"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Notícies d'USENET"
@@ -10496,22 +10681,22 @@ msgstr "Notícies d'USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Proveïdor per llegir i publicar als grups de notícies d'USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr "Notícies d'USENET mitjançant %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -10519,38 +10704,38 @@ msgstr ""
 "Aquesta opció us autentica al servidor NNTP mitjançant una contrasenya en "
 "text net"
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Còpia de missatges"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 #, fuzzy
 msgid "Use cancel"
 msgstr "Cancel·lat"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Obre l'agenda"
@@ -10560,14 +10745,6 @@ msgstr "Obre l'agenda"
 msgid "Retrieving POP summary"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-#, fuzzy
-msgid "User cancelled"
-msgstr "Obre l'agenda"
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
@@ -10578,38 +10755,23 @@ msgstr "No es pot bifurcar %s: %s"
 msgid "Expunging deleted messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hi ha cap missatge amb l'uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-"No es pot recuperar el missatge: %s\n"
-"  %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Error desconegut"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-#, fuzzy
-msgid "Message storage"
-msgstr "Cos del missatge"
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 #, fuzzy
 msgid "Leave messages on server"
@@ -10785,154 +10947,154 @@ msgstr ""
 "Per al lliurament de correu mitjançant la connexió a un concentrador de "
 "correu utilitzant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 #, fuzzy
 msgid "Help message"
 msgstr "Mou el missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 #, fuzzy
 msgid "Service ready"
 msgstr "Amaga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "No s'ha indicat cap contrasenya."
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticació sol·licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autenticació:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autenticació:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:298
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:372
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticació sol·licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sSi us plau, introduïu la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10943,95 +11105,95 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Lliurament de correu mitjançant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:714
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 #, fuzzy
 msgid "HELO response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autenticació:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
@@ -11039,71 +11201,70 @@ msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 #, fuzzy
 msgid "DATA response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy
 msgid "RSET response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Error desconegut: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:103
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "adjunció"
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista d'adjuncions"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Afegeix una adjunció..."
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
@@ -11136,93 +11297,12 @@ msgstr "Tipus de MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Feu clic aquí per a la llibreta d'adreces"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Respon"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "De:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Assumpte:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Per a:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Introduïu els destinataris del missatge"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Întroduïu les adreces que rebran una còpia del missatge"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"introduïu les adreces que rebran una còpia del missatge sense aparèixer a la "
-"llista de destinataris del missatge."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-#, fuzzy
-msgid "Post To:"
-msgstr "Prioritat:"
-
-#: composer/e-msg-composer-hdrs.c:553
-#, fuzzy
-msgid "Posting destination"
-msgstr "Descripció:"
-
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
-#, fuzzy
-msgid "Attach file(s)"
-msgstr "Adjunta un fitxer"
-
-#: composer/e-msg-composer.c:535
+#: composer/e-msg-composer.c:562
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "No s'ha pogut crear el quadre de diàleg."
 
-#: composer/e-msg-composer.c:814
+#: composer/e-msg-composer.c:841
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11231,65 +11311,65 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1177
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1195
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1218
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1294
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1302
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1309
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1316
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1287
+#: composer/e-msg-composer.c:1325
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1296
+#: composer/e-msg-composer.c:1334
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1594
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11300,36 +11380,36 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1603
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Reenvia el missatge"
 
-#: composer/e-msg-composer.c:1593
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:2017
+#: composer/e-msg-composer.c:2054
 #, fuzzy
 msgid "Signature:"
 msgstr "Fitxer de signatura:"
 
-#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:2934
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2962
+#: composer/e-msg-composer.c:3030
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11338,19 +11418,102 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/e-msg-composer.c:3029
+#: composer/e-msg-composer.c:3100
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/e-msg-composer.c:4045
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
+#: composer/e-msg-composer-hdrs.c:290
+#, fuzzy
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+"Cal que configureu una identitat\n"
+"abans de poder redactar correu."
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Feu clic aquí per a la llibreta d'adreces"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Respon"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "De:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Assumpte:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Per a:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Introduïu els destinataris del missatge"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Întroduïu les adreces que rebran una còpia del missatge"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"introduïu les adreces que rebran una còpia del missatge sense aparèixer a la "
+"llista de destinataris del missatge."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+#, fuzzy
+msgid "Post To:"
+msgstr "Prioritat:"
+
+#: composer/e-msg-composer-hdrs.c:553
+#, fuzzy
+msgid "Posting destination"
+msgstr "Descripció:"
+
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
+msgstr "Adjunta un fitxer"
+
 #: data/evolution.desktop.in.h:1
 #, fuzzy
 msgid "The Evolution groupware suite"
@@ -11521,7 +11684,7 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
@@ -11544,103 +11707,224 @@ msgstr "categories"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 #, fuzzy
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 #, fuzzy
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 #, fuzzy
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 #, fuzzy
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 #, fuzzy
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 #, fuzzy
 msgid "%m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 #, fuzzy
 msgid "%m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 #, fuzzy
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 #, fuzzy
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 #, fuzzy
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 #, fuzzy
 msgid "%I %p"
 msgstr "%I:%M %p"
 
+#: executive-summary/component/component-factory.c:151
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: executive-summary/component/e-summary.c:925
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"No s'ha pogut obrir el fitxer %s:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:939
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Error en carregar el fitxer: %s"
+
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:125
+#, fuzzy
+msgid "Select a service"
+msgstr "Fitxer de signatura:"
+
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "S'està recollint el correu des de %s"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:73
+#, fuzzy, c-format
+msgid "Run %s"
+msgstr "URL:"
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Tanca"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Mou a la carpeta"
+
+#: executive-summary/component/e-summary-url.c:77
+#, fuzzy, c-format
+msgid "Move %s to the right"
+msgstr "Mou a la carpeta"
+
+#: executive-summary/component/e-summary-url.c:78
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Vés a l'element anterior"
+
+#: executive-summary/component/e-summary-url.c:79
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Vés a l'element següent"
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Configura la carpeta"
+
+#: executive-summary/component/e-summary-url.c:553
+#, fuzzy
+msgid "page"
+msgstr "Pàgina"
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+#, fuzzy
+msgid "Error"
+msgstr "Cap error"
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update now"
+msgstr "ha estat després de"
+
+#: executive-summary/test-service/rdf-summary.c:795
+#, fuzzy
+msgid "Update every "
+msgstr "_Actualitza lliure/ocupat"
+
 #: filter/filter-datespec.c:65
 #, fuzzy
 msgid "1 second ago"
@@ -11768,92 +12052,6 @@ msgstr "Nom de l'estil:"
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: filter/filter-input.c:191
-#, fuzzy, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Error en preparar-se per a %s:\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
-msgid "Important"
-msgstr ""
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-#, fuzzy
-msgid "Work"
-msgstr "S'està movent"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
-#, fuzzy
-msgid "To Do"
-msgstr "Per a"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
-#, fuzzy
-msgid "Later"
-msgstr "després de"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Comprova"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr ""
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Nom de la regla: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Sense títol"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Si"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Executa les accions"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "si es compleixen tots els criteris"
-
-#: filter/filter-rule.c:800
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "si es compleix qualsevol criteri"
-
-#: filter/filter-rule.c:895
-#, fuzzy
-msgid "incoming"
-msgstr ""
-"Entrant\n"
-"Sortint\n"
-
-#: filter/filter-rule.c:895
-#, fuzzy
-msgid "outgoing"
-msgstr "Agrupament"
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Compara-la amb"
@@ -11965,6 +12163,92 @@ msgstr "Crea una carpeta nova"
 msgid "years"
 msgstr "anys"
 
+#: filter/filter-input.c:191
+#, fuzzy, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Error en preparar-se per a %s:\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+msgid "Important"
+msgstr ""
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "S'està movent"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#, fuzzy
+msgid "To Do"
+msgstr "Per a"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1458
+#, fuzzy
+msgid "Later"
+msgstr "després de"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Comprova"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr ""
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Nom de la regla: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Sense títol"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Si"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Executa les accions"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "si es compleixen tots els criteris"
+
+#: filter/filter-rule.c:800
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "si es compleix qualsevol criteri"
+
+#: filter/filter-rule.c:895
+#, fuzzy
+msgid "incoming"
+msgstr ""
+"Entrant\n"
+"Sortint\n"
+
+#: filter/filter-rule.c:895
+#, fuzzy
+msgid "outgoing"
+msgstr "Agrupament"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11991,241 +12275,241 @@ msgid "Beep"
 msgstr "Mida"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "conté"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Data de recepció"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Deleted"
 msgstr "Suprimeix"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "no conté"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "no existeix"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "no existeix"
-
-#: filter/libfilter-i18n.h:17
-#, fuzzy
-msgid "does not sound like"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "no comença per"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 #, fuzzy
 msgid "Draft"
 msgstr "Data de venciment"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "acaba amb"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existeix"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Expressió"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "és"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "ha estat després de"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "ha estat abans de"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "és més gran que"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "és més petit que"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "no és"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "no és"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Label"
 msgstr "etiqueta9"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Final del dia:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
 #, fuzzy
 msgid "Read"
 msgstr "Ràdio"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "Replied to"
 msgstr "Respon a tots"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Ocupat"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "és més gran que"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "és més petit que"
-
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuació"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+#: filter/libfilter-i18n.h:30
 msgid "Sender"
 msgstr "Remitent"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexió"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:32
 #, fuzzy
 msgid "Shell Command"
 msgstr "Empresa"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Mida"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "Source Account"
 msgstr "conté"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:35
 msgid "Specific header"
 msgstr "Especifiqueu la capçalera"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "comença per"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:37
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Assumpte"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "Unset Status"
 msgstr "Estat de la connexió"
 
-#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/libfilter-i18n.h:40
+msgid "contains"
+msgstr "conté"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not contain"
+msgstr "no conté"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:43
+msgid "does not exist"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "does not return"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:45
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:46
+msgid "does not start with"
+msgstr "no comença per"
+
+#: filter/libfilter-i18n.h:47
+msgid "ends with"
+msgstr "acaba amb"
+
+#: filter/libfilter-i18n.h:48
+msgid "exists"
+msgstr "existeix"
+
+#: filter/libfilter-i18n.h:49
+msgid "is Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is after"
+msgstr "ha estat després de"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is before"
+msgstr "ha estat abans de"
+
+#: filter/libfilter-i18n.h:52
+msgid "is greater than"
+msgstr "és més gran que"
+
+#: filter/libfilter-i18n.h:53
+msgid "is less than"
+msgstr "és més petit que"
+
+#: filter/libfilter-i18n.h:54
+#, fuzzy
+msgid "is not Flagged"
+msgstr "no és"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not"
+msgstr "no és"
+
+#: filter/libfilter-i18n.h:56
+msgid "is"
+msgstr "és"
+
+#: filter/libfilter-i18n.h:57
+#, fuzzy
+msgid "returns greater than"
+msgstr "és més gran que"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns less than"
+msgstr "és més petit que"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns"
+msgstr "Ocupat"
+
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:61
+msgid "starts with"
+msgstr "comença per"
+
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:916
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -12301,10 +12585,9 @@ msgid "Scanning %s"
 msgstr "S'està examinant %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 #, fuzzy
 msgid "Mail"
 msgstr "_Correu"
@@ -12368,7 +12651,7 @@ msgstr ""
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 #, fuzzy
 msgid "Trash"
 msgstr "Tasca"
@@ -12385,7 +12668,7 @@ msgid "Scanning directory"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:541
+#: shell/e-shell-startup-wizard.c:556
 #, fuzzy
 msgid "Starting import"
 msgstr "Data d'_inici:"
@@ -12421,382 +12704,172 @@ msgstr ""
 msgid "Pine"
 msgstr "Imprimeix"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Preferències de l'agenda"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Configuració del correu"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Configuració del correu"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "Configuració del correu"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
-msgid "Mail Accounts"
-msgstr "conté"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-#, fuzzy
-msgid "Mail Preferences"
-msgstr "Preferències"
-
-#: mail/component-factory.c:117
+#: mail/component-factory.c:116
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Públic"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:147
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 #, fuzzy
 msgid "Properties..."
 msgstr "Propietats..."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propietats de la llista de coses per fer"
 
-#: mail/component-factory.c:819
+#: mail/component-factory.c:826
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:1000
+#: mail/component-factory.c:1008
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap mètode de transport de correu"
 
-#: mail/component-factory.c:1023
+#: mail/component-factory.c:1031
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 #, fuzzy
 msgid "New Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1064
+#: mail/component-factory.c:1072
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Redacta un missatge"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 #, fuzzy
 msgid "New Message Post"
 msgstr "_Missatge"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 #, fuzzy
 msgid "_Post Message"
 msgstr "_Imprimeix el missatge"
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1081
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1365
+#: mail/component-factory.c:1373
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connexió de prova a \"%s\""
 
-#: mail/component-factory.c:1376
+#: mail/component-factory.c:1384
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'intèrpret d'ordres"
 
-#: mail/folder-browser-ui.c:486
-#, fuzzy, c-format
-msgid "Properties for \"%s\""
-msgstr "Propietats..."
-
-#: mail/folder-browser-ui.c:488
+#: mail/folder-info.c:70
 #, fuzzy
-msgid "Properties"
-msgstr "Propietats..."
-
-#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "No s'ha pogut crear el directori temporal: %s"
-
-#: mail/folder-browser.c:782
-#, c-format
-msgid "%d new"
-msgstr ""
+msgid "Getting Folder Information"
+msgstr "Cap informació"
 
-#: mail/folder-browser.c:785 mail/folder-browser.c:793
-#: mail/folder-browser.c:796
-msgid ", "
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Preferències de l'agenda"
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "%d hidden"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/folder-browser.c:789
-#, c-format
-msgid "%d visible"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/folder-browser.c:794
-#, fuzzy, c-format
-msgid "%d selected"
-msgstr "Suprimeix"
-
-#: mail/folder-browser.c:799
-#, fuzzy, c-format
-msgid "%d unsent"
-msgstr " segons"
-
-#: mail/folder-browser.c:801
-#, fuzzy, c-format
-msgid "%d sent"
-msgstr " segons"
-
-#: mail/folder-browser.c:803
-#, c-format
-msgid "%d total"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/folder-browser.c:1182
-#, fuzzy
-msgid "Create _Virtual Folder From Search..."
-msgstr "Carpetes virtuals"
-
-#: mail/folder-browser.c:1736
-#, fuzzy
-msgid "VFolder on _Subject"
-msgstr "VFolder sobre l'assumpte"
-
-#: mail/folder-browser.c:1737
-msgid "VFolder on Se_nder"
-msgstr "VFolder sobre el remite_nt"
-
-#: mail/folder-browser.c:1738
-msgid "VFolder on _Recipients"
-msgstr "VFolder sobre els destinata_ris"
-
-#: mail/folder-browser.c:1739
-#, fuzzy
-msgid "VFolder on Mailing _List"
-msgstr "Filtre sobre la llista de correu"
-
-#: mail/folder-browser.c:1743
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Filter on Sub_ject"
-msgstr "Filtre sobre l'assumpte"
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: mail/folder-browser.c:1744
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "Filter on Sen_der"
-msgstr "Filtre sobre el remitent"
+msgid "Evolution Mail accounts configuration control"
+msgstr "Configuració del correu"
 
-#: mail/folder-browser.c:1745
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
-msgid "Filter on Re_cipients"
-msgstr "Filtre sobre els destinataris"
+msgid "Evolution Mail component"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Filter on _Mailing List"
-msgstr "Filtre sobre la llista de correu"
+msgid "Evolution Mail composer"
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/folder-browser.c:1764
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "_Edit as New Message..."
-msgstr "_Anomena i desa..."
-
-#: mail/folder-browser.c:1766
-msgid "_Print"
-msgstr "_Imprimeix"
+msgid "Evolution Mail composer configuration control"
+msgstr "Configuració del correu"
 
-#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 #, fuzzy
-msgid "_Reply to Sender"
-msgstr "Respon al remitent"
+msgid "Evolution Mail configuration interface"
+msgstr "Configuració del correu"
 
-#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Reply to _List"
-msgstr "Respon a _tots"
-
-#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
-msgid "Reply to _All"
-msgstr "Respon a _tots"
-
-#: mail/folder-browser.c:1773
-msgid "_Forward"
-msgstr "_Reenvia"
-
-#: mail/folder-browser.c:1777
-msgid "Follo_w Up..."
+msgid "Evolution Mail folder viewer"
 msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/folder-browser.c:1778
-#, fuzzy
-msgid "Fla_g Completed"
-msgstr "% comp_let:"
-
-#: mail/folder-browser.c:1779
-#, fuzzy
-msgid "Cl_ear Flag"
-msgstr "Agenda"
-
-#. separator here?
-#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
-#, fuzzy
-msgid "Mar_k as Read"
-msgstr "Mar_ca'l com a llegit"
-
-#: mail/folder-browser.c:1784
-#, fuzzy
-msgid "Mark as _Unread"
-msgstr "Marca'l com a per _llegir"
-
-#: mail/folder-browser.c:1785
-#, fuzzy
-msgid "Mark as _Important"
-msgstr "Marca'l com a per _llegir"
-
-#: mail/folder-browser.c:1786
-#, fuzzy
-msgid "_Mark as Unimportant"
-msgstr "Marca'l com a per _llegir"
-
-#: mail/folder-browser.c:1791
-#, fuzzy
-msgid "U_ndelete"
-msgstr "_Suprimeix"
-
-#: mail/folder-browser.c:1795
-#, fuzzy
-msgid "Mo_ve to Folder..."
-msgstr "Mou a la carpeta"
-
-#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
-#, fuzzy
-msgid "_Copy to Folder..."
-msgstr "_Copia a la carpeta"
-
-#: mail/folder-browser.c:1804
-#, fuzzy
-msgid "Add Sender to Address_book"
-msgstr "Desa a la llibreta d'adreces"
-
-#: mail/folder-browser.c:1808
-#, fuzzy
-msgid "Appl_y Filters"
-msgstr "_Aplica els filtres"
-
-#: mail/folder-browser.c:1812
-#, fuzzy
-msgid "Crea_te Rule From Message"
-msgstr "Carpetes virtuals"
-
-#: mail/folder-browser.c:2071
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
 #, fuzzy
-msgid "VFolder on M_ailing List"
-msgstr "Filtre sobre la llista de correu"
-
-#: mail/folder-browser.c:2073
-#, fuzzy, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Filtre sobre la llista de correu (%s)"
-
-#: mail/folder-browser.c:2074
-#, fuzzy, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "Filtre sobre la llista de correu (%s)"
+msgid "Evolution Mail preferences control"
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 #, fuzzy
-msgid "Default"
-msgstr "Valors predeterminats"
+msgid "Mail Accounts"
+msgstr "conté"
 
-#: mail/folder-info.c:70
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
 #, fuzzy
-msgid "Getting Folder Information"
-msgstr "Cap informació"
+msgid "Mail Preferences"
+msgstr "Preferències"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12891,7 +12964,7 @@ msgstr "Nom d'usuari:"
 msgid "_Path:"
 msgstr "Camí:"
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1886
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -12928,18 +13001,18 @@ msgstr "Valors predeterminats"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 #, fuzzy
 msgid "Enabled"
 msgstr "Inhabilitat"
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 #, fuzzy
 msgid "Account name"
 msgstr "conté"
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 msgid "Protocol"
 msgstr ""
 
@@ -12979,220 +13052,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-#, fuzzy
-msgid "Don't show this message again."
-msgstr "Envia aquest missatge"
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"No heu configurat el client de correu.\n"
-"Cal que ho feu abans de poder enviar,\n"
-"rebre o redactar correu.\n"
-"El voleu configurar ara?"
-
-#: mail/mail-callbacks.c:212
-#, fuzzy
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-"Cal que configureu una identitat\n"
-"abans de poder redactar correu."
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Cal que configureu una identitat\n"
-"abans de poder redactar correu."
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Cal que configureu un transport de correu\n"
-"abans de poder redactar correu."
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-
-#: mail/mail-callbacks.c:267
-#, fuzzy
-msgid "Send anyway?"
-msgstr "S'està recollint el correu des de %s"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Aquest missatge no té cap assumpte.\n"
-"Voleu que l'enviï igualment?"
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:318
-#, fuzzy
-msgid "This message contains only Bcc recipients."
-msgstr "S'està afegint un missatge sense cap assumpte"
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:1189
-#, fuzzy
-msgid "an unknown sender"
-msgstr "Error desconegut"
-
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr ""
-
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "Mou el(s) missatge(s) cap a"
-
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "Copia el(s) missatge(s) a"
-
-#: mail/mail-callbacks.c:2344
-#, fuzzy, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Només podeu editar els missatges que s'hagin desat\n"
-"a la carpeta Esborranys."
-
-#: mail/mail-callbacks.c:2393
-#, fuzzy
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Només podeu editar els missatges que s'hagin desat\n"
-"a la carpeta Esborranys."
-
-#: mail/mail-callbacks.c:2403
-#, fuzzy, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
-
-#: mail/mail-callbacks.c:2424
-#, fuzzy
-msgid "No Message Selected"
-msgstr "S'ha rebut el missatge"
-
-#: mail/mail-callbacks.c:2465
-#, fuzzy, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"No es pot obrir la ubicació `%s':\n"
-"%s"
-
-#: mail/mail-callbacks.c:2470
-#, fuzzy, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ja existeix una fitxer amb aquest nom.\n"
-"El voleu sobreescriure?"
-
-#: mail/mail-callbacks.c:2511
-#, fuzzy
-msgid "Save Message As..."
-msgstr "Anomena i desa..."
-
-#: mail/mail-callbacks.c:2513
-#, fuzzy
-msgid "Save Messages As..."
-msgstr "Anomena i desa..."
-
-#: mail/mail-callbacks.c:2686
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2781
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Error en carregar la informació del filtre:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2789
-#, fuzzy
-msgid "Filters"
-msgstr "_Filtres de correu ..."
-
-#: mail/mail-callbacks.c:2830
-#, fuzzy, c-format
-msgid "Page %d of %d"
-msgstr "S'està escrivint el missatge %d de %d"
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr "Imprimeix el missatge"
-
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr "Ha fallat la impressió del missatge"
-
-#: mail/mail-callbacks.c:3147
-#, fuzzy, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 #, fuzzy
@@ -13224,48 +13083,57 @@ msgstr "Afegeix un criteri"
 msgid "Signature(s)"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+#, fuzzy
+msgid "Connecting to server..."
+msgstr "Connexió de prova a \"%s\""
+
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identitat"
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:369
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:377
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:389
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:396
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -13274,15 +13142,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-#, fuzzy
-msgid "Connecting to server..."
-msgstr "Connexió de prova a \"%s\""
-
 #: mail/mail-config.glade.h:3
 #, fuzzy
 msgid " _Check for supported types "
@@ -13417,6 +13276,11 @@ msgstr ""
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Valors predeterminats"
+
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
@@ -13921,235 +13785,27 @@ msgstr ""
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
-#, fuzzy
-msgid "color"
-msgstr "Colors"
-
 #: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "description"
 msgstr "Descripció:"
 
-#: mail/mail-crypto.c:84
-#, fuzzy
-msgid "Could not create a S/MIME signature context."
-msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#: mail/mail-crypto.c:116
-#, fuzzy
-msgid "Could not create a S/MIME certsonly context."
-msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#: mail/mail-crypto.c:148
-#, fuzzy
-msgid "Could not create a S/MIME encryption context."
-msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#: mail/mail-crypto.c:180
-#, fuzzy
-msgid "Could not create a S/MIME envelope context."
-msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#: mail/mail-crypto.c:211
-#, fuzzy
-msgid "Could not create a S/MIME decode context."
-msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#: mail/mail-display.c:197
-#, fuzzy, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ja existeix una fitxer amb aquest nom.\n"
-"El voleu sobreescriure?"
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr "Desa l'adjunció"
-
-#: mail/mail-display.c:409
-#, fuzzy, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
-
-#: mail/mail-display.c:457
-#, fuzzy
-msgid "Save Attachment..."
-msgstr "Desa l'adjunció"
-
-#: mail/mail-display.c:458
-msgid "View Inline"
-msgstr "Visualitza en línia"
-
-#: mail/mail-display.c:459
-#, c-format
-msgid "Open in %s..."
-msgstr "Obre a %s..."
-
-#: mail/mail-display.c:515
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Visualitza en línia (mitjançant %s)"
-
-#: mail/mail-display.c:519
-msgid "Hide"
-msgstr "Amaga"
-
-#: mail/mail-display.c:539
-msgid "External Viewer"
-msgstr "Visualitzador extern"
-
-#: mail/mail-display.c:1368
-#, fuzzy
-msgid "Downloading images"
-msgstr "Missatge reenviat - %s"
-
-#: mail/mail-display.c:1545
-#, fuzzy
-msgid "Loading message content"
-msgstr "S'estan reenviant els missatges \"%s\""
-
-#: mail/mail-display.c:1887
-#, fuzzy
-msgid "Overdue:"
-msgstr "Elements que ja han vençut:"
-
-#: mail/mail-display.c:1891
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %P"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: mail/mail-display.c:2255
-#, fuzzy
-msgid "Open Link in Browser"
-msgstr "Obre'l en una nova finestra"
-
-#: mail/mail-display.c:2256
-#, fuzzy
-msgid "Copy Link Location"
-msgstr "_Contacte (FIXME)"
-
-#: mail/mail-display.c:2258
-#, fuzzy
-msgid "Save Link as (FIXME)"
-msgstr "_Tasca (FIXME)"
-
-#: mail/mail-display.c:2260
-#, fuzzy
-msgid "Save Image as..."
-msgstr "Anomena i desa..."
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:832
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "S'està examinant %s"
 
-#: mail/mail-format.c:665
-#, fuzzy, c-format
-msgid "%s attachment"
-msgstr "adjunció"
-
-#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
-#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
-#, fuzzy
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
-
-#: mail/mail-format.c:785 mail/message-list.etspec.h:2
-#, fuzzy
-msgid "Date"
-msgstr "Data de venciment"
-
-#: mail/mail-format.c:871
-#, fuzzy
-msgid "Bad Address"
-msgstr "Adreça electrònica:"
-
-#: mail/mail-format.c:912 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-#, fuzzy
-msgid "From"
-msgstr "De:"
-
-#: mail/mail-format.c:916
-#, fuzzy
-msgid "Reply-To"
-msgstr "Respon"
-
-#: mail/mail-format.c:921 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Per a"
-
-#: mail/mail-format.c:926
-#, fuzzy
-msgid "Cc"
-msgstr "Cc:"
-
-#: mail/mail-format.c:931
-#, fuzzy
-msgid "Bcc"
-msgstr "Bcc:"
-
-#: mail/mail-format.c:1482
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1510
-#, fuzzy
-msgid "Could not create a PGP verfication context"
-msgstr "No s'ha pogut crear el quadre de diàleg."
-
-#: mail/mail-format.c:1518
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1525
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1789
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1800
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1803
-#, fuzzy, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Filtre sobre la llista de correu (%s)"
-
-#: mail/mail-format.c:1830
-#, fuzzy, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Filtre sobre la llista de correu (%s)"
-
-#: mail/mail-format.c:1836
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1838
-msgid "Malformed external-body part."
-msgstr ""
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:711
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:792
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -14158,24 +13814,24 @@ msgstr ""
 "No es pot desar la informació meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:848
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:900
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: mail/mail-local.c:1323
+#: mail/mail-local.c:1363
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'està convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1388
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -14183,16 +13839,16 @@ msgstr ""
 "Si ja no podeu obrir aquesta bústia de correu\n"
 "potser us caldrà reparar-la manualment."
 
-#: mail/mail-local.c:1448
+#: mail/mail-local.c:1488
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:1512
+#: mail/mail-local.c:1552
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:259
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -14201,7 +13857,7 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:262
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -14210,267 +13866,241 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:913
 #, fuzzy
 msgid "Working"
 msgstr "S'està movent"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:87
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Fi_ltre sobre el remitent"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:260
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Sendmail"
 
-#: mail/mail-ops.c:550 mail/mail-ops.c:579
-msgid "However, the message was successfully sent."
+#: mail/mail-ops.c:557
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
+
+#: mail/mail-ops.c:578
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:587
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
+
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'està enviant \"%s\""
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:747
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:766
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "S'està marcant el missatge %d de %d"
 
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:768
 #, fuzzy
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:862
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Còpia de missatges"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1244
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1287
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1359
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1437
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1531
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1582
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'està esborrant \"%s\""
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1666
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "S'està movent"
 
-#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 #, fuzzy
 msgid "Local Folders"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1742
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1814
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1898
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Còpia de missatges"
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1946
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1974
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2045
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunció"
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2062
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "S'està recollint el correu des de %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "S'està recollint el correu des de %s"
 
-#: mail/mail-search.c:154
-#, fuzzy
-msgid "(Untitled Message)"
-msgstr "(Sense títol)"
-
-#: mail/mail-search.c:236
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Mou el missatge"
-
-#: mail/mail-search.c:238
-#, fuzzy
-msgid "Empty Message"
-msgstr "_Edita el missatge"
-
-#: mail/mail-search.c:287
-#, fuzzy
-msgid "Find in Message"
-msgstr "_Edita el missatge"
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr ""
-
-#: mail/mail-search.c:322
-#, fuzzy
-msgid "Search Forward"
-msgstr "Reenvia"
-
-#: mail/mail-search.c:342
-#, fuzzy
-msgid "Find:"
-msgstr "Cerca"
-
-#: mail/mail-search.c:346
-#, fuzzy
-msgid "Matches:"
-msgstr "Camí:"
-
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Cancel·lat"
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:255
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor:"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:259
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipus:"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:308
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Cancel·lat"
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:390
 #, fuzzy
 msgid "Updating..."
 msgstr "_Paràmetres"
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 #, fuzzy
 msgid "Waiting..."
 msgstr "_Paràmetres"
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:229
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Consulta cancel·lada per l'usuari."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:262
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:264
 #, fuzzy
 msgid "Enter Password"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:287
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:288
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -14525,22 +14155,17 @@ msgstr "Missatge reenviat - %s"
 msgid "Forwarded message"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:438
-#, fuzzy
-msgid "Forwarded Message"
-msgstr "Reenvia el missatge"
-
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:91
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:209
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "S'està carregant la carpeta %s"
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:467
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -14549,114 +14174,109 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:776
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:834
 #, fuzzy
 msgid "vFolders"
 msgstr "Carpetes"
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:873
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Edita les VFolders"
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:965
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
-#: mail/message-browser.c:233
-#, fuzzy
-msgid "(No subject)"
-msgstr "Re: (sense assumpte)"
-
-#: mail/message-browser.c:235
-#, fuzzy, c-format
-msgid "%s - Message"
-msgstr "_Missatge"
-
-#: mail/message-list.c:741
+#: mail/message-list.c:900
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:742
+#: mail/message-list.c:901
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:743
+#: mail/message-list.c:902
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:903
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:904
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:908
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:909
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:754
+#: mail/message-list.c:913
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:755
+#: mail/message-list.c:914
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1231
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1238
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1247
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1259
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1267
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1269
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3062
 #, fuzzy
 msgid "Generating message list"
 msgstr "Còpia de missatges"
 
+#: mail/message-list.etspec.h:2
+#, fuzzy
+msgid "Date"
+msgstr "Data de venciment"
+
 #: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
@@ -14675,6 +14295,11 @@ msgstr ""
 msgid "Follow Up Flag"
 msgstr ""
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#, fuzzy
+msgid "From"
+msgstr "De:"
+
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
@@ -14689,6 +14314,10 @@ msgstr "Data de recepció"
 msgid "Size"
 msgstr "Mida"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Per a"
+
 #: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
@@ -14708,7 +14337,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr "Cap informació"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr "Reenvia"
 
@@ -14716,11 +14345,11 @@ msgstr "Reenvia"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
 msgid "Reply"
 msgstr "Respon"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
 msgid "Reply to All"
 msgstr "Respon a tots"
 
@@ -14755,41 +14384,6 @@ msgstr "Data de venciment"
 msgid "_Flag:"
 msgstr "Nom del fitxer:"
 
-#: mail/subscribe-dialog.c:230
-#, fuzzy, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#: mail/subscribe-dialog.c:232
-#, fuzzy, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#: mail/subscribe-dialog.c:329
-#, fuzzy, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "S'estan escanejant les carpetes de \"%s\""
-
-#: mail/subscribe-dialog.c:331
-#, fuzzy, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-#, fuzzy
-msgid "Folder"
-msgstr "Carpetes"
-
-#: mail/subscribe-dialog.c:1499
-#, fuzzy
-msgid "No server has been selected"
-msgstr "S'ha rebut el missatge"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr ""
-
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -14807,19 +14401,141 @@ msgstr "Servidor:"
 
 #: mail/subscribe-dialog.glade.h:4
 #, fuzzy
-msgid "Scanning folders ..."
-msgstr "Desa a la _carpeta..."
-
-#: mail/subscribe-dialog.glade.h:5
-#, fuzzy
 msgid "_Subscribe"
 msgstr "Subscriu-me"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "Cancel·la la subscripció"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/e-summary.c:204
+#, fuzzy
+msgid "%A, %B %e %Y"
+msgstr "%A, %d de %B de %Y"
+
+#: my-evolution/e-summary.c:533
+#, fuzzy
+msgid "Please wait..."
+msgstr "acaba amb"
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+#, fuzzy
+msgid "Print Summary"
+msgstr "R_esum"
+
+#: my-evolution/e-summary.c:655
+#, fuzzy
+msgid "Printing of Summary failed"
+msgstr "Ha fallat la impressió del missatge"
+
+#: my-evolution/e-summary-calendar.c:384
+#, fuzzy
+msgid "Appointments"
+msgstr "Cites:"
+
+#: my-evolution/e-summary-calendar.c:392
+#, fuzzy
+msgid "No appointments."
+msgstr "Mostra les hores d'acabament de les cites"
+
+#: my-evolution/e-summary-calendar.c:409
+#, fuzzy
+msgid "%k:%M %d %B"
+msgstr "%A, %d de %B"
+
+#: my-evolution/e-summary-calendar.c:411
+#, fuzzy
+msgid "%l:%M%p %d %B"
+msgstr "%A, %d de %B"
+
+#: my-evolution/e-summary-calendar.c:429
+#, fuzzy
+msgid "No description"
+msgstr "Descripció:"
+
+#: my-evolution/e-summary-mail.c:189
+#, fuzzy
+msgid "Mail summary"
+msgstr "Sense resum"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:565
+#, fuzzy
+msgid "New News Feed"
+msgstr "Servidors de notícies"
+
+#: my-evolution/e-summary-preferences.c:581
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+#, fuzzy
+msgid "Error downloading RDF"
+msgstr "Error en carregar el fitxer: %s"
+
+#: my-evolution/e-summary-rdf.c:453
+#, fuzzy
+msgid "News Feed"
+msgstr "Servidors de notícies"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Mostra"
+
+#: my-evolution/e-summary-tasks.c:349
+#, fuzzy
+msgid "No tasks"
+msgstr "Mostra les _adjuncions"
+
+#: my-evolution/e-summary-tasks.c:387
+#, fuzzy
+msgid "blue"
+msgstr "desembre"
+
+#: my-evolution/e-summary-tasks.c:387
+#, fuzzy
+msgid "(No Description)"
+msgstr "(Sense descripció)"
+
+#: my-evolution/e-summary-weather.c:72
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:261
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "Weather"
+msgstr "Altres"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:582
+msgid "KBOS"
+msgstr ""
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
@@ -25520,128 +25236,6 @@ msgstr ""
 msgid "Zurich"
 msgstr "Tasca"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:381
-#, fuzzy
-msgid "Appointments"
-msgstr "Cites:"
-
-#: my-evolution/e-summary-calendar.c:389
-#, fuzzy
-msgid "No appointments."
-msgstr "Mostra les hores d'acabament de les cites"
-
-#: my-evolution/e-summary-calendar.c:406
-#, fuzzy
-msgid "%k:%M %d %B"
-msgstr "%A, %d de %B"
-
-#: my-evolution/e-summary-calendar.c:408
-#, fuzzy
-msgid "%l:%M%P %d %B"
-msgstr "%A, %d de %B"
-
-#: my-evolution/e-summary-calendar.c:426
-#, fuzzy
-msgid "No description"
-msgstr "Descripció:"
-
-#: my-evolution/e-summary-mail.c:189
-#, fuzzy
-msgid "Mail summary"
-msgstr "Sense resum"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:565
-#, fuzzy
-msgid "New News Feed"
-msgstr "Servidors de notícies"
-
-#: my-evolution/e-summary-preferences.c:581
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-#, fuzzy
-msgid "Error downloading RDF"
-msgstr "Error en carregar el fitxer: %s"
-
-#: my-evolution/e-summary-rdf.c:453
-#, fuzzy
-msgid "News Feed"
-msgstr "Servidors de notícies"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "Mostra"
-
-#: my-evolution/e-summary-tasks.c:330
-#, fuzzy
-msgid "No tasks"
-msgstr "Mostra les _adjuncions"
-
-#: my-evolution/e-summary-tasks.c:364
-#, fuzzy
-msgid "(No Description)"
-msgstr "(Sense descripció)"
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-#, fuzzy
-msgid "Weather"
-msgstr "Altres"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr ""
-
-#: my-evolution/e-summary.c:204
-#, fuzzy
-msgid "%A, %B %e %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: my-evolution/e-summary.c:533
-#, fuzzy
-msgid "Please wait..."
-msgstr "acaba amb"
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-#, fuzzy
-msgid "Print Summary"
-msgstr "R_esum"
-
-#: my-evolution/e-summary.c:655
-#, fuzzy
-msgid "Printing of Summary failed"
-msgstr "Ha fallat la impressió del missatge"
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr ""
@@ -26960,24 +26554,27 @@ msgstr "Dimecres"
 msgid "_Show full path for folders"
 msgstr "Mostra en aquest ordre"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
+#: notes/component-factory.c:27
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nou"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#: notes/component-factory.c:27
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "No es pot inicialitzat l'intèrpret d'ordres de l'Evolution."
+msgid "Create a new note"
+msgstr "Creació d'una nova carpeta"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#: notes/component-factory.c:152
 #, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
+msgid "Cannot initialize Evolution's notes component."
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#: notes/main.c:30
 #, fuzzy
-msgid "Folder Settings"
-msgstr "_Paràmetres"
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #: shell/e-activity-handler.c:164
 #, fuzzy
@@ -27075,6 +26672,45 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "No es pot configurar l'emmagatzemament local -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:2071
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "No es pot registrar l'emmagatzemament amb l'intèrpret d'ordres"
+
+#: shell/e-shell.c:2073
+#, fuzzy
+msgid "Configuration Database not found"
+msgstr "Configuració del correu"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Error genèric"
+
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
@@ -27176,27 +26812,32 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:538
+#: shell/e-shell-folder-commands.c:534
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:541
 #, fuzzy
 msgid "Rename Folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-folder-commands.c:553
+#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "El nom de carpeta indicat no és vàlid."
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:590
+#: shell/e-shell-folder-commands.c:587
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -27236,125 +26877,134 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
+#: shell/e-shell-importer.c:151
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:317
+#: shell/e-shell-importer.c:323
 #, fuzzy
 msgid "Select importer"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:458
+#: shell/e-shell-importer.c:464
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
-#: shell/e-shell-importer.c:518
+#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
+#: shell/e-shell-importer.c:524
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:475
+#: shell/e-shell-importer.c:481
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "No hi ha nou correu a %s."
 
-#: shell/e-shell-importer.c:484
+#: shell/e-shell-importer.c:490
 #, fuzzy
 msgid "Importing"
 msgstr "S'està movent"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:503
+#: shell/e-shell-importer.c:509
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:523
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:540
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:588
+#: shell/e-shell-importer.c:594
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria automàtica"
 
-#: shell/e-shell-importer.c:637
+#: shell/e-shell-importer.c:643
 #, fuzzy
-msgid "Filename:"
+msgid "_Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:648
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:658
 #, fuzzy
-msgid "File type:"
+msgid "File _type:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:676
-msgid "Import data and settings from older programs"
+#: shell/e-shell-importer.c:684
+msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:680
+#: shell/e-shell-importer.c:687
 #, fuzzy
-msgid "Import a single file"
+msgid "Import a _single file"
 msgstr "S'està movent"
 
-#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
+#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:749
+#: shell/e-shell-importer.c:758
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
+#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1047
+#: shell/e-shell-importer.c:1061
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:1048
+#: shell/e-shell-importer.c:1062
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
-msgid "Import"
-msgstr ""
+#: shell/e-shell-importer.c:1193
+#, fuzzy
+msgid "_Import"
+msgstr "S'està movent"
 
 #: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
@@ -27418,11 +27068,19 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-user-creatable-items-handler.c:586
-#: shell/e-shell-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nou"
+#: shell/e-shell-startup-wizard.c:771
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:782
+#, fuzzy
+msgid "Quit Assistant"
+msgstr "Assistent"
 
 #: shell/e-shell-utils.c:116
 #, fuzzy
@@ -27447,6 +27105,34 @@ msgstr "No s'ha pogut crear el directori %s: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Cap carpeta mostrada)"
+
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr ""
+
+#: shell/e-shell-view.c:2042
+#, fuzzy
+msgid "(None)"
+msgstr "(Sense nom)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -27502,72 +27188,14 @@ msgstr "S'està movent"
 msgid "Work Offline"
 msgstr "S'està movent"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Cap carpeta mostrada)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr ""
-
-#: shell/e-shell-view.c:2042
-#, fuzzy
-msgid "(None)"
-msgstr "(Sense nom)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "No es pot configurar l'emmagatzemament local -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:2071
-#, fuzzy
-msgid "Cannot register on OAF"
-msgstr "No es pot registrar l'emmagatzemament amb l'intèrpret d'ordres"
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Error en desar les dreceres."
 
-#: shell/e-shell.c:2073
+#: shell/e-shortcuts.c:1096
 #, fuzzy
-msgid "Configuration Database not found"
-msgstr "Configuració del correu"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Error genèric"
+msgid "Shortcuts"
+msgstr "Mostra la barra de _dreceres"
 
 #: shell/e-shortcuts-view.c:80
 #, fuzzy
@@ -27702,19 +27330,6 @@ msgstr "Elimina"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Error en desar les dreceres."
-
-#: shell/e-shortcuts.c:1096
-#, fuzzy
-msgid "Shortcuts"
-msgstr "Mostra la barra de _dreceres"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Cap error"
@@ -27773,6 +27388,15 @@ msgstr "No es pot bifurcar %s: %s"
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
+
+#: shell/e-storage-set-view.etspec.h:2
+#, fuzzy
+msgid "Folder"
+msgstr "Carpetes"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -27787,103 +27411,103 @@ msgstr "% comp_let:"
 msgid "<click here to select a folder>"
 msgstr "<feu clic aquí per seleccionar una carpeta>"
 
-#: shell/evolution-shell-component-utils.c:124
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr "Error desconegut"
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1187
 #, fuzzy
 msgid "CORBA error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1189
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1191
 #, fuzzy
 msgid "Invalid argument"
 msgstr "adjunció"
 
-#: shell/evolution-shell-component.c:1190
+#: shell/evolution-shell-component.c:1193
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1195
 #, fuzzy
 msgid "No owner"
 msgstr "Cap"
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1197
 #, fuzzy
 msgid "Not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1199
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Detecta els tipus suportats..."
 
-#: shell/evolution-shell-component.c:1198
+#: shell/evolution-shell-component.c:1201
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1200
+#: shell/evolution-shell-component.c:1203
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Consulta cancel·lada per l'usuari."
 
-#: shell/evolution-shell-component.c:1202
+#: shell/evolution-shell-component.c:1205
 #, fuzzy
 msgid "Internal error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1206
+#: shell/evolution-shell-component.c:1209
 #, fuzzy
 msgid "Exists"
 msgstr "S_urt"
 
-#: shell/evolution-shell-component.c:1208
+#: shell/evolution-shell-component.c:1211
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Agenda"
 
-#: shell/evolution-shell-component.c:1212
+#: shell/evolution-shell-component.c:1215
 #, fuzzy
 msgid "Has subfolders"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/evolution-shell-component.c:1214
+#: shell/evolution-shell-component.c:1217
 #, fuzzy
 msgid "No space left"
 msgstr "S'ha rebut el missatge"
 
-#: shell/evolution-shell-component.c:1216
+#: shell/evolution-shell-component.c:1219
 msgid "Old owner has died"
 msgstr ""
 
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "Error desconegut"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
@@ -27998,6 +27622,25 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "No es pot inicialitzat l'intèrpret d'ordres de l'Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "_Paràmetres"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -28038,6 +27681,10 @@ msgstr ""
 msgid "Importers"
 msgstr "S'està movent"
 
+#: shell/importer/intelligent.c:191
+msgid "Import"
+msgstr ""
+
 #: shell/importer/intelligent.c:195
 #, fuzzy
 msgid "Don't import"
@@ -28248,7 +27895,7 @@ msgstr "Mou a la carpeta"
 msgid "Move to Folder..."
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
@@ -28258,9 +27905,9 @@ msgstr "Enganxa l'element del porta-retalls"
 msgid "Previews the contacts to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Print Pre_view"
 msgstr "Previsualització d'impressió"
@@ -28313,17 +27960,22 @@ msgstr "Atura la càrrega"
 msgid "View the current contact"
 msgstr "l'hora actual"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Accions"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:31
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "_Copia a la carpeta"
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "_Contactes..."
@@ -28406,53 +28058,67 @@ msgstr "Vés a una data concreta"
 msgid "Go to today"
 msgstr "Vés a avui"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Print this calendar"
 msgstr "_Imprimeix aquest agenda"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#, fuzzy
+msgid "Purg_e"
+msgstr "Fonts"
+
+#: ui/evolution-calendar.xml.h:24
+msgid "Purge old appointments and meetings"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Show as list"
+msgstr "Detalls"
+
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Show one day"
 msgstr "Mostra 1 dia"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show one month"
 msgstr "Mostra 1 mes"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Show one week"
 msgstr "Mostra 1 setmana"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Mostra la setmana de treball"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 #, fuzzy
 msgid "Week"
 msgstr "Setmanes"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close"
@@ -28463,7 +28129,7 @@ msgstr "Tanca"
 msgid "Close this item"
 msgstr "Suprimeix aquest element"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Suprimeix aquest element"
 
@@ -28477,50 +28143,61 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Imprimeix aquest element"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Desa"
-
-#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
 #, fuzzy
-msgid "Save As..."
+msgid "Save _As..."
 msgstr "Anomena i desa..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Desa i tanca"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save and _Close"
+msgstr "Desa i tanca"
+
+#: ui/evolution-comp-editor.xml.h:14
 #, fuzzy
 msgid "Save the item and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de diàleg"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fitxer"
 
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Desa"
+
 #: ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
 msgstr "Copia l'element seleccionat al porta-retalls"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 #, fuzzy
 msgid "Cu_t"
 msgstr "Personalitzat"
@@ -28545,59 +28222,45 @@ msgstr "Selecciona'ls _tots"
 msgid "Select all text"
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:6
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "Imprimeix el missatge..."
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-#, fuzzy
-msgid "Save _As..."
-msgstr "Anomena i desa..."
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de diàleg"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:12
 #, fuzzy
 msgid "Send _Message to Contact..."
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Desa"
-
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 #, fuzzy
 msgid "Delete this list"
 msgstr "Suprimeix aquest element"
 
-#: ui/evolution-contact-list-editor.xml.h:4
-#, fuzzy
-msgid "Delete..."
-msgstr "Suprimeix"
-
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de diàleg"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "_Invita a altres..."
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "FIXME: Nou _missatge per contactar"
 
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Suprimeix"
+
 #: ui/evolution-event-editor.xml.h:1
 #, fuzzy
 msgid "Cancel Mee_ting"
@@ -28683,7 +28346,7 @@ msgstr "Mou un missatge a una nova carpeta"
 
 #: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "Post New Message"
+msgid "Post Ne_w Message"
 msgstr "Redacta un nou missatge"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -28723,16 +28386,21 @@ msgstr "Previsualització:"
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copia el missatge a una nova carpeta"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Retalla l'element seleccionat i posa'l al porta-retalls"
 
+#: ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "E_xpunge"
+msgstr "_Esborra"
+
 #: ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Hide S_elected Messages"
@@ -28755,7 +28423,7 @@ msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
 #, fuzzy
-msgid "Mark All as R_ead"
+msgid "Mark All as _Read"
 msgstr "Mar_ca'l com a llegit"
 
 #: ui/evolution-mail-list.xml.h:10
@@ -28763,7 +28431,7 @@ msgstr "Mar_ca'l com a llegit"
 msgid "Mark all visible messages as read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
@@ -28814,28 +28482,41 @@ msgstr "Imprimeix el missatge seleccionat"
 msgid "Threaded Message list"
 msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
-msgid "_Expunge"
-msgstr "_Esborra"
-
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverteix la selecció"
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:27
 #, fuzzy
 msgid "_Properties..."
 msgstr "Propietats..."
 
-#: ui/evolution-mail-list.xml.h:31
+#: ui/evolution-mail-list.xml.h:28
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Llista de missatges en cadena"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+#, fuzzy
+msgid "Close this window"
+msgstr "Suprimeix aquesta cita"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+#, fuzzy
+msgid "_Close"
+msgstr "Tanca"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Visualitza"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -28857,479 +28538,488 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
 #: ui/evolution-mail-message.xml.h:5
+msgid "Caret _Mode"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:6
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Respon a tots els destinataris d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:8
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "Copia el missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a rule to filter messages with this subject"
 msgstr "Envia un missatge sense assumpte"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Create a virtual folder for these recipients"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Create a virtual folder for this mailing list"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
 msgid "Create a virtual folder for this sender"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:20
 #, fuzzy
 msgid "Create a virtual folder for this subject"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the next message"
 msgstr "l'hora actual"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:29
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Voleu descartar aquest missatge?"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "F_orward"
 msgstr "Reenvia"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "Filtre sobre el remitent"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "Filtre sobre els destinataris"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Filtre sobre l'assumpte"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:38
 msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Increase the text size"
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Load _Images"
 msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Mar_ca'l com a llegit"
+
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark as I_mportant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark as Unimp_ortant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:56
 msgid "Move"
 msgstr "Mou"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Següent"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Mou el missatge"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:64
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
-msgid "Post a Reply"
+msgid "Post a Repl_y"
 msgstr "Respon"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Comprova si hi ha nou correu"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Previous"
 msgstr "Ant_erior"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Print this message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:75
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "Respon a _tots"
+
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Respon a _tots"
+
+#: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
-msgid "S_earch Message..."
+msgid "S_earch in Message..."
 msgstr "Anomena i desa..."
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:85
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:86
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "Font del correu"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Cerca completa"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:89
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Comprova si hi ha nou correu"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "VFolder sobre el remite_nt"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "VFolder sobre els destinata_ris"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "VFolder sobre l'assumpte"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Attached"
 msgstr "Adjunta"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Reenvia el missatge"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Go To"
 msgstr "Vés a"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Inline"
 msgstr "Visualitza en línia"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Larger"
 msgstr "Busca"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Message Display"
 msgstr "Esborra la visualització del missatge"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Next Message"
 msgstr "_Missatge"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Normal Display"
 msgstr "_Visualització"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Edita el missatge"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Quoted"
 msgstr "Cap"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:118
+#, fuzzy
+msgid "_Reply to Sender"
+msgstr "Respon al remitent"
+
+#: ui/evolution-mail-message.xml.h:119
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Tanca..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Eines"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:122
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Suprimeix"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-#, fuzzy
-msgid "Close this window"
-msgstr "Suprimeix aquesta cita"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-#, fuzzy
-msgid "_Close"
-msgstr "Tanca"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Visualitza"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Adjunta"
@@ -29338,7 +29028,7 @@ msgstr "Adjunta"
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 #, fuzzy
 msgid "Close the current file"
 msgstr "l'hora actual"
@@ -29357,7 +29047,7 @@ msgstr "Edita el missatge"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "For_mat"
 msgstr "Format"
@@ -29393,6 +29083,11 @@ msgstr ""
 msgid "S/MIME Sign"
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Desa"
+
 #: ui/evolution-message-composer.xml.h:17
 #, fuzzy
 msgid "Save As"
@@ -29408,7 +29103,7 @@ msgid "Save in folder..."
 msgstr "Desa a la _carpeta..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:9
 #, fuzzy
 msgid "Save the current file"
 msgstr "l'hora actual"
@@ -29428,7 +29123,7 @@ msgid "Send"
 msgstr "_Envia"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Envia els missatges en format HTML"
@@ -29506,7 +29201,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:14
 #, fuzzy
 msgid "_Insert"
 msgstr "_Índex"
@@ -29525,12 +29220,12 @@ msgstr "Respon"
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 #, fuzzy
 msgid "H_TML"
 msgstr "HTML"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:10
 #, fuzzy
 msgid "Save the current file and close the window"
 msgstr "Desa el contacte i tanca el quadre de diàleg"
@@ -29616,17 +29311,22 @@ msgstr "Suprimeix la tasca"
 msgid "Mar_k as Complete"
 msgstr "Marca com a completa"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Mark selected tasks as complete"
+msgstr "Marca com a completa"
+
+#: ui/evolution-tasks.xml.h:11
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "Print the list of tasks"
 msgstr "Imprimeix el missatge"
@@ -29925,31 +29625,31 @@ msgstr "Setmana de treball"
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
-msgid "As Sent Folder"
+msgid "As _Sent Folder"
 msgstr "Seleccioneu una carpeta"
 
 #: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr ""
+#, fuzzy
+msgid "By S_tatus"
+msgstr "_Estat:"
 
 #: views/mail/galview.xml.h:3
 #, fuzzy
-msgid "By Sender"
+msgid "By Se_nder"
 msgstr "Remitent"
 
 #: views/mail/galview.xml.h:4
 #, fuzzy
-msgid "By Status"
-msgstr "_Estat:"
+msgid "By Su_bject"
+msgstr "Assumpte"
 
 #: views/mail/galview.xml.h:5
-#, fuzzy
-msgid "By Subject"
-msgstr "Assumpte"
+msgid "By _Follow Up Flag"
+msgstr ""
 
 #: views/mail/galview.xml.h:6
 #, fuzzy
-msgid "Messages"
+msgid "_Messages"
 msgstr "_Missatge"
 
 #: views/tasks/galview.xml.h:1
@@ -30011,20 +29711,20 @@ 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:427
+#: widgets/misc/e-calendar-item.c:456
 msgid "MTWTFSS"
 msgstr "DDDDDDD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
+#: widgets/misc/e-calendar-item.c:1174
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
 msgid "Now"
 msgstr "Ara"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
 msgid "Today"
 msgstr "Avui"
 
@@ -30154,26 +29854,6 @@ msgstr "Cerca"
 msgid "_Advanced..."
 msgstr "Afegeix..."
 
-#: widgets/misc/e-messagebox.c:154
-#, fuzzy
-msgid "Information"
-msgstr "Cap informació"
-
-#: widgets/misc/e-messagebox.c:168
-#, fuzzy
-msgid "Error"
-msgstr "Cap error"
-
-#: widgets/misc/e-messagebox.c:175
-#, fuzzy
-msgid "Question"
-msgstr "Descripció:"
-
-#: widgets/misc/e-messagebox.c:182
-#, fuzzy
-msgid "Message"
-msgstr "_Missatge"
-
 #: widgets/misc/e-search-bar.c:531
 #, fuzzy
 msgid "_Search"
@@ -30229,6 +29909,526 @@ msgstr "Conducte de l'agenda de l'Evolution"
 msgid "Evolution Addressbook local file backend"
 msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
+#, fuzzy
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#, fuzzy
+#~ msgid "_Save as..."
+#~ msgstr "Anomena i desa..."
+
+#, fuzzy
+#~ msgid "End Date"
+#~ msgstr "Hora de _finalització:"
+
+#, fuzzy
+#~ msgid "New _Appointment"
+#~ msgstr "Nova cita..."
+
+#~ msgid "Print..."
+#~ msgstr "Imprimeix..."
+
+#, fuzzy
+#~ msgid "Required Participants"
+#~ msgstr "Persones _requerides"
+
+#, fuzzy
+#~ msgid "Optional Participants"
+#~ msgstr "Persones _requerides"
+
+#, fuzzy
+#~ msgid "Resources"
+#~ msgstr "Font"
+
+#, fuzzy
+#~ msgid "Group"
+#~ msgstr "Grup %i"
+
+#, fuzzy
+#~ msgid "Resource"
+#~ msgstr "Font"
+
+#, fuzzy
+#~ msgid "Chair"
+#~ msgstr "Cotxe"
+
+#, fuzzy
+#~ msgid "Required Participant"
+#~ msgstr "Persones _requerides"
+
+#, fuzzy
+#~ msgid "Needs Action"
+#~ msgstr "Elimina una acció"
+
+#, fuzzy
+#~ msgid "Delegated"
+#~ msgstr "Suprimeix"
+
+#, fuzzy
+#~ msgid "In Process"
+#~ msgstr "En procés"
+
+#, fuzzy
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Propietats..."
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "Propietats..."
+
+#~ msgid "Could not create temporary directory: %s"
+#~ msgstr "No s'ha pogut crear el directori temporal: %s"
+
+#, fuzzy
+#~ msgid "%d selected"
+#~ msgstr "Suprimeix"
+
+#, fuzzy
+#~ msgid "%d unsent"
+#~ msgstr " segons"
+
+#, fuzzy
+#~ msgid "%d sent"
+#~ msgstr " segons"
+
+#, fuzzy
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "Carpetes virtuals"
+
+#, fuzzy
+#~ msgid "VFolder on _Subject"
+#~ msgstr "VFolder sobre l'assumpte"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "VFolder sobre el remite_nt"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "VFolder sobre els destinata_ris"
+
+#, fuzzy
+#~ msgid "VFolder on Mailing _List"
+#~ msgstr "Filtre sobre la llista de correu"
+
+#, fuzzy
+#~ msgid "Filter on Sub_ject"
+#~ msgstr "Filtre sobre l'assumpte"
+
+#, fuzzy
+#~ msgid "Filter on Sen_der"
+#~ msgstr "Filtre sobre el remitent"
+
+#, fuzzy
+#~ msgid "Filter on Re_cipients"
+#~ msgstr "Filtre sobre els destinataris"
+
+#, fuzzy
+#~ msgid "Filter on _Mailing List"
+#~ msgstr "Filtre sobre la llista de correu"
+
+#, fuzzy
+#~ msgid "_Edit as New Message..."
+#~ msgstr "_Anomena i desa..."
+
+#~ msgid "_Print"
+#~ msgstr "_Imprimeix"
+
+#~ msgid "_Forward"
+#~ msgstr "_Reenvia"
+
+#, fuzzy
+#~ msgid "Fla_g Completed"
+#~ msgstr "% comp_let:"
+
+#, fuzzy
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Agenda"
+
+#, fuzzy
+#~ msgid "Mark as _Unread"
+#~ msgstr "Marca'l com a per _llegir"
+
+#, fuzzy
+#~ msgid "Mark as _Important"
+#~ msgstr "Marca'l com a per _llegir"
+
+#, fuzzy
+#~ msgid "_Mark as Unimportant"
+#~ msgstr "Marca'l com a per _llegir"
+
+#, fuzzy
+#~ msgid "U_ndelete"
+#~ msgstr "_Suprimeix"
+
+#, fuzzy
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "Mou a la carpeta"
+
+#, fuzzy
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Desa a la llibreta d'adreces"
+
+#, fuzzy
+#~ msgid "Appl_y Filters"
+#~ msgstr "_Aplica els filtres"
+
+#, fuzzy
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Carpetes virtuals"
+
+#, fuzzy
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "Filtre sobre la llista de correu"
+
+#, fuzzy
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Filtre sobre la llista de correu (%s)"
+
+#, fuzzy
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "Filtre sobre la llista de correu (%s)"
+
+#, fuzzy
+#~ msgid "Don't show this message again."
+#~ msgstr "Envia aquest missatge"
+
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "No heu configurat el client de correu.\n"
+#~ "Cal que ho feu abans de poder enviar,\n"
+#~ "rebre o redactar correu.\n"
+#~ "El voleu configurar ara?"
+
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Cal que configureu una identitat\n"
+#~ "abans de poder redactar correu."
+
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Cal que configureu un transport de correu\n"
+#~ "abans de poder redactar correu."
+
+#, fuzzy
+#~ msgid "Send anyway?"
+#~ msgstr "S'està recollint el correu des de %s"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Aquest missatge no té cap assumpte.\n"
+#~ "Voleu que l'enviï igualment?"
+
+#, fuzzy
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "S'està afegint un missatge sense cap assumpte"
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
+
+#, fuzzy
+#~ msgid "an unknown sender"
+#~ msgstr "Error desconegut"
+
+#~ msgid "Move message(s) to"
+#~ msgstr "Mou el(s) missatge(s) cap a"
+
+#~ msgid "Copy message(s) to"
+#~ msgstr "Copia el(s) missatge(s) a"
+
+#, fuzzy
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr ""
+#~ "Esteu segur que voleu\n"
+#~ "suprimir aquest contacte?"
+
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Només podeu editar els missatges que s'hagin desat\n"
+#~ "a la carpeta Esborranys."
+
+#, fuzzy
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Només podeu editar els missatges que s'hagin desat\n"
+#~ "a la carpeta Esborranys."
+
+#, fuzzy
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr ""
+#~ "Esteu segur que voleu\n"
+#~ "suprimir aquest contacte?"
+
+#, fuzzy
+#~ msgid "No Message Selected"
+#~ msgstr "S'ha rebut el missatge"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "No es pot obrir la ubicació `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Ja existeix una fitxer amb aquest nom.\n"
+#~ "El voleu sobreescriure?"
+
+#, fuzzy
+#~ msgid "Save Message As..."
+#~ msgstr "Anomena i desa..."
+
+#, fuzzy
+#~ msgid "Save Messages As..."
+#~ msgstr "Anomena i desa..."
+
+#~ msgid ""
+#~ "Error loading filter information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error en carregar la informació del filtre:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Filters"
+#~ msgstr "_Filtres de correu ..."
+
+#, fuzzy
+#~ msgid "Page %d of %d"
+#~ msgstr "S'està escrivint el missatge %d de %d"
+
+#~ msgid "Print Message"
+#~ msgstr "Imprimeix el missatge"
+
+#~ msgid "Printing of message failed"
+#~ msgstr "Ha fallat la impressió del missatge"
+
+#, fuzzy
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr ""
+#~ "Esteu segur que voleu\n"
+#~ "suprimir aquest contacte?"
+
+#, fuzzy
+#~ msgid "Could not create a S/MIME signature context."
+#~ msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#, fuzzy
+#~ msgid "Could not create a S/MIME certsonly context."
+#~ msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#, fuzzy
+#~ msgid "Could not create a S/MIME encryption context."
+#~ msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#, fuzzy
+#~ msgid "Could not create a S/MIME envelope context."
+#~ msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#, fuzzy
+#~ msgid "Could not create a S/MIME decode context."
+#~ msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#, fuzzy
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Ja existeix una fitxer amb aquest nom.\n"
+#~ "El voleu sobreescriure?"
+
+#~ msgid "Save Attachment"
+#~ msgstr "Desa l'adjunció"
+
+#, fuzzy
+#~ msgid "Could not create temporary file '%s': %s"
+#~ msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
+
+#, fuzzy
+#~ msgid "Save Attachment..."
+#~ msgstr "Desa l'adjunció"
+
+#~ msgid "View Inline"
+#~ msgstr "Visualitza en línia"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Obre a %s..."
+
+#~ msgid "View Inline (via %s)"
+#~ msgstr "Visualitza en línia (mitjançant %s)"
+
+#~ msgid "Hide"
+#~ msgstr "Amaga"
+
+#~ msgid "External Viewer"
+#~ msgstr "Visualitzador extern"
+
+#, fuzzy
+#~ msgid "Downloading images"
+#~ msgstr "Missatge reenviat - %s"
+
+#, fuzzy
+#~ msgid "Loading message content"
+#~ msgstr "S'estan reenviant els missatges \"%s\""
+
+#, fuzzy
+#~ msgid "Overdue:"
+#~ msgstr "Elements que ja han vençut:"
+
+#, fuzzy
+#~ msgid "by %B %d, %Y, %l:%M %P"
+#~ msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#, fuzzy
+#~ msgid "Open Link in Browser"
+#~ msgstr "Obre'l en una nova finestra"
+
+#, fuzzy
+#~ msgid "Copy Link Location"
+#~ msgstr "_Contacte (FIXME)"
+
+#, fuzzy
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "Save Image as..."
+#~ msgstr "Anomena i desa..."
+
+#, fuzzy
+#~ msgid "%s attachment"
+#~ msgstr "adjunció"
+
+#, fuzzy
+#~ msgid "Could not parse MIME message. Displaying as source."
+#~ msgstr ""
+#~ "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
+
+#, fuzzy
+#~ msgid "Bad Address"
+#~ msgstr "Adreça electrònica:"
+
+#, fuzzy
+#~ msgid "Reply-To"
+#~ msgstr "Respon"
+
+#, fuzzy
+#~ msgid "Cc"
+#~ msgstr "Cc:"
+
+#, fuzzy
+#~ msgid "Bcc"
+#~ msgstr "Bcc:"
+
+#, fuzzy
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "No s'ha pogut crear el quadre de diàleg."
+
+#, fuzzy
+#~ msgid "Pointer to local file (%s)"
+#~ msgstr "Filtre sobre la llista de correu (%s)"
+
+#, fuzzy
+#~ msgid "Pointer to remote data (%s)"
+#~ msgstr "Filtre sobre la llista de correu (%s)"
+
+#, fuzzy
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Sense títol)"
+
+#, fuzzy
+#~ msgid "Untitled Message"
+#~ msgstr "Mou el missatge"
+
+#, fuzzy
+#~ msgid "Empty Message"
+#~ msgstr "_Edita el missatge"
+
+#, fuzzy
+#~ msgid "Find in Message"
+#~ msgstr "_Edita el missatge"
+
+#, fuzzy
+#~ msgid "Search Forward"
+#~ msgstr "Reenvia"
+
+#, fuzzy
+#~ msgid "Find:"
+#~ msgstr "Cerca"
+
+#, fuzzy
+#~ msgid "Matches:"
+#~ msgstr "Camí:"
+
+#, fuzzy
+#~ msgid "Forwarded Message"
+#~ msgstr "Reenvia el missatge"
+
+#, fuzzy
+#~ msgid "(No subject)"
+#~ msgstr "Re: (sense assumpte)"
+
+#, fuzzy
+#~ msgid "%s - Message"
+#~ msgstr "_Missatge"
+
+#, fuzzy
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#, fuzzy
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#, fuzzy
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#, fuzzy
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
+
+#, fuzzy
+#~ msgid "No server has been selected"
+#~ msgstr "S'ha rebut el missatge"
+
+#, fuzzy
+#~ msgid "Scanning folders ..."
+#~ msgstr "Desa a la _carpeta..."
+
+#, fuzzy
+#~ msgid "Save As..."
+#~ msgstr "Anomena i desa..."
+
+#, fuzzy
+#~ msgid "Information"
+#~ msgstr "Cap informació"
+
+#, fuzzy
+#~ msgid "Question"
+#~ msgstr "Descripció:"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "_Missatge"
+
 #~ msgid "Search"
 #~ msgstr "Cerca"
 
@@ -30641,10 +30841,6 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
 #, fuzzy
-#~ msgid "Cannot initialize Evolution's folder info component."
-#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#, fuzzy
 #~ msgid "Factory to import mbox into Evolution"
 #~ msgstr ""
 #~ "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
@@ -30697,10 +30893,6 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgstr "Minut"
 
 #, fuzzy
-#~ msgid "Executive summary component could not initialize Bonobo.\n"
-#~ msgstr "No s'ha pogut inicialitzar el Bonobo"
-
-#, fuzzy
 #~ msgid "Configuration control for Evolution folder settings."
 #~ msgstr ""
 #~ "Utilitat de configuració per al conducte de les coses per fer de "
@@ -31306,30 +31498,9 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgid "_Delete this Task"
 #~ msgstr "Suprimeix la tasca"
 
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
-
-#~ msgid "Server rejected username"
-#~ msgstr "El servidor ha rebutjat el nom d'usuari"
-
-#~ msgid "Failed to send username to server"
-#~ msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
-
-#~ msgid "Server rejected username/password"
-#~ msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
-
 #~ msgid "Message %s not found."
 #~ msgstr "No s'ha trobat el missatge %s."
 
-#~ msgid "Could not get group list from server."
-#~ msgstr "No s'ha pogut aconseguir la llista de grups del servidor"
-
-#~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
-
-#~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
-
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "No s'ha pogut obrir el directori per al servidor de notícies: %s"
 
@@ -31358,10 +31529,6 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ "Això us connectarà al servidor POP i utilitzarà el Kerberos 4 per "
 #~ "autenticar-vos-hi."
 
-#, fuzzy
-#~ msgid "Could not connect to server: %s"
-#~ msgstr "No s'ha pogut connectar al servidor POP en %s."
-
 #~ msgid "(Unknown)"
 #~ msgstr "(Desconegut)"
 
@@ -31632,10 +31799,6 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ "`%s'."
 
 #, fuzzy
-#~ msgid "Cannot initialize Evolution's Executive Summary component."
-#~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#, fuzzy
 #~ msgid ""
 #~ "Ximian Evolution is a suite of groupware applications\n"
 #~ "for mail, calendaring, and contact management\n"
@@ -32230,34 +32393,6 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgstr "%H:%M%n"
 
 #, fuzzy
-#~ msgid "Send an email to %s"
-#~ msgstr "S'està recollint el correu des de %s"
-
-#, fuzzy
-#~ msgid "Close %s"
-#~ msgstr "Tanca"
-
-#, fuzzy
-#~ msgid "Move %s to the left"
-#~ msgstr "Mou a la carpeta"
-
-#, fuzzy
-#~ msgid "Move %s into the previous row"
-#~ msgstr "Vés a l'element anterior"
-
-#, fuzzy
-#~ msgid "Move %s into the next row"
-#~ msgstr "Vés a l'element següent"
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot open the HTML file:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No s'ha pogut obrir el fitxer %s:\n"
-#~ "%s"
-
-#, fuzzy
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr ""
 #~ "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
@@ -32985,9 +33120,6 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgid "FIXME: _Display Map of Address"
 #~ msgstr "FIXME: _Mostra el mapa de l'adreça"
 
-#~ msgid "FIXME: _Open Web Page"
-#~ msgstr "FIXME: _Obre la pàgina web"
-
 #~ msgid "FIXME: Forward as _vCard"
 #~ msgstr "FIXME: Reenvia com a _vCard"
 
@@ -33358,9 +33490,6 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 #~ msgid "Edit to-do item"
 #~ msgstr "Edita un element per fer"
 
-#~ msgid "Due Date:"
-#~ msgstr "Data de venciment:"
-
 #~ msgid "Time display"
 #~ msgstr "Visualització de l'hora"
 
diff --git a/po/cs.po b/po/cs.po
index ecffa1b503..1e29a33deb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2003-06-25 13:24-0400\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2003-06-23 20:43+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -15,64 +15,191 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Report-Msgid-Bugs-To: \n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Importér Evolution z LDIF"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP Data Interchange Format (.ldif)"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Importér Evolution z VCard"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Importér Evolution z VCard"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
-
-#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Uložit jako"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Celé jméno"
+
 #: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Jméno"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Adresa"
+
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Adresní štítek"
+
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Telefon"
+
 #: addressbook/backend/ebook/e-card.c:1347
+#: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr "Primární"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Datum narození"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "Prim"
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organizace"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Organizační jednotka"
+
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Kancelář"
+
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Titul"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Funkce"
 
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Vedoucí"
+
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asistent"
 
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Přezdívka"
+
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Partner/-ka"
+
+#: addressbook/backend/ebook/e-card.c:1430
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniversary"
+msgstr "Výročí"
+
+#: addressbook/backend/ebook/e-card.c:1436
+msgid "Mailer"
+msgstr "Program elektronické pošty"
+
+#: addressbook/backend/ebook/e-card.c:1443
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr "Kalendář URI"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "Volno/zaneprázdněná URL"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "Kalendář ICS"
+
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Poznámka"
+
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Související kontakty"
+
+#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorie"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Seznam kategorií"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Dává přednost HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Nastaveno Dává přednost HTML"
+
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
+msgid "List"
+msgstr "Seznam"
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Seznam zobrazených adres"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Libovolný"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Poslední použití"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Použít skóre"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
+msgstr "Primární"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr "Prim"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -107,12 +234,6 @@ msgid "Home"
 msgstr "Domů"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organizace"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org."
 
@@ -231,21 +352,9 @@ msgid "Dep"
 msgstr "Odd."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Kancelář"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Kanc."
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Titul"
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -256,12 +365,6 @@ msgid "Prof"
 msgstr "Pov."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Vedoucí"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Ved."
 
@@ -270,32 +373,9 @@ msgid "Ass"
 msgstr "Asist."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Přezdívka"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Přezd."
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Partner/-ka"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Poznámka"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr "Kalendář URI"
-
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CALUri"
@@ -318,11 +398,6 @@ msgid "icsCalendar"
 msgstr "icsCalendar"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr "Výročí"
-
-#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Výr."
 
@@ -330,12 +405,6 @@ msgstr "Výr."
 msgid "Birth Date"
 msgstr "Narozeniny"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorie"
-
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Příjmení"
@@ -350,105 +419,29 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-destination.c:709
 msgid "Unnamed List"
 msgstr "Nepojmenovaný seznam"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Celé jméno"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Adresa"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Adresní štítek"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Datum narození"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Organizační jednotka"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Funkce"
-
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
-msgid "Mailer"
-msgstr "Program elektronické pošty"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Volno/zaneprázdněná URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "Kalendář ICS"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Související kontakty"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Seznam kategorií"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Dává přednost HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Nastaveno Dává přednost HTML"
-
-#: addressbook/backend/ebook/e-card.c:1506
-msgid "List"
-msgstr "Seznam"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Seznam zobrazených adres"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Libovolný"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Importér Evolution z LDIF"
 
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "ID"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Poslední použití"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Importér Evolution z VCard"
 
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Použít skóre"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Importér Evolution z VCard"
 
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:171
-msgid "Could not initialize Bonobo"
-msgstr "Nelze spustit Bonobo"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -505,14 +498,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook nebyl načten\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr "Nelze spustit wombat server"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr "Nelze spustit wombat"
 
@@ -521,137 +514,6 @@ msgstr "Nelze spustit wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Není možné přečíst blok aplikace Adresa z pilota"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Zde lze nastavit přístup k adresářům LDAP serverů"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Adresářové servery"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Adresář Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Ovládací prvek nastavení adresáře LDAP Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Pop-up menu adresy adresáře Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Prohlížeč adres adresáře Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Prohlížeč karet adresáře Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Komponenta adresáře Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Prohlížeč složek adresáře Evolution"
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:620
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Složka obsahující kontaktní informace"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "Server LDAP"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "Server LDAP obsahující kontaktní informace"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Veřejné kontakty"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Veřejná složka obsahující kontaktní informace"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "New Contact"
-msgstr "Nový kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:575
-msgid "Create a new contact"
-msgstr "Vytvořit nový kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
-msgstr "Nový seznam kontaktů"
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "Contact _List"
-msgstr "_Seznam kontaktů"
-
-#: addressbook/gui/component/addressbook-component.c:579
-msgid "Create a new contact list"
-msgstr "Vytvořit nový seznam kontaktů"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Nepodařilo se připojit k serveru LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Nepodařilo se ověřit na serveru LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Není možné dotázat se na kořenový DSE"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "V odpovědi serveru nejsou podporované základy vyhledávání"
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Tento server nepodporuje schéma informací LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Chyba při načítání informací o schématu"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "Server neodpověděl platnou informací o schématu"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Název účtu"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Jméno serveru"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP není v tomto sestavení Evolution povolen"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Další kontakty"
-
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -779,6 +641,101 @@ msgstr "Jakákoliv kategorie"
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kterou prohlížeč složek zobrazí"
 
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:628
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Složka obsahující kontaktní informace"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "Server LDAP"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "Server LDAP obsahující kontaktní informace"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Veřejné kontakty"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Veřejná složka obsahující kontaktní informace"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "New Contact"
+msgstr "Nový kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "Create a new contact"
+msgstr "Vytvořit nový kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "New Contact List"
+msgstr "Nový seznam kontaktů"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "Contact _List"
+msgstr "_Seznam kontaktů"
+
+#: addressbook/gui/component/addressbook-component.c:587
+msgid "Create a new contact list"
+msgstr "Vytvořit nový seznam kontaktů"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Nepodařilo se připojit k serveru LDAP."
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Nepodařilo se ověřit na serveru LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Není možné dotázat se na kořenový DSE"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "V odpovědi serveru nejsou podporované základy vyhledávání"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Tento server nepodporuje schéma informací LDAPv3"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Chyba při načítání informací o schématu"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Server neodpověděl platnou informací o schématu"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Název účtu"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Jméno serveru"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP není v tomto sestavení Evolution povolen"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Další kontakty"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -807,33 +764,69 @@ msgstr "Vytvořit nový kontakt \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Přidat adresu k existujícímu kontaktu \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:914
+#: addressbook/gui/component/e-address-popup.c:917
 msgid "Querying Addressbook..."
 msgstr "Otázka pro adresář..."
 
-#: addressbook/gui/component/e-address-popup.c:998
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-popup.c:1001
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr "Upravit kontaktní info"
 
-#: addressbook/gui/component/e-address-popup.c:1028
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Přidat ke kontaktům"
 
-#: addressbook/gui/component/e-address-popup.c:1053
+#: addressbook/gui/component/e-address-popup.c:1056
 msgid "Merge E-Mail Address"
 msgstr "Sloučit e-mailovou adresu"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Disable Queries"
 msgstr "Znemožnit dotazy"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr "Umožnit dotazy (nebezpečné!)"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Zde lze nastavit přístup k adresářům LDAP serverů"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Adresářové servery"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Adresář Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Ovládací prvek nastavení adresáře LDAP Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Pop-up menu adresy adresáře Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Prohlížeč adres adresáře Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Prohlížeč karet adresáře Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Komponenta adresáře Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Prohlížeč složek adresáře Evolution"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -984,10 +977,9 @@ msgstr "Jeden"
 msgid "S_earch scope: "
 msgstr "_Rozsah vyhledávání: "
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1256
+#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr "Vyhledávání"
 
@@ -1218,11 +1210,11 @@ msgstr "_Omezení stahování:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Upravit"
 
@@ -1262,20 +1254,24 @@ msgstr "obecný přehled"
 msgid "searching-tab"
 msgstr "vyhledávací přehled"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Rozhraní pro výběr jména adresáře Evolution"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Vyberte kontakty z adresáře"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Odstranit vše"
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Hledat kontakt v"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Odstranit"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Odstranit vše"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Zobrazit seznam kontaktů"
@@ -1298,13 +1294,9 @@ msgstr "Nepojmenovaný kontakt"
 msgid "Source"
 msgstr "Zdroj"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Vyberte kontakty z adresáře"
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Hledat kontakt v"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Rozhraní pro výběr jména adresáře Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1377,7 +1369,7 @@ msgid "D_epartment:"
 msgstr "O_ddělení:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:197
+#: calendar/gui/dialogs/task-editor.c:200
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -1444,11 +1436,13 @@ msgid "_Categories..."
 msgstr "Ka_tegorie..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
-#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Smazat"
 
@@ -1489,15 +1483,15 @@ msgid "_Web page address:"
 msgstr "Adresa _webové stránky:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
+#: addressbook/gui/widgets/e-minicard.c:183
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 msgid "Editable"
 msgstr "Upravitelné"
 
@@ -2525,17 +2519,17 @@ msgstr "Zimbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 msgid "Book"
 msgstr "Kniha"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
+#: addressbook/gui/widgets/e-minicard-widget.c:93
 msgid "Card"
 msgstr "Karta"
 
@@ -2757,7 +2751,7 @@ msgstr "Nový seznam"
 msgid "Contact List Editor"
 msgstr "Editor seznamu kontaktů"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 msgid "Save List as VCard"
 msgstr "Uložit seznam jako VCard"
 
@@ -2803,7 +2797,7 @@ msgstr ""
 "Přejete si jej přesto přidat?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Pokročilé vyhledávání"
@@ -2822,10 +2816,10 @@ msgid "%d cards"
 msgstr "%d karty/karet"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 msgid "Query"
 msgstr "Dotaz"
 
@@ -2833,113 +2827,113 @@ msgstr "Dotaz"
 msgid "Error getting book view"
 msgstr "Chyba při získávání náhledu knihy"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 msgid "Model"
 msgstr "Model"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Chyba při úpravě karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr "Úspěch"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Repository offline"
 msgstr "Sklad při odpojení"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1210
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Přístup zamítnut"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card not found"
 msgstr "Karta nenalezena"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr "Identifikační číslo karty již existuje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Protocol not supported"
 msgstr "Protokol není podporován"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:785
-#: camel/camel-service.c:875 camel/camel-service.c:917
-#: camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
+#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Failed"
 msgstr "Ověření se nepodařilo"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Authentication Required"
 msgstr "Je vyžadováno ověření"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr "TLS není k dispozici"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Addressbook does not exist"
 msgstr "Adresář neexistuje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 msgid "Other error"
 msgstr "Jiná chyba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr "Přejete si uložit změny?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "_Discard"
 msgstr "Zaho_dit"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error adding list"
 msgstr "Chyba při přidávání seznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 msgid "Error adding card"
 msgstr "Chyba při přidávání karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 msgid "Error modifying list"
 msgstr "Chyba při úpravě seznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 msgid "Error removing list"
 msgstr "Chyba při odstraňování seznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 msgid "Error removing card"
 msgstr "Chyba při odstraňování karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2948,132 +2942,131 @@ msgstr ""
 "Zobrazení %d karet otevře %d nových oken.\n"
 "Opravdu si přejete zobrazit všechny tyto karty?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 msgid "Move card to"
 msgstr "Přesunout kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 msgid "Copy card to"
 msgstr "Kopírovat kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 msgid "Move cards to"
 msgstr "Přesunout karty do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 msgid "Copy cards to"
 msgstr "Kopírovat karty do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 msgid "Multiple VCards"
 msgstr "Vícero VKaret"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pro %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Typ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.c:398
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adresář"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-#: addressbook/gui/widgets/e-addressbook-view.c:895
-#: addressbook/gui/widgets/e-addressbook-view.c:1879
+#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1883
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Uložit jako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "New Contact..."
 msgstr "Nový kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "New Contact List..."
 msgstr "Nový seznam kontaktů..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Go to Folder..."
 msgstr "Jít do složky..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Import..."
 msgstr "Importovat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Search for Contacts..."
 msgstr "Hledat kontakty..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Addressbook Sources..."
 msgstr "Zdroje adresáře..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Pilot Settings..."
 msgstr "Předběžná nastavení..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Přeposlat kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Send Message to Contact"
 msgstr "Poslat kontaktu zprávu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tisknout"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Print Envelope"
 msgstr "Tisknout obálku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 msgid "Copy to folder..."
 msgstr "Kopírovat do složky..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 msgid "Move to folder..."
 msgstr "Přesunout do složky..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:912
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Vyjmout"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Vložit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Smazat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: calendar/gui/e-cal-view.c:1109
 msgid "Current View"
 msgstr "Aktuální náhled"
 
@@ -3081,7 +3074,7 @@ msgstr "Aktuální náhled"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:949
+#: addressbook/gui/widgets/e-addressbook-view.c:953
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3089,11 +3082,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:954
+#: addressbook/gui/widgets/e-addressbook-view.c:958
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1352
+#: addressbook/gui/widgets/e-addressbook-view.c:1356
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3164,6 +3157,29 @@ msgstr "Další telefon"
 msgid "Primary Phone"
 msgstr "Primární telefon"
 
+#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "Šířka"
+
+#: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "Výška"
+
+#: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr "Je zaměřen"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Vybráno"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Má kurzor"
+
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3177,21 +3193,6 @@ msgstr "a jedna další karta."
 msgid "Save in addressbook"
 msgstr "Uložit do adresáře"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:146
-msgid "Width"
-msgstr "Šířka"
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:153
-msgid "Height"
-msgstr "Výška"
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:161
-msgid "Has Focus"
-msgstr "Je zaměřen"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Pole"
@@ -3208,10 +3209,6 @@ msgstr "Textový model"
 msgid "Max field name length"
 msgstr "Maximální délka názvu pole"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr "Šířka sloupce"
-
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3240,13 +3237,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptér"
 
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Vybráno"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Má kurzor"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr "Šířka sloupce"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3256,20 +3249,20 @@ msgstr "Náhled karty"
 msgid "GTK Tree View"
 msgstr "GTK Tree View"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Tisknout obálku"
-
-#: addressbook/printing/e-contact-print.c:1139
+#: addressbook/printing/e-contact-print.c:1158
 msgid "Print cards"
 msgstr "Tisknout karty"
 
-#: addressbook/printing/e-contact-print.c:1204
-#: addressbook/printing/e-contact-print.c:1226
+#: addressbook/printing/e-contact-print.c:1224
+#: addressbook/printing/e-contact-print.c:1250
 msgid "Print card"
 msgstr "Tisknout kartu"
 
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Tisknout obálku"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 b. Tahoma"
@@ -3439,6 +3432,63 @@ msgstr "šířka"
 msgid "_Font..."
 msgstr "_Písmo..."
 
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "pro všechny lokální a aktivní vzdálené složky"
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "karty"
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Vnitřní chyba"
+
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Neoznačená událost"
@@ -3568,28 +3618,30 @@ msgid "31st"
 msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:912
 msgid "High"
 msgstr "Vysoká"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
+#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Normální"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:910
 msgid "Low"
 msgstr "Nízká"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr "Nedefinováno"
 
@@ -3597,13 +3649,13 @@ msgstr "Nedefinováno"
 msgid "Split Multi-Day Events:"
 msgstr "Rozdělit vícedenní události:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr "Chyba při komunikaci se serverem kalendáře"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nelze přečíst blok aplikací Calendar pilota"
 
@@ -3611,74 +3663,32 @@ msgstr "Nelze přečíst blok aplikací Calendar pilota"
 msgid "Default Priority:"
 msgstr "Výchozí priority:"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nelze přečíst blok aplikací ToDo pilota"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendář a úkoly"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Nastavení vaší časové zóny, Kalendáře a Seznamu úloh"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Kalendář a úkoly"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Komponenta Kalendář a úkoly Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Ovládací prvek nastavení kalendáře Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Prohlížeč naplánovaných zpráv kalendáře Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Prohlížeč kalendáře Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor kalendáře/úkolů Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Prohlížeč úkolů Evolution"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Sloužba upozornění na alarm kalendáře Evolution"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Spuštění:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Ukončení:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr "neplatný čas"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm na %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "Z_avřít"
 
@@ -3694,16 +3704,25 @@ msgstr "Doba odložení (minut)"
 msgid "_Edit appointment"
 msgstr "_Upravit událost"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr "Popis není dostupný."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr "Varování"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3715,7 +3734,7 @@ msgstr ""
 "vytvořena k poslání e-mailu. Evolution namísto toho\n"
 "zobrazí dialogové okno pro běžnou připomínku."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3732,71 +3751,86 @@ msgstr ""
 "\n"
 "Opravdu chcete spustit tento program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 msgid "Do not ask me about this program again."
 msgstr "Příště se neptat na tento program."
 
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Sloužba upozornění na alarm kalendáře Evolution"
+
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize Bonobo"
+msgstr "Nelze spustit Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:176
 msgid "Could not initialize gnome-vfs"
 msgstr "Nelze spustit gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
+#: calendar/gui/alarm-notify/notify-main.c:185
 msgid "Could not create the alarm notify service factory"
 msgstr "Nelze vytvořit továrnu ke službě hlášení alarmu"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Přehled obsahuje"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Popis obsahuje"
+#: calendar/gui/calendar-commands.c:376
+#, fuzzy
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Tato operace natrvalo odstraní všechny úkoly označené jako dokončené. Pokud "
+"budete pokračovat, nebude již možné tyto úkoly obnovit.\n"
+"\n"
+"Opravdu odstranit tyto úkoly?"
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Komentář obsahuje"
+#: calendar/gui/calendar-commands.c:382
+#, fuzzy
+msgid "Purge events older than"
+msgstr "vrací méně než"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
-msgid "Unmatched"
-msgstr "Nepřiřazené"
+#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "den/dny/dnů"
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
+#: calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:518
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:849
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nelze vytvořit náhled kalendáře. Zkontrolujte, prosím, vaše nastavení ORBit "
 "a OAF."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3815,11 +3849,11 @@ msgstr "Veřejný kalendář"
 msgid "Public folder containing appointments and events"
 msgstr "Veřejná složka obsahující události a schůzky"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Úkoly"
@@ -3884,107 +3918,6 @@ msgstr "_Celodenní událost"
 msgid "Create a new all-day appointment"
 msgstr "Vytvořit novou celodenní událost"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr "Soukromé"
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Důvěrné"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Veřejné"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "J"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "V"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "Z"
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr "Volný"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1204
-msgid "Busy"
-msgstr "Obsazený"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr "Nezačato"
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr "Probíhá"
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr "Dokončeno"
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"\"Zeměpisná pozice musí být uvedena ve formátu: \\n\"\n"
-"\"\\n\"\n"
-"\"45.436845,125.862501\""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
-#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
-msgstr "žádný"
-
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr "Opakovaný"
-
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr "Přiřazeno"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
-msgstr "Ano"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
-msgstr "Ne"
-
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Denní náhled"
@@ -4001,48 +3934,69 @@ msgstr "Týdenní náhled"
 msgid "Month View"
 msgstr "Měsíční náhled"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Upravené zobrazení"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Přehled obsahuje"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Popis obsahuje"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentář obsahuje"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
+msgid "Unmatched"
+msgstr "Nepřiřazené"
+
+#: calendar/gui/comp-editor-factory.c:462
 msgid "Error while opening the calendar"
 msgstr "Chyba při otevírání kalendáře"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr "Metoda nepodporována při otevírání kalendáře"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 msgid "Permission denied to open the calendar"
 msgstr "Přístup zamítnut při otevírání kalendáře"
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:125
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nelze otevřít složku v '%s'"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "URI, které kalendář zobrazí"
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr "Typ náhledu, který má být ukázán"
 
-#: calendar/gui/dialogs/alarm-options.c:420
+#: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Volby zvukového alarmu"
 
-#: calendar/gui/dialogs/alarm-options.c:429
+#: calendar/gui/dialogs/alarm-options.c:475
 msgid "Message Alarm Options"
 msgstr "Volby alarmu zprávou"
 
-#: calendar/gui/dialogs/alarm-options.c:438
+#: calendar/gui/dialogs/alarm-options.c:484
 msgid "Email Alarm Options"
 msgstr "Volby alarmu e-mailem"
 
-#: calendar/gui/dialogs/alarm-options.c:447
+#: calendar/gui/dialogs/alarm-options.c:493
 msgid "Program Alarm Options"
 msgstr "Volby alarmu programem"
 
-#: calendar/gui/dialogs/alarm-options.c:456
+#: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
 msgstr "Neznámé volby alarmu"
 
@@ -4078,10 +4032,6 @@ msgstr "Komu poslat:"
 msgid "With these arguments:"
 msgstr "S těmito parametry:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "den/dny/dnů"
-
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr "dialog1"
@@ -4094,7 +4044,8 @@ msgstr "krát navíc každé"
 msgid "hours"
 msgstr "hodinu/-y"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minut"
 
@@ -4108,11 +4059,11 @@ msgstr "Základní informace"
 msgid "Date/Time:"
 msgstr "Datum/čas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr "Zobrazit zprávu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr "Zahrát zvuk"
 
@@ -4120,7 +4071,7 @@ msgstr "Zahrát zvuk"
 msgid "Reminders"
 msgstr "Připomínky"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr "Spustit program"
 
@@ -4130,7 +4081,8 @@ msgstr "Poslat e-mail"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Shrnutí"
 
@@ -4213,7 +4165,7 @@ msgstr "den/dny/dní"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr "pátek"
 
@@ -4227,7 +4179,7 @@ msgstr "minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr "pondělí"
 
@@ -4237,7 +4189,7 @@ msgstr "_ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr "sobota"
 
@@ -4251,7 +4203,7 @@ msgstr "Ukazovat čísla _týdnů v měsíčním přehledu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr "neděle"
 
@@ -4269,7 +4221,7 @@ msgstr "Seznam úkolů"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr "čtvrtek"
 
@@ -4287,7 +4239,7 @@ msgstr "Formát času:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr "úterý"
 
@@ -4297,12 +4249,12 @@ msgstr "_Týden začíná:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr "středa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr "Pracovní týden"
 
@@ -4410,75 +4362,50 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Opravdu chcete zrušit a smazat tento zápis v deníku?"
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Tato událost byla smazána."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Tento úkol byl smazán."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Tento zápis v deníku byl smazán."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Byly provedeny změny. Opominout tyto změny a zavřít editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Nebyly provedeny žádné změny. Zavřít editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Tato událost byla změněna."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Tento úkol byl změněn."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Tento zápis v deníku byl změněn."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Byly provedeny změny. Opominout tyto změny a aktualizovat editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nebyly provedeny žádné změny. Aktualizovat editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Chyba ověření: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
-msgid " to "
-msgstr " do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
-msgid " (Completed "
-msgstr " (Dokončený "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
-msgid "Completed "
-msgstr "Dokončený "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
-msgid " (Due "
-msgstr " (Termín dokončení "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
-msgid "Due "
-msgstr "Termín dokončení "
-
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "Nelze aktualizovat neplatný objekt"
@@ -4524,22 +4451,48 @@ msgid "No summary"
 msgstr "Není shrnutí"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
-#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Uložit jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/dialogs/comp-editor.c:1406
-#: calendar/gui/dialogs/comp-editor.c:1432
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Změny provedené v této položce mohou být ztraceny, pokud dorazí aktualizace"
 
-#: calendar/gui/dialogs/comp-editor.c:1459
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr "Není možné získat aktuální verzi!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Chyba ověření: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
+msgid " (Completed "
+msgstr " (Dokončený "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
+msgid "Completed "
+msgstr "Dokončený "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
+msgid " (Due "
+msgstr " (Termín dokončení "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
+msgid "Due "
+msgstr "Termín dokončení "
+
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4642,31 +4595,31 @@ msgstr "Postoupit komu:"
 msgid "Enter Delegate"
 msgstr "Zapsat postoupení"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
 msgid "Appointment"
 msgstr "Událost"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Připomínka"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Opakování"
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Plánování"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Schůzka"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
 msgid "Start date is wrong"
 msgstr "Počáteční datum je chybné"
 
@@ -4702,9 +4655,9 @@ msgid "Classification"
 msgstr "Třídění"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Dů_věrné"
+#, fuzzy
+msgid "Co_nfidential"
+msgstr "Důvěrné"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4730,7 +4683,6 @@ msgid "Pu_blic"
 msgstr "Veře_jné"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Zobrazit čas jako"
 
@@ -4747,74 +4699,34 @@ msgstr "_Konec:"
 msgid "_Start time:"
 msgstr "_Začátek:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr "žádný"
+
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr "Vybraný organizátor už nemá účet."
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Je požadován organizátor."
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Je požadován alespoň jeden účastník."
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr "Tato osoba se již schůzky účastní!"
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:630
 msgid "_Delegate To..."
 msgstr "_Postoupit komu..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Účastník"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Účastníka přidáte kliknutím zde"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Společné jméno"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Postoupeno kým"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Postoupeno komu"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Jazyk"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Člen"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Stav"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4825,7 +4737,7 @@ msgid "_Change Organizer"
 msgstr "_Změnit organizátora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Pozvat další..."
 
@@ -4977,7 +4889,7 @@ msgstr ""
 "\n"
 "Chcete uložit změny?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr "Zaho_dit změny"
 
@@ -5001,52 +4913,82 @@ msgstr "Byla vytvořena informace o předání úkolu. Poslat ji?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informace o úkolu se změnila. Poslat aktualizovanou verzi?"
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 msgid "Completed date is wrong"
 msgstr "Čas dokončení je chybný"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#, fuzzy, no-c-format
+msgid "% _Complete"
 msgstr "% dokončeno"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
-msgstr "Datum dokončení:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311
+msgid "Completed"
+msgstr "Dokončeno"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
+msgid "In Progress"
+msgstr "Probíhá"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305
+msgid "Not Started"
+msgstr "Nezačato"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Průběh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Date Completed:"
+msgstr "Datum dokončení:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Naléhavost:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "Adresa _webové stránky:"
+
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Základní"
 
-#: calendar/gui/dialogs/task-editor.c:204
-#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Předání"
 
-#: calendar/gui/dialogs/task-page.c:480
+#: calendar/gui/dialogs/task-page.c:482
 msgid "Due date is wrong"
 msgstr "Datum splnění je chybné"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.c:542
+msgid "Due date is before start date!"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "Dů_věrné"
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Popis:"
@@ -5059,223 +5001,259 @@ msgstr "_Začátek:"
 msgid "_Due Date:"
 msgstr "_Termín dokončení:"
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr "%d dny/-ů"
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr "1 den"
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr "%d týdny/-ů"
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr "1 týden"
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr "%d hodin"
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr "1 hodinu"
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr "1 minutu"
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr "Poslat e-mail"
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr "Má se vykonat neznámá akce"
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s před začátkem události"
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po začátku události"
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s při začátku události"
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s před koncem události"
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po konci události"
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na konci události"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr "%s při %s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s pro neznámý typ spouštění"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
+msgid "Public"
+msgstr "Veřejné"
+
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
+msgid "Private"
+msgstr "Soukromé"
+
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
+msgid "Confidential"
+msgstr "Důvěrné"
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1933
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Volný"
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:393
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Obsazený"
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 msgid "Deleting selected objects"
 msgstr "Odstraňuji vybrané objekty"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
-#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Save as..."
+#: calendar/gui/e-calendar-table.c:989
+#, fuzzy
+msgid "Open _Web Page"
+msgstr "_Otevřít zprávu"
+
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Save As..."
 msgstr "_Uložit jako..."
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
+#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Tisknout..."
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
-#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Vyjmout"
 
-#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
+#: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
-#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
+#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Vl_ožit"
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Assign Task"
 msgstr "P_ředat úkol"
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Forward as iCalendar"
 msgstr "_Odeslat jako iCalendar"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Mark as Complete"
 msgstr "Označit jako _dokončené"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Označit _vybrané úkoly jako dokončené"
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 msgid "_Delete Selected Tasks"
 msgstr "_Smazat vybrané úkoly"
 
-#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
-#: calendar/gui/e-week-view.c:4335
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr "Aktualizuji objekty"
 
-#: calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Úkol přidáte kliknutím zde"
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% dokončeno"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr "Dokončeno"
 
@@ -5284,12 +5262,13 @@ msgid "Completion Date"
 msgstr "Datum dokončení"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr "Termín dokončení"
+#, fuzzy
+msgid "Description"
+msgstr "Popis:"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
-msgstr "Konec"
+msgid "Due Date"
+msgstr "Termín dokončení"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
@@ -5299,242 +5278,299 @@ msgstr "Zeměpisná poloha"
 msgid "Priority"
 msgstr "Naléhavost"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Začátek"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Stav"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Přehled"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Třídění úkolů"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+msgid "color"
+msgstr "barva"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+#: calendar/gui/e-calendar-table.etspec.h:20
+#, fuzzy
+msgid "component"
+msgstr "Událost"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datum musí být napsáno ve formátu:\n"
-"\n"
-"%s"
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Neznámá"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i rozdělení minuty"
+#: calendar/gui/e-cal-model.c:828
+msgid "Recurring"
+msgstr "Opakovaný"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
-msgid "%A %d %B"
-msgstr "%A %d %B"
+#: calendar/gui/e-cal-model.c:830
+msgid "Assigned"
+msgstr "Přiřazeno"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "Yes"
+msgstr "Ano"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "No"
+msgstr "Ne"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "S"
 
-#: calendar/gui/e-day-view.c:3694
-msgid "New _Appointment"
-msgstr "Nová _událost"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "J"
 
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "Z"
+
+#: calendar/gui/e-cal-model-tasks.c:550
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"\"Zeměpisná pozice musí být uvedena ve formátu: \\n\"\n"
+"\"\\n\"\n"
+"\"45.436845,125.862501\""
+
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+msgid "New _Appointment..."
+msgstr "Nová _událost..."
+
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
 msgid "New All Day _Event"
 msgstr "Nová _celodenní událost"
 
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
 msgid "New Meeting"
 msgstr "Nová schůzka"
 
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
 msgid "New Task"
 msgstr "Nový úkol"
 
-#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Tisk..."
-
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
+#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Jít na _dnešek"
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
 msgid "_Go to Date..."
 msgstr "_Jít na datum..."
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
-#: ui/evolution-calendar.xml.h:34
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr "_Zveřejnit informaci o volném/obsazeném čase"
 
-#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
+#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "Na_stavení..."
 
-#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
-#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr "_Uložit jako..."
-
-#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
+#: calendar/gui/e-cal-view.c:1139
 msgid "_Schedule Meeting..."
 msgstr "Naplánovat _schůzku..."
 
-#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
+#: calendar/gui/e-cal-view.c:1140
 msgid "_Forward as iCalendar..."
 msgstr "_Odeslat jako iCalendar..."
 
-#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
+#: calendar/gui/e-cal-view.c:1145
 msgid "Make this Occurrence _Movable"
 msgstr "Nastavit tento výskyt jako _přesunutelný"
 
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
 msgid "Delete this _Occurrence"
 msgstr "Odstranit tento vý_skyt"
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
 msgid "Delete _All Occurrences"
 msgstr "Odstranit _všechny výskyty"
 
-#: calendar/gui/e-itip-control.c:706
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Datum musí být napsáno ve formátu:\n"
+"\n"
+"%s"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
+msgid "%A %d %B"
+msgstr "%A %d %B"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i rozdělení minuty"
+
+#: calendar/gui/e-itip-control.c:676
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ano. (Komplexní opakování)"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 msgid "Every day"
 msgstr "Každý den"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, c-format
 msgid "Every %d days"
 msgstr "Každé(ých) %d dny(ů)"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 msgid "Every week"
 msgstr "Každý týden"
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, c-format
 msgid "Every %d weeks"
 msgstr "Každé(ých) %d týdny(ů)"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 msgid "Every week on "
 msgstr "Každý týden v "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Každé(ých) %d týdny(ů) v "
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 msgid " and "
 msgstr " a "
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr "%s. den "
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 msgid "every month"
 msgstr "každý měsíc"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr "každý %d. měsíc"
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 msgid "Every year"
 msgstr "Každý rok"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr "Každé(ých) %d roky/let"
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr " celkem %dkrát"
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ", konec "
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr "<b>Začíná:</b>"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 msgid "<b>Ends:</b> "
 msgstr "<b>Končí:</b>"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Completed:</b> "
 msgstr "<b>Úkol splněn:</b>"
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Due:</b> "
 msgstr "<b>Splnění:</b>"
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 msgid "iCalendar Information"
 msgstr "Informace iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 msgid "An unknown person"
 msgstr "Neznámá osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1005
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5542,338 +5578,332 @@ msgstr ""
 "Prohlédněte si, prosím, následující informaci a poté vyberte akci z uvedené "
 "nabídky"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr "<i>Žádná</i>"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 msgid "Location:"
 msgstr "Místo:"
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 msgid "Status:"
 msgstr "Stav"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Akceptováno"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Předběžně akceptováno"
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Zamítnuto"
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
-#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Neznámá"
-
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 msgid "Choose an action:"
 msgstr "Vybrat akci:"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 msgid "Update"
 msgstr "Zaktualizovat"
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 msgid "Accept"
 msgstr "Akceptovat"
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 msgid "Tentatively accept"
 msgstr "Předběžně akceptovat"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr "Poslat informaci o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr "Aktualizovat stav respondenta"
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 msgid "Send Latest Information"
 msgstr "Poslat nejnovější informace"
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> zveřejnil(-a) informaci o schůzce."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 msgid "Meeting Information"
 msgstr "Informace o schůzce"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> požaduje účast %s na schůzce."
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> požaduje vaši účast na schůzce."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1309
 msgid "Meeting Proposal"
 msgstr "Návrh na schůzku"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> si přeje být přidán(-a) na existující schůzku."
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 msgid "Meeting Update"
 msgstr "Aktualizace schůzky"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> si přeje obdržet nejnovější informaci o schůzce."
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 msgid "Meeting Update Request"
 msgstr "Požadavek na aktualizaci schůzky"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpověděl(-a) na žádost o schůzku."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Reply"
 msgstr "Odpověď pro schůzku"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> zrušil(-a) schůzku."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 msgid "Meeting Cancellation"
 msgstr "Zrušení schůzky"
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> poslal(-a) nesrozumitelnou zprávu."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 msgid "Bad Meeting Message"
 msgstr "Neplatná zpráva o schůzce"
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> zveřejnil(-a) informaci o úkolu."
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 msgid "Task Information"
 msgstr "Informace o úkolu"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> žádá %s o vypracování úkolu."
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> vás žádá, abyste vypracovali úkol."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 msgid "Task Proposal"
 msgstr "Návrh úkolu"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> si přeje být přidán(-a) k existujícímu úkolu."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1381
 msgid "Task Update"
 msgstr "Aktualizovat úkol"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> si přeje získat nejnovější informace o úkolu."
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 msgid "Task Update Request"
 msgstr "Požadavek na aktualizaci úkolu."
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpověděl(-a) na přiřazení úkolu."
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 msgid "Task Reply"
 msgstr "Odpověď pro úkol"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> zrušil(-a) úkol."
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1402
 msgid "Task Cancellation"
 msgstr "Zrušení úkolu"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 msgid "Bad Task Message"
 msgstr "Zpráva o špatném úkolu"
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> zveřejnil(-a) informaci o volném/obsazeném čase."
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 msgid "Free/Busy Information"
 msgstr "Informace o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> požaduje vaše informace o volném/obsazeném čase."
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 msgid "Free/Busy Request"
 msgstr "Požadavek na informace o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> odpověděl(-a) na požadavek na informace o volném/obsazeném čase."
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 msgid "Free/Busy Reply"
 msgstr "Odpověď s informací o volném/zaneprázdněném čase"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná zpráva o volném/zaneprázdněném čase"
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 msgid "The message does not appear to be properly formed"
 msgstr "Zdá se, že zpráva nebyla správně vytvořena."
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 msgid "The message contains only unsupported requests."
 msgstr "Zpráva obsahuje pouze nepodporované požadavky."
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Příloha neobsahuje platnou zprávu kalendáře"
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 msgid "The attachment has no viewable calendar items"
 msgstr "Příloha nemá žádné zobrazitelné položky kalendáře"
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt není platný a není možné jej aktualizovat\n"
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala chyba v systému CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 msgid "Object could not be found\n"
 msgstr "Objekt nelze nalézt\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Nemáte příslušná práva pro aktualizaci kalendáře\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 msgid "Update complete\n"
 msgstr "Aktualizace dokončena\n"
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr "Soubor kalendáře nemůže být aktualizován!\n"
 
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stav účastníka není možné aktualizovat, protože položka již neexistuje"
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Tato reakce není od stávajícího účastníka. Přidat jako účastníka?"
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stav účastníka není možné aktualizovat, protože jeho stav není platný!\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nemáte příslušná práva pro aktualizaci kalendáře\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka byl zaktualizován\n"
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav účastníka nelze aktualizovat!\n"
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 msgid "Removal Complete"
 msgstr "Odstranění dokončeno"
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 msgid "Item sent!\n"
 msgstr "Položka odeslána!\n"
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr "Položka nemůže být odeslána!\n"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 msgid "Select Calendar Folder"
 msgstr "Vybrat složku kalendář"
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 msgid "Select Tasks Folder"
 msgstr "Vybrat složku úkoly"
 
@@ -5914,185 +5944,167 @@ msgstr "datum ukončení"
 msgid "date-start"
 msgstr "datum začátku"
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr "Předsedové"
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
-msgid "Required Participants"
-msgstr "Vyžadovaní účastníci"
-
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
-msgstr "Nepovinní účastníci"
-
-#: calendar/gui/e-meeting-model.c:82
-msgid "Resources"
-msgstr "Zdroje"
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
-msgid "Individual"
-msgstr "Individuálně"
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
-msgid "Group"
-msgstr "Skupina"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
-msgid "Resource"
-msgstr "Zdroj"
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
-msgid "Room"
-msgstr "Místnost"
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
-msgid "Chair"
-msgstr "Předseda"
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
-msgid "Required Participant"
-msgstr "Vyžadovaný účastník"
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
-msgid "Optional Participant"
-msgstr "Nepovinný účastník"
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
-msgid "Non-Participant"
-msgstr "Bez účasti"
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
-msgid "Needs Action"
-msgstr "Potřebné akce"
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Předběžný"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
-msgid "Delegated"
-msgstr "Delegováno"
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
-msgstr "Probíhá"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Mimo kancelář"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "(Není informace)"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "_Options"
 msgstr "_Volby"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _Only Working Hours"
 msgstr "Ukázat pouze _pracovní hodiny"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Ukázat _méně podrobně"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update Free/Busy"
 msgstr "_Aktualizovat volný/obsazený čas"
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "_Automatický výběr"
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
+#: calendar/gui/e-meeting-time-sel.c:541
 msgid "_All People and Resources"
 msgstr "_Všichni lidé a zdroje"
 
-#: calendar/gui/e-meeting-time-sel.c:563
+#: calendar/gui/e-meeting-time-sel.c:550
 msgid "All _People and One Resource"
 msgstr "Všichni _lidé a jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:572
+#: calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required People"
 msgstr "_Nezbytní lidé"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "Required People and _One Resource"
 msgstr "Nezbytní lidé a _jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "Meeting _start time:"
 msgstr "_Začátek schůzky:"
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Meeting _end time:"
 msgstr "_Konec schůzky:"
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
-#: calendar/gui/gnome-cal.c:2017
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2054
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2087
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Účastník"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Účastníka přidáte kliknutím zde"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Společné jméno"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Postoupeno kým"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Postoupeno komu"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Jazyk"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Člen"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
+msgstr "neplatný čas"
+
+#: calendar/gui/e-tasks.c:221
+#, fuzzy
+msgid "Start Date:"
+msgstr "_Začátek:"
+
+#: calendar/gui/e-tasks.c:237
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Termín dokončení:"
+
+#. write priority
+#: calendar/gui/e-tasks.c:265
+#, fuzzy
+msgid "Priority:"
+msgstr "_Naléhavost:"
+
+#. URL
+#: calendar/gui/e-tasks.c:321
+#, fuzzy
+msgid "Web Page:"
+msgstr "Stránka"
+
+#: calendar/gui/e-tasks.c:702
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otevírám úkoly na %s"
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodařilo se načíst úkoly v `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:746
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda potřebná pro načtení `%s' není podporována"
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nemáte práva k otevření adresáře v `%s'"
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6101,68 +6113,110 @@ msgstr ""
 "Chyba na %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:899
 msgid "Completing tasks..."
 msgstr "Dokončuji úkoly..."
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:922
 msgid "Deleting selected objects..."
 msgstr "Mažu vybrané objekty..."
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1017
 msgid "Expunging"
 msgstr "Čistí se"
 
-#: calendar/gui/e-week-view.c:3581
-msgid "New _Appointment..."
-msgstr "Nová _událost..."
-
-#: calendar/gui/gnome-cal.c:1481
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nelze otevřít složku v `%s'"
 
-#: calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda vyžadovaná k otevřeni `%s' není podporována"
 
-#: calendar/gui/gnome-cal.c:1556
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Přidávají se alarmy pro %s"
 
-#: calendar/gui/gnome-cal.c:1748
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Obsluha kalendáře pro\n"
+"Obsluha úlohy pro\n"
 "%s\n"
-"havarovala. Chcete-li jej znovu použít, musíte znovu spustit Evolution"
+"havarovala. Chcete-li ji znovu použít, musíte znovu spustit Evolution"
 
-#: calendar/gui/gnome-cal.c:1757
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Obsluha úlohy pro\n"
+"Obsluha kalendáře pro\n"
 "%s\n"
-"havarovala. Chcete-li ji znovu použít, musíte znovu spustit Evolution"
+"havarovala. Chcete-li jej znovu použít, musíte znovu spustit Evolution"
 
-#: calendar/gui/gnome-cal.c:1988
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otevírám kalendář na %s"
 
-#: calendar/gui/gnome-cal.c:2028
+#: calendar/gui/gnome-cal.c:2197
 msgid "Opening default tasks folder"
 msgstr "Otevírám výchozí složku úkolů"
 
+#: calendar/gui/gnome-cal.c:3094
+#, fuzzy, c-format
+msgid "Purging event %s"
+msgstr "Zkouší se %s"
+
+#: calendar/gui/gnome-cal.c:3178
+#, fuzzy
+msgid "Purging"
+msgstr "Turín"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalendář a úkoly"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Nastavení vaší časové zóny, Kalendáře a Seznamu úloh"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Kalendář a úkoly"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Komponenta Kalendář a úkoly Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Ovládací prvek nastavení kalendáře Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Prohlížeč naplánovaných zpráv kalendáře Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Prohlížeč kalendáře Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor kalendáře/úkolů Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Prohlížeč úkolů Evolution"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "duben"
@@ -6269,7 +6323,7 @@ msgstr "Informace o volném čase (%s do %s)"
 msgid "iCalendar information"
 msgstr "Informace iCalendar"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr "Musíte být účastníkem události."
 
@@ -6302,82 +6356,81 @@ msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1882
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vybraný den (%a, %b. %d %Y)"
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr "%a, %e. %b"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1919
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vybraný týden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1927
 msgid "Selected month (%b %Y)"
 msgstr "Vybraný měsíc (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1934
 msgid "Selected year (%Y)"
 msgstr "Vybraný rok (%Y)"
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2262
 msgid "Task"
 msgstr "Úkol"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2321
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2338
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorita: %s"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Dokončeno procent: %i"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2362
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorie: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2387
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Náhled před tiskem"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2559
 msgid "Print Item"
 msgstr "Tisknout položku"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2632
 msgid "Print Setup"
 msgstr "Tisknout nastavení"
 
@@ -6385,7 +6438,7 @@ msgstr "Tisknout nastavení"
 msgid "The URI of the tasks folder to display"
 msgstr "URI, které bude zobrazovat složku úkolů"
 
-#: calendar/gui/tasks-control.c:465
+#: calendar/gui/tasks-control.c:448
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6397,11 +6450,11 @@ msgstr ""
 "\n"
 "Opravdu odstranit tyto úkoly?"
 
-#: calendar/gui/tasks-control.c:468
+#: calendar/gui/tasks-control.c:451
 msgid "Do not ask me again."
 msgstr "Příště se neptat."
 
-#: calendar/gui/tasks-control.c:610
+#: calendar/gui/tasks-control.c:593
 msgid "Print Tasks"
 msgstr "Tisknout úkoly"
 
@@ -8094,27 +8147,27 @@ msgstr "Tichý oceán/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tichý oceán/Yap"
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:167
 msgid "Signing is not supported by this cipher"
 msgstr "Digitální podpis není podporován touto šifrou"
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:207
 msgid "Verifying is not supported by this cipher"
 msgstr "Ověření podpisu není podporováno touto šifrou"
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:251
 msgid "Encryption is not supported by this cipher"
 msgstr "Šifrovaní není podporováno touto šifrou"
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:293
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifrovaní není podporováno touto šifrou"
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:331
 msgid "You may not import keys with this cipher"
 msgstr "Nemůžete importovat klíče s touto šifrou"
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:363
 msgid "You may not export keys with this cipher"
 msgstr "Nemůžete exportovat klíče s touto šifrou"
 
@@ -8153,7 +8206,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Obnovuji synchronizaci se serverem"
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Příprava složky '%s' pro práci při odpojení"
@@ -8174,57 +8231,57 @@ msgstr "Nepodařilo se vytvořit propojení ' %s': %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Selhalo vytvoření procesu potomka '%s': %s"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Přijat neplatný proud zprávy od %s: %s"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 msgid "Syncing folders"
 msgstr "Synchronizuji složky"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba při zpracování filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba při spuštění filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 msgid "Unable to open spool folder"
 msgstr "Nelze otevřít adresář fronty"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 msgid "Unable to process spool folder"
 msgstr "Nelze zpracovat adresář fronty"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Stahuji zprávu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr "Nelze otevřít zprávu"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nepodařilo se stáhnout zprávu %d"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 msgid "Syncing folder"
 msgstr "Synchronizuji složku"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Stahuji zprávu %d z %d"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nepodařilo se stáhnout zprávu %d z %d"
@@ -8246,7 +8303,35 @@ msgstr "Neplatné parametry pro (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba při spuštění vyhledávání filtru: %s: %s"
 
-#: camel/camel-folder-search.c:346
+#: camel/camel-folder.c:585
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nepodporovaná operace: přidat zprávu: pro %s"
+
+#: camel/camel-folder.c:1163
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nepodporovaná operace: hledání výrazem: %s"
+
+#: camel/camel-folder.c:1203
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nepodporovaná operace: hledání pomocí uid: %s"
+
+#: camel/camel-folder.c:1321
+msgid "Moving messages"
+msgstr "Přesunuji zprávy"
+
+#: camel/camel-folder.c:1321
+msgid "Copying messages"
+msgstr "Kopíruji zprávy"
+
+#: camel/camel-folder.c:1571
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Získávají se zprávy (%d)"
+
+#: camel/camel-folder-search.c:348
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8255,7 +8340,7 @@ msgstr ""
 "Nelze zpracovat vyhledávací výraz: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:356
+#: camel/camel-folder-search.c:358
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8264,38 +8349,15 @@ msgstr ""
 "Chyba při provádění vyhledávacího výrazu: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(odpovídá všemu) vyžaduje jeden pravdivý výsledek"
 
-#: camel/camel-folder-search.c:653
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonání otázky na neznámé hlavičce: %s"
 
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nepodporovaná operace: přidat zprávu: pro %s"
-
-#: camel/camel-folder.c:1161
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nepodporovaná operace: hledání výrazem: %s"
-
-#: camel/camel-folder.c:1201
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nepodporovaná operace: hledání pomocí uid: %s"
-
-#: camel/camel-folder.c:1319
-msgid "Moving messages"
-msgstr "Přesunuji zprávy"
-
-#: camel/camel-folder.c:1319
-msgid "Copying messages"
-msgstr "Kopíruji zprávy"
-
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8326,7 +8388,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr "Zrušeno"
 
@@ -8381,26 +8443,6 @@ msgstr "Nepodařilo se provést gpg."
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nelze ověřit podpis zprávy: nelze vytvořit dočasný soubor: %s"
 
-#: camel/camel-lock-client.c:111
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nelze vytvořit pomocné propojení pro zamykání: %s"
-
-#: camel/camel-lock-client.c:124
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Nelze spustit pomocný program pro zámek: %s"
-
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Nelze zamknout '%s': chyba protokolu s lock-helper"
-
-#: camel/camel-lock-client.c:215
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nelze zamknout '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8421,6 +8463,26 @@ msgstr "Nepodařilo se získat zámek pomocí fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepodařilo se získat zámek pomocí flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nelze vytvořit pomocné propojení pro zamykání: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Nelze spustit pomocný program pro zámek: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Nelze zamknout '%s': chyba protokolu s lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nelze zamknout '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8487,11 +8549,11 @@ msgstr "Nepodařilo se dešifrovat MIME part: neplatná struktura"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Nepodařilo se dešifrovat MIME part: chyba ve zpracování"
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr "Toto je digitálně podepsaná část zprávy"
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 msgid "parse error"
 msgstr "chyba ve zpracování"
 
@@ -8561,11 +8623,11 @@ msgstr ""
 "Tato volba vás připojí k serveru pomocí bezpečného hesla CRAM-MD5, pokud ho "
 "server podporuje."
 
-#: camel/camel-sasl-digest-md5.c:46
+#: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:50
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8666,7 +8728,7 @@ msgstr "Odkazované údaje vypršely."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1207
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpověď na ověření od serveru."
 
@@ -8724,23 +8786,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr "POP před SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Tato volba bude přihlašovat POP spojení před pokusem o SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
 msgstr "Zdrojové URI pro POP"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "Přihlášení POP před SMTP pomocí neznámého transportu"
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Přihlášení POP před SMTP bez použití zdroje POP"
 
@@ -8749,55 +8811,55 @@ msgstr "Přihlášení POP před SMTP bez použití zdroje POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Překlad regulárního výrazu selhal: %s: %s"
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vyžaduje komponentu uživatelského jména"
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:285
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vyžaduje komponentu hostitele"
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:293
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vyžaduje komponentu cesty"
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:738
 #, c-format
 msgid "Resolving: %s"
 msgstr "Zjišťuje se: %s"
 
-#: camel/camel-service.c:783 camel/camel-service.c:915
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Selhalo hledání jména: %s"
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Selhalo hledání počítače: nemohu vytvořit thread: %s"
 
-#: camel/camel-service.c:818
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Selhalo hledání počítače: %s: počítač nenalezen"
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Selhalo hledání počítače: %s: neznámý důvod"
 
-#: camel/camel-service.c:880
+#: camel/camel-service.c:860
 msgid "Resolving address"
 msgstr "Zjišťuje se adresa"
 
-#: camel/camel-service.c:949
+#: camel/camel-service.c:929
 msgid "Host lookup failed: host not found"
 msgstr "Selhalo hledání počítače: počítač nenalezen"
 
-#: camel/camel-service.c:952
+#: camel/camel-service.c:932
 msgid "Host lookup failed: unknown reason"
 msgstr "Selhalo hledání počítače: neznámý důvod"
 
@@ -8809,12 +8871,12 @@ msgstr "Poskytovatel pošty pro virtuální složky"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pro čtení pošty jako otázky na jinou množinu složek"
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Pro protokol `%s' není k dispozici poskytovatel"
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8860,136 +8922,136 @@ msgstr "Nepodařilo se dekódovat zprávu."
 msgid "Failed to verify certificates."
 msgstr "Nepodařilo se ověřit certifikáty"
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:212
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nelze získat složku: Neplatná operace pro tento sklad"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nelze vytvořit složku: Neplatná operace pro tento sklad"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Nepodařilo se získat certifikát výstavce"
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 "Nepodařilo se získat Certificate Revocation List (seznam zrušených "
 "certifikátů)"
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr "Nepodařilo se dekódovat certifikovaný podpis"
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 "Nepodařilo se dekódovat podpis Certificate Revocation List (seznam zrušených "
 "certifikátů)"
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr "Nepodařilo se dekódovat veřejný klíč výstavce"
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
 msgstr "Selhala certifikace podpisu"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 "Selhal podpis Certificate Revocation List (seznam zrušených certifikátů)"
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr "Certifikát ještě není platný"
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr "Certifikát přestal platit"
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr "CRL ještě není platný"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr "CRL přestal platit"
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr "Chyba v CRL"
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr "Samopodepsaný certifikát s nulovou úrovní"
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr "Samopodepsaný certifikát v řetězci"
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr "Nepodařilo se lokálně získat certifikát výstavce"
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr "Nelze ověřit podpis větve"
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr "Řetězec certifikátu je příliš dlouhý"
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr "Certifikát zrušen"
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Neplatná certifikační autorita (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr "Překročena délka cesty"
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr "Neplatný účel"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr "Nedůvěryhodný certifikát"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr "Certifikát odmítnut"
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr "Neshoda předmět/výstavce"
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr "Neshoda AKID/SKID"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr "Řadová neshoda AKID/výstavce"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr "Použití klíče nepodporuje certifikovaný podpis"
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr "Chyba v ověření aplikace"
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9002,15 +9064,15 @@ msgstr ""
 "Otisk:             %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr "DOBŘE"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr "ŠPATNĚ"
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9030,7 +9092,7 @@ msgstr ""
 "Chcete ho přesto akceptovat?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9045,7 +9107,7 @@ msgstr ""
 "\n"
 "Chcete ho akceptovat?"
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9054,7 +9116,7 @@ msgstr ""
 "Problém s certifikátem: %s\n"
 "Výstavce: %s"
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9063,7 +9125,7 @@ msgstr ""
 "Chybná doména certifikátu: %s\n"
 "Výstavce: %s"
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9072,7 +9134,7 @@ msgstr ""
 "Certifikát vypršel: %s\n"
 "Výstavce: %s"
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9086,17 +9148,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nelze zpracovat URL `%s'"
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Chyba při uskladnění `%s': %s"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Taková zpráva neexistuje %s v %s"
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nelze kopírovat nebo přesunout zprávy do Virtuální složky"
 
@@ -9123,12 +9185,12 @@ msgstr "Nelze přejmenovat složku: %s: Složka neexistuje"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2806
 msgid "Operation cancelled"
 msgstr "Operace zrušena"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2809
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neočekávaně zrušil spojení: %s"
@@ -9167,38 +9229,38 @@ msgstr "Odpověď IMAP serveru neobsahovala informaci %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neočekávaná odpověď OK od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nelze vytvořit adresář %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nelze načíst souhrn pro %s"
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr "Složka byl zrušena a znovu vytvořena na serveru."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr "Hledají se změněné zprávy"
 
-#: camel/providers/imap/camel-imap-folder.c:1883
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nepodařilo se přijmout zprávu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9207,24 +9269,24 @@ msgstr ""
 "Nelze získat zprávu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Taková zpráva neexistuje"
 
-#: camel/providers/imap/camel-imap-folder.c:1943
-#: camel/providers/imap/camel-imap-folder.c:2539
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr "Tato zpráva není právě dostupná"
 
-#: camel/providers/imap/camel-imap-folder.c:2203
-#: camel/providers/imap/camel-imap-folder.c:2273
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr "Stahují se souhrnné informace pro nové zprávy"
 
-#: camel/providers/imap/camel-imap-folder.c:2577
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr "Nelze nalézt tělo zprávy v odpovědi FETCH."
 
@@ -9274,86 +9336,102 @@ msgstr "Jmenný prostor"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Použít filtry na nové příchozí zprávy na tomto serveru"
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "_Automaticky kontrolovat novou poštu každých"
+
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pro čtení a ukládání pošty na IMAP serverech."
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Heslo"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Tato volba připojí na IMAP server pomocí hesel přenášených jako čistý text."
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP služba pro %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/imap/camel-imap-store.c:589
+#: camel/providers/imap/camel-imap-store.c:821
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Spojení zrušeno"
 
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nelze spojit s %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:655
+#: camel/providers/imap/camel-imap-store.c:686
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Nepodařilo se spojit s IMAP serverem %s v bezpečném režimu: %s"
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS rozšíření není podporováno."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:687
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "Vyjednávání SSL selhalo"
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:824
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Nelze spojit s %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:1237
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s nepodporuje požadovaný typ ověření %s"
 
-#: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Typ ověření %s není podporován"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sUveďte IMAP heslo pro %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr "Neuvedli jste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9364,42 +9442,70 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1660
+#: camel/providers/imap/camel-imap-store.c:1802
 #, c-format
 msgid "No such folder %s"
 msgstr "Složka %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2003
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Název složky \"%s\" je neplatný, protože obsahuje znak \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2015
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznámá rodičovská složka: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2051
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodičovská složka nemůže obsahovat podsložky"
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Úložiště zpráv"
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Není možné spojit se s POP serverem %s"
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "Poslat zprávu kontaktu"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:379
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:383
+#: camel/providers/local/camel-local-folder.c:386
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "schránka %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:390
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9458,50 +9564,54 @@ msgstr ""
 "formátu\n"
 "mbox. Lze též použít pro čtení stromů složek ve stylu Elm, Pine nebo Mutt."
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Kořen pro ukládání %s není absolutní cesta"
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Kořen ukládání %s není běžný adresář"
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nelze získat složku: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Lokální ukládání nemá adresář pro příchozí poštu"
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokální poštovní soubor %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nelze přejmenovat složku %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nelze přejmenovat '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nelze odstranit soubor souhrnu složky `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nelze odstranit indexový soubor složky `%s': %s"
@@ -9515,17 +9625,17 @@ msgstr "Nelze uložit souhrn: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nelze přidat zprávu do souhrnu: neznámý důvod"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
 msgstr "Přidaní zprávy maildir zrušeno"
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nelze přidat zprávu do složky maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr "Neplatný obsah zprávy"
 
@@ -9541,7 +9651,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9604,29 +9714,29 @@ msgstr "Hledají se nové zprávy"
 msgid "Storing folder"
 msgstr "Ukládá se složka"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nelze získat zámek na složku %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:289
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nelze otevřít poštovní schránku: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:349
 msgid "Mail append cancelled"
 msgstr "Přidaní pošty zrušeno"
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:352
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nelze přidat zprávu do souboru mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9635,15 +9745,15 @@ msgstr ""
 "Nelze získat zprávu: %s ze složky %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Složka je zřejmě nenapravitelně poškozená."
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vytvoření zprávy selhalo: Poškozená poštovní schránka?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9652,7 +9762,16 @@ msgstr ""
 "Nelze otevřít soubor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr ""
+"Nelze vytvořit adresář %s:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9661,14 +9780,15 @@ msgstr ""
 "Nelze vytvořit soubor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' není obvyklý soubor."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9677,11 +9797,36 @@ msgstr ""
 "Nelze smazat složku `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Složka `%s' není prázdná, nebyla tudíž smazána."
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Nelze vytvořit složku s tímto názvem"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "Nelze vytvořit adresář %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Nelze získat složku: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "Nelze přejmenovat složku %s na %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:427
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "Zadaný název složky není platný: %s"
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9711,7 +9856,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Nelze otevřít dočasnou poštovní schránku: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nelze zavřít zdrojovou složku: %s: %s"
@@ -9728,38 +9873,38 @@ msgstr "Nelze přejmenovat složku: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Souhrn a složka si neodpovídají, ani po synchronizaci"
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznámá chyba: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nelze uložit složku: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Chyba při zápisu do dočasné schránky: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Zápis do dočasné schránky selhal: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
 msgstr "Přidání zprávy MH zrušeno"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nelze přidat zprávu do adresáře mh: %s: %s"
@@ -9839,6 +9984,67 @@ msgstr ""
 "Nelze synchronizovat adresář fronty %s: %s\n"
 "Adresář je možná poškozený, kopie uložena do `%s'"
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, fuzzy, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "%sUveďte SMTP heslo pro %s@%s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+#, fuzzy
+msgid "Failed to send username to server"
+msgstr "Nepodařilo se připojit k serveru LDAP."
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Nelze získat zprávu %s: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Uživatel zrušen"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "Nelze získat skupinu: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, fuzzy, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+"Nepodařilo se vytvořit výstupní soubor: %s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+"Nepodařilo se vytvořit výstupní soubor: %s\n"
+" %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Diskusní skupiny USENET"
@@ -9847,22 +10053,22 @@ msgstr "Diskusní skupiny USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Toto je poskytovatel čtení a posílaní do Diskusních skupin USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nelze číst pozdrav od %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s vrátil chybový kód %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr "Diskusní skupiny USENET pomocí %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9870,37 +10076,37 @@ msgstr ""
 "Tato volba nastaví ověření na NNTP server pomocí poslání hesla jako čistého "
 "textu."
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, c-format
 msgid "No such folder: %s"
 msgstr "Taková složka neexistuje: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Nelze získat skupinu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP příkaz selhal: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Hledají se nové zprávy"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Neznámá odpověď serveru: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 msgid "Use cancel"
 msgstr "Použít Zrušit"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operace selhala: %s"
@@ -9909,13 +10115,6 @@ msgstr "Operace selhala: %s"
 msgid "Retrieving POP summary"
 msgstr "Načítám shrnutí POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-msgid "User cancelled"
-msgstr "Uživatel zrušen"
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -9925,34 +10124,22 @@ msgstr "Nelze získat shrnutí POP: %s"
 msgid "Expunging deleted messages"
 msgstr "Odstraňují se smazané zprávy"
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr "Žádná zpráva s uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Načítám POP zprávu %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Nelze získat zprávu %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 msgid "Unknown reason"
 msgstr "Neznámý důvod"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Úložiště zpráv"
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Zanechat zprávy na serveru"
@@ -10115,141 +10302,141 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Pro doručení pošty spojením se se vzdáleným serverem pomocí SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaktická chyba, příkaz neznámý"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaktická chyba v parametrech nebo argumentech"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Příkaz není implementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Parametr příkazu není implementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Stav systému nebo odpověď na pomoc"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Nápověda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Služba připravena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Služba zavírá přenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Služba není k dispozici, zavírá se přenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Požadovaná poštovní akce v pořádku, dokončena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "Uživatel není lokální, bude předán podle <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Požadovaná poštovní akce nebyla vykonána, poštovní schránka není k dispozici"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Požadovaná akce nebyla vykonána, poštovní schránka není k dispozici"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Požadovaná činnost se nezdařila: chyba při zpracování"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "Uživatel není lokální, zkuste prosím <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Požadovaná akce nebyla vykonána: nedostatek místa v systému"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Požadovaná poštovní akce přerušena: přesáhnutí alokace místa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Požadovaná akce nebyla vykonána: název poštovní schránky nepovolen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Spustit vstup pošty, končí <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Transakce selhala"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Vyžadován přenos hesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Ověřovací mechanismus je příliš slabý"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pro požadovaný způsob ověření je vyžadováno šifrovaní"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Dočasné selhání ověření."
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Je požadováno ověření"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:298
 msgid "Welcome response error"
 msgstr "Chyba odpovědi přivítání"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Nepodařilo se spojit se SMTP serverem %s v bezpečném modu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid "server does not appear to support SSL"
 msgstr "server pravděpodobně nepodporuje SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Vypršel čas požadavku STARTTLS: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:372
 msgid "STARTTLS response error"
 msgstr "Chyba odpovědi STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s nepodporuje požadovaný typ ověření %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sUveďte SMTP heslo pro %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10260,87 +10447,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doručení pošty SMTP pomocí %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr "Zprávu nelze poslat: adresa odesílatele je neplatná."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr "Posílám zprávu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr "Nelze poslat zprávu: nebyli určeni příjemci."
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nelze poslat zprávu: jeden nebo více neplatných příjemců"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Vypršel čas odpovědi HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 msgid "HELO response error"
 msgstr "Chyba odpovědi HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "SMTP ověření"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "Chyba při vytváření ověřovacího objektu SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Vypršel čas požadavku AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "Požadavek AUTH selhal."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatná odpověď na ověření od serveru.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Vypršel čas požadavku MAIL FROM: %s: pošta neodeslána"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr "Chyba odpovědi MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Vypršel čas požadavku RCPT TO: %s: pošta neodeslána"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> selhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Vypršel čas požadavku DATA: %s: pošta neodeslána"
@@ -10348,67 +10535,66 @@ msgstr "Vypršel čas požadavku DATA: %s: pošta neodeslána"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 msgid "DATA response error"
 msgstr "Chyba odpovědi DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Vypršel čas posílání DATA: konec zprávy: %s: pošta neodeslána"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 msgid "DATA termination response error"
 msgstr "Chyba odpovědi ukončení DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypršel čas požadavku RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "RSET response error"
 msgstr "Chyba odpovědi RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Vypršel čas požadavku QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "QUIT response error"
 msgstr "Chyba odpovědi QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "příloha"
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Odstranit vybrané položky ze seznamu příloh"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Přidat přílohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Přiložit soubor ke zprávě"
 
@@ -10440,88 +10626,11 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnout automatické zobrazovaní příloh"
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr "Hej ty, truhlíku. Potřebuješ účet, abys mohl poslat poštu, chápeš."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Kliknutím zobrazíte adresář"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Odpovědět-komu:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Od:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Předmět:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Komu:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Vyplnit příjemce zprávy"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Kopie:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Vyplňte adresy, které obdrží kopii této zprávy."
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Skrytá kopie:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Vyplňte adresy, které obdrží kopii, aniž by se objevily v seznamu příjemců "
-"zprávy."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Poslat komu:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Cíl odeslání"
-
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Připojit soubor(y)"
-
-#: composer/e-msg-composer.c:535
+#: composer/e-msg-composer.c:562
 msgid "Could not create a PGP signature context"
 msgstr "Nelze vytvořit kontext podpisu PGP."
 
-#: composer/e-msg-composer.c:814
+#: composer/e-msg-composer.c:841
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10530,30 +10639,30 @@ msgstr ""
 "Chyba při čtení souboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1177
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr "Soubor existuje, přepsat?"
 
-#: composer/e-msg-composer.c:1195
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba při ukládání souboru: %s"
 
-#: composer/e-msg-composer.c:1218
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba při načítání souboru: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba při přístupu k souboru: %s"
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Nelze obdržet zprávu z editoru"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10562,7 +10671,7 @@ msgstr ""
 "Nelze hledat v souboru: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10571,7 +10680,7 @@ msgstr ""
 "Nelze rozdělit soubor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1287
+#: composer/e-msg-composer.c:1325
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10580,7 +10689,7 @@ msgstr ""
 "Nelze kopírovat popisovač souboru: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1296
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10589,7 +10698,7 @@ msgstr ""
 "Chyba při automatickém ukládaní zprávy: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10597,7 +10706,7 @@ msgstr ""
 "Ximian Evolution našla neuložené soubory z předchozího sezení.\n"
 "Chcete se pokusit o jejich obnovení?"
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1594
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10608,28 +10717,28 @@ msgstr ""
 "\n"
 "Chcete uložit změny?"
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr "Varování: Změněná zpráva"
 
-#: composer/e-msg-composer.c:1593
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Otevřít soubor"
 
-#: composer/e-msg-composer.c:2017
+#: composer/e-msg-composer.c:2054
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "automatický"
 
-#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Napsat zprávu"
 
-#: composer/e-msg-composer.c:2934
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10637,7 +10746,7 @@ msgstr ""
 "Nelze vytvořit okno pro psaní zpráv:\n"
 "Nelze aktivovat ovládací prvek pro výběr adresy."
 
-#: composer/e-msg-composer.c:2962
+#: composer/e-msg-composer.c:3030
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10649,7 +10758,7 @@ msgstr ""
 "Ujistěte se prosím, že máte instalovanou\n"
 "správnou verzi gtkhtml a libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3029
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10657,13 +10766,92 @@ msgstr ""
 "Nelze vytvořit okno pro psaní zpráv:\n"
 "Nelze aktivovat komponentu HTML editor."
 
-#: composer/e-msg-composer.c:4045
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 "<b>(Editor zpráv obsahuje netextové tělo zprávy, které nelze upravit.)<b>"
 
+#: composer/e-msg-composer-hdrs.c:290
+#, fuzzy
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+"Než začnete psát zprávu,\n"
+"musíte nastavit účet."
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Kliknutím zobrazíte adresář"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Odpovědět-komu:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Předmět:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Komu:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Vyplnit příjemce zprávy"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Kopie:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Vyplňte adresy, které obdrží kopii této zprávy."
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Skrytá kopie:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Vyplňte adresy, které obdrží kopii, aniž by se objevily v seznamu příjemců "
+"zprávy."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Poslat komu:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Cíl odeslání"
+
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Připojit soubor(y)"
+
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution - sada nástrojů pro skupinovou spolupráci"
@@ -10832,7 +11020,7 @@ msgstr ""
 "Soubor s tímto názvem již existuje.\n"
 "Přejete si jej přepsat?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "Přepsat soubor?"
 
@@ -10854,90 +11042,210 @@ msgstr "Synchronizované kategorie:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M: %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 msgid "%I:%M %p"
 msgstr "%H:%M, %x"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%I %p"
 
+#: executive-summary/component/component-factory.c:151
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Komponenta souhrnu Evolution"
+
+#: executive-summary/component/e-summary.c:925
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Nelze přejmenovat složku:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:939
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Chyba při načítání %s"
+
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:125
+#, fuzzy
+msgid "Select a service"
+msgstr "Vyberte soubor"
+
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Poslat e-mail"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Change the view to %s"
+msgstr "Typ náhledu, který má být ukázán"
+
+#: executive-summary/component/e-summary-url.c:73
+#, fuzzy, c-format
+msgid "Run %s"
+msgstr "URL: %s"
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Zavřít"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Přesunout tuto složku na jiné místo"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Znovu nastavit /%s"
+
+#: executive-summary/component/e-summary-url.c:553
+#, fuzzy
+msgid "page"
+msgstr "Stránka"
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+msgid "Error"
+msgstr "Chyba"
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update now"
+msgstr "Zaktualizovat"
+
+#: executive-summary/test-service/rdf-summary.c:795
+#, fuzzy
+msgid "Update every "
+msgstr "_Aktualizovat volný/obsazený čas"
+
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr "1 sekunda nazpět"
@@ -11053,84 +11361,6 @@ msgstr "Musíte uvést složku."
 msgid "Select Folder"
 msgstr "Vybrat složku"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Chyba v regulérním výrazu '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
-msgid "Important"
-msgstr "Důležité"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-msgid "Work"
-msgstr "Pracovní"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-msgid "Personal"
-msgstr "Osobní"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
-msgid "To Do"
-msgstr "Udělat"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
-msgid "Later"
-msgstr "Později"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Musíte pojmenovat tento filtr."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Název pravidla: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Bez názvu"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Pokud"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Provést akce"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "pokud souhlasí všechna kritéria"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "pokud souhlasí některá kritéria"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "příchozí"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "odchozí"
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Porovnat"
@@ -11231,6 +11461,84 @@ msgstr "pro všechny lokální složky"
 msgid "years"
 msgstr "roky/let"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Chyba v regulérním výrazu '%s':\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+msgid "Important"
+msgstr "Důležité"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Pracovní"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Osobní"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+msgid "To Do"
+msgstr "Udělat"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1458
+msgid "Later"
+msgstr "Později"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Musíte pojmenovat tento filtr."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Název pravidla: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Bez názvu"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Pokud"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Provést akce"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "pokud souhlasí všechna kritéria"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "pokud souhlasí některá kritéria"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "příchozí"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "odchozí"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11253,217 +11561,217 @@ msgid "Beep"
 msgstr "Pípnutí"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "obsahuje"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopírovat do složky"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Datum přijetí"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Datum odeslání"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Smazáno"
 
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr "Neexistuje"
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "neobsahuje"
+msgid "Draft"
+msgstr "Koncept"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nekončí na"
+msgid "Exist"
+msgstr "Existuje"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "neexistuje"
+msgid "Expression"
+msgstr "Výraz"
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "nevrací"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "nezní jako"
+msgid "Follow Up"
+msgstr "Follow Up"
 
 #: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "nezačíná na"
+msgid "Label"
+msgstr "Štítek"
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Neexistuje"
+msgid "Mailing list"
+msgstr "Poštovní konference"
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Koncept"
+msgid "Message Body"
+msgstr "Tělo zprávy"
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "končí na"
+msgid "Message Header"
+msgstr "Hlavička zprávy"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Existuje"
+msgid "Move to Folder"
+msgstr "Přesunout do složky"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existuje"
+msgid "Pipe Message to Shell Command"
+msgstr "Předat zprávu příkazu shellu rourou"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Výraz"
+msgid "Play Sound"
+msgstr "Přehrát zvuk"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Follow Up"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Přečteno"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Příjemce"
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "je"
+msgid "Regex Match"
+msgstr "Odp. regul. výrazu"
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "je po"
+msgid "Replied to"
+msgstr "Odpovězeno komu:"
 
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "je před"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Skóre"
 
 #: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "je označený"
+msgid "Sender"
+msgstr "Odesílatel"
 
 #: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "je více než"
+msgid "Set Status"
+msgstr "Nastavit stav"
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "je méně než"
+msgid "Shell Command"
+msgstr "Příkaz shellu"
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "není"
+msgid "Size (kB)"
+msgstr "Velikost (kB)"
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "není označený"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
-msgid "Label"
-msgstr "Štítek"
+msgid "Source Account"
+msgstr "Zdrojový účet"
 
-#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr "Poštovní konference"
+#: filter/libfilter-i18n.h:35
+msgid "Specific header"
+msgstr "Specifická hlavička"
 
 #: filter/libfilter-i18n.h:37
-msgid "Message Body"
-msgstr "Tělo zprávy"
+msgid "Stop Processing"
+msgstr "Zastavit zpracování"
 
-#: filter/libfilter-i18n.h:38
-msgid "Message Header"
-msgstr "Hlavička zprávy"
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Předmět"
 
 #: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
-msgstr "Přesunout do složky"
+msgid "Unset Status"
+msgstr "Odnastavit stav"
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
-msgstr "Předat zprávu příkazu shellu rourou"
+msgid "contains"
+msgstr "obsahuje"
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
-msgstr "Přehrát zvuk"
+msgid "does not contain"
+msgstr "neobsahuje"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Přečteno"
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
+msgstr "nekončí na"
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
-msgstr "Příjemce"
+msgid "does not exist"
+msgstr "neexistuje"
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
-msgstr "Odp. regul. výrazu"
+msgid "does not return"
+msgstr "nevrací"
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
-msgstr "Odpovězeno komu:"
+msgid "does not sound like"
+msgstr "nezní jako"
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
-msgstr "vrací"
+msgid "does not start with"
+msgstr "nezačíná na"
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
-msgstr "vrací více než"
+msgid "ends with"
+msgstr "končí na"
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
-msgstr "vrací méně než"
+msgid "exists"
+msgstr "existuje"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Skóre"
+#: filter/libfilter-i18n.h:49
+msgid "is Flagged"
+msgstr "je označený"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
-msgid "Sender"
-msgstr "Odesílatel"
+#: filter/libfilter-i18n.h:50
+msgid "is after"
+msgstr "je po"
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
-msgstr "Nastavit stav"
+msgid "is before"
+msgstr "je před"
 
 #: filter/libfilter-i18n.h:52
-msgid "Shell Command"
-msgstr "Příkaz shellu"
+msgid "is greater than"
+msgstr "je více než"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "Velikost (kB)"
+msgid "is less than"
+msgstr "je méně než"
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "zní jako"
+msgid "is not Flagged"
+msgstr "není označený"
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
-msgstr "Zdrojový účet"
+msgid "is not"
+msgstr "není"
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
-msgstr "Specifická hlavička"
+msgid "is"
+msgstr "je"
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "začíná na"
+msgid "returns greater than"
+msgstr "vrací více než"
+
+#: filter/libfilter-i18n.h:58
+msgid "returns less than"
+msgstr "vrací méně než"
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
-msgstr "Zastavit zpracování"
+msgid "returns"
+msgstr "vrací"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Předmět"
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
+msgstr "zní jako"
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
-msgstr "Odnastavit stav"
+msgid "starts with"
+msgstr "začíná na"
 
-#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:916
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Název pravidla '%s' není unikátní, vyberte jiný."
@@ -11531,10 +11839,9 @@ msgid "Scanning %s"
 msgstr "Prohledávám %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Pošta"
 
@@ -11620,7 +11927,7 @@ msgstr "Evolution importuje vaše stará data z Netscape"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Koš"
 
@@ -11634,7 +11941,7 @@ msgid "Scanning directory"
 msgstr "Prohledává se adresář"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:541
+#: shell/e-shell-startup-wizard.c:556
 msgid "Starting import"
 msgstr "Spouští se import"
 
@@ -11670,97 +11977,39 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Nastavení editoru"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Zde se nachází nastavení voleb pošty, včetně bezpečnosti a zobrazení zprávy"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Zde se nachází nastavení kontroly pravopisu, podpisů a editoru zpráv"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Zde se nachází nastavení vašich emailových účtů"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Pošta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Ovládací prvek nastavení účtů pošty Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponenta pošty Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Editor zpráv pošty Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Ovládací prvek nastavení editoru zpráv pošty Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Konfigurační rozhraní pošty Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr "Prohlížeč složek pošty Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr "Ovládací prvek nastavení pošty Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Emailové účty"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "Nastavení pošty"
-
-#: mail/component-factory.c:117
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Složka obsahující poštu"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Veřejná pošta"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Veřejná složka obsahující poštu"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtuální Odpadkový koš"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtuální složka Odpadkový koš"
 
-#: mail/component-factory.c:147
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Tato složka nemůže obsahovat zprávy."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Change this folder's properties"
 msgstr "Změna vlastností této složky"
 
-#: mail/component-factory.c:819
+#: mail/component-factory.c:826
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11768,234 +12017,107 @@ msgstr ""
 "Některá vaše nastavení pošty se zdají být poškozená. Zkontrolujte, zda je "
 "vše v pořádku."
 
-#: mail/component-factory.c:1000
+#: mail/component-factory.c:1008
 msgid "You have not set a mail transport method"
 msgstr "Nemáte nastavený způsob přenosu pošty"
 
-#: mail/component-factory.c:1023
+#: mail/component-factory.c:1031
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Máte neodeslané zprávy, chcete přesto skončit?"
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "New Mail Message"
 msgstr "Nový dopis"
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "_Mail Message"
 msgstr "_Dopis"
 
-#: mail/component-factory.c:1064
+#: mail/component-factory.c:1072
 msgid "Compose a new mail message"
 msgstr "Napsat nový dopis"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 msgid "New Message Post"
 msgstr "Nový příspěvek"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 msgid "_Post Message"
 msgstr "_Poslat zprávu"
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1081
 msgid "Post a new mail message"
 msgstr "Poslat novou zprávu"
 
-#: mail/component-factory.c:1365
+#: mail/component-factory.c:1373
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: mail/component-factory.c:1376
+#: mail/component-factory.c:1384
 msgid "Cannot register storage with shell"
 msgstr "Nelze zaregistrovat sklad u shellu"
 
-#: mail/folder-browser-ui.c:486
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Vlastnosti \"%s\""
-
-#: mail/folder-browser-ui.c:488
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nelze vytvořit dočasný adresář: %s"
-
-#: mail/folder-browser.c:782
-#, c-format
-msgid "%d new"
-msgstr "nové %d"
-
-#: mail/folder-browser.c:785 mail/folder-browser.c:793
-#: mail/folder-browser.c:796
-msgid ", "
-msgstr ", "
-
-#: mail/folder-browser.c:787
-#, c-format
-msgid "%d hidden"
-msgstr "skryté %d"
-
-#: mail/folder-browser.c:789
-#, c-format
-msgid "%d visible"
-msgstr "viditelné %d"
-
-#: mail/folder-browser.c:794
-#, c-format
-msgid "%d selected"
-msgstr "vybráno %d"
-
-#: mail/folder-browser.c:799
-#, c-format
-msgid "%d unsent"
-msgstr "neodesláno %d"
-
-#: mail/folder-browser.c:801
-#, c-format
-msgid "%d sent"
-msgstr "odesláno %d"
-
-#: mail/folder-browser.c:803
-#, c-format
-msgid "%d total"
-msgstr "celkem %d"
-
-#: mail/folder-browser.c:1182
-msgid "Create _Virtual Folder From Search..."
-msgstr "Vytvořit _virtuální složku z vyhledávání..."
-
-#: mail/folder-browser.c:1736
-msgid "VFolder on _Subject"
-msgstr "V-složka podle _předmětu"
-
-#: mail/folder-browser.c:1737
-msgid "VFolder on Se_nder"
-msgstr "V-složka podle _odesílatele"
-
-#: mail/folder-browser.c:1738
-msgid "VFolder on _Recipients"
-msgstr "V-složka podle příje_mců"
-
-#: mail/folder-browser.c:1739
-msgid "VFolder on Mailing _List"
-msgstr "V-složka podle poštovní _konference"
-
-#: mail/folder-browser.c:1743
-msgid "Filter on Sub_ject"
-msgstr "Filtr podle _předmětu"
-
-#: mail/folder-browser.c:1744
-msgid "Filter on Sen_der"
-msgstr "Filtr podle _odesílatele"
-
-#: mail/folder-browser.c:1745
-msgid "Filter on Re_cipients"
-msgstr "Filtr podle příje_mců"
-
-#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
-msgid "Filter on _Mailing List"
-msgstr "Filtr podle poštovní _konference"
-
-#: mail/folder-browser.c:1764
-msgid "_Edit as New Message..."
-msgstr "_Upravit jako novou zprávu..."
-
-#: mail/folder-browser.c:1766
-msgid "_Print"
-msgstr "_Tisknout"
-
-#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
-msgid "_Reply to Sender"
-msgstr "_Odpovědět odesílateli"
-
-#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
-msgid "Reply to _List"
-msgstr "Odpovědět _do konference"
-
-#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
-msgid "Reply to _All"
-msgstr "Odpovědět _všem"
-
-#: mail/folder-browser.c:1773
-msgid "_Forward"
-msgstr "_Přeposlat"
-
-#: mail/folder-browser.c:1777
-msgid "Follo_w Up..."
-msgstr "Follo_w Up..."
-
-#: mail/folder-browser.c:1778
-msgid "Fla_g Completed"
-msgstr "Označit jako _dokončeno"
-
-#: mail/folder-browser.c:1779
-msgid "Cl_ear Flag"
-msgstr "Vymazat _značky"
-
-#. separator here?
-#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
-msgid "Mar_k as Read"
-msgstr "Označit jako _přečtené"
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Získání informací o složce"
 
-#: mail/folder-browser.c:1784
-msgid "Mark as _Unread"
-msgstr "Označit jako _nepřečtené"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Nastavení editoru"
 
-#: mail/folder-browser.c:1785
-msgid "Mark as _Important"
-msgstr "Označit jako _důležité"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Zde se nachází nastavení voleb pošty, včetně bezpečnosti a zobrazení zprávy"
 
-#: mail/folder-browser.c:1786
-msgid "_Mark as Unimportant"
-msgstr "_Označit jako nedůležité"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Zde se nachází nastavení kontroly pravopisu, podpisů a editoru zpráv"
 
-#: mail/folder-browser.c:1791
-msgid "U_ndelete"
-msgstr "Obnovit _smazané"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Zde se nachází nastavení vašich emailových účtů"
 
-#: mail/folder-browser.c:1795
-msgid "Mo_ve to Folder..."
-msgstr "Pře_sunout do složky..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution Pošta"
 
-#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "_Kopírovat do složky..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Ovládací prvek nastavení účtů pošty Evolution"
 
-#: mail/folder-browser.c:1804
-msgid "Add Sender to Address_book"
-msgstr "Přidat odesílatele do _adresáře"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Komponenta pošty Evolution"
 
-#: mail/folder-browser.c:1808
-msgid "Appl_y Filters"
-msgstr "Použít _filtry"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Editor zpráv pošty Evolution"
 
-#: mail/folder-browser.c:1812
-msgid "Crea_te Rule From Message"
-msgstr "Vy_tvořit pravidlo ze zprávy"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Ovládací prvek nastavení editoru zpráv pošty Evolution"
 
-#: mail/folder-browser.c:2071
-msgid "VFolder on M_ailing List"
-msgstr "V-složku podle _poštovní konference"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail configuration interface"
+msgstr "Konfigurační rozhraní pošty Evolution"
 
-#: mail/folder-browser.c:2073
-#, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Filtr podle poštovní ko_nference (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
+msgstr "Prohlížeč složek pošty Evolution"
 
-#: mail/folder-browser.c:2074
-#, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "V-složku podle poštovní _konference (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
+msgstr "Ovládací prvek nastavení pošty Evolution."
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Výchozí"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Emailové účty"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Získání informací o složce"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "Nastavení pošty"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -12080,7 +12202,7 @@ msgstr "_Jméno uživatele:"
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1886
 msgid "You may not create two accounts with the same name."
 msgstr "Nemůžete vytvořit dva účty se stejným jménem."
 
@@ -12111,16 +12233,16 @@ msgstr "[Výchozí]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 msgid "Account name"
 msgstr "Název účtu"
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -12163,217 +12285,6 @@ msgstr ""
 "    '%s'\n"
 "a byla aktualizována."
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "Příště tuto zprávu nezobrazovat."
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Nemáte nastaveného poštovního klienta.\n"
-"To je nutné udělat před tím, než budete\n"
-"posílat, přijímat nebo psát poštu.\n"
-"Chcete ho nastavit nyní?"
-
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-"Než začnete psát zprávu,\n"
-"musíte nastavit účet."
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Než začnete psát zprávu,\n"
-"musíte nastavit identitu."
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Než začnete psát zprávu,\n"
-"musíte nastavit způsob přenosu."
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-"Posíláte zprávu ve formátu HTML. Ujistěte se, že následující příjemci\n"
-"si přejí a mohou dostávat zprávy ve formátu HTML:\n"
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "Přesto poslat?"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Tato zpráva nemá předmět.\n"
-"Opravdu ji chcete poslat?"
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-"Protože je seznam kontaktů, na který posíláte zprávu, nastavený tak, aby "
-"skrýval adresy, tato zpráva bude obsahovat pouze adresáty ve skryté kopii."
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "Tato zpráva je určena pouze skrytým příjemcům."
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-"Je možné, že poštovní server zveřejní seznam adresátů přidáním hlavičky "
-"Apparently-To.\n"
-"Přesto poslat?"
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Aby mohla být tato zpráva odeslána, je nutné určit příjemce."
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Není možné otevřít složku konceptů pro tento účet.\n"
-"Chcete použít výchozí složku konceptů?"
-
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr "neznámý odesílatel"
-
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "V %a, %d. %m. %Y v %H:%M, %%s píše:"
-
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "Přesunout zprávu(y) do"
-
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "Kopírovat zprávu(y) do"
-
-#: mail/mail-callbacks.c:2344
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "Opravdu chcete upravit všechny zprávy (%d)?"
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Upravovat můžete pouze zprávy uložené\n"
-"ve složce Koncepty."
-
-#: mail/mail-callbacks.c:2393
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Pouze zprávy ze složky Odeslané je možné\n"
-"znovu poslat."
-
-#: mail/mail-callbacks.c:2403
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "Opravdu chcete přeposlat všechny zprávy (%d)?"
-
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr "Žádná vybraná zpráva"
-
-#: mail/mail-callbacks.c:2465
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"Nelze uložit do `%s'\n"
-" %s"
-
-#: mail/mail-callbacks.c:2470
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"`%s' již existuje.\n"
-"Chcete jej přepsat?"
-
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr "Uložit zprávu jako..."
-
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr "Uložit zprávy jako..."
-
-#: mail/mail-callbacks.c:2686
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"Tato operace trvale vymaže všechny zprávy označené jako smazané.\n"
-"Pokud budete pokračovat, nebude už možné tyto zprávy obnovit.\n"
-"\n"
-"Opravdu vymazat tyto zprávy?"
-
-#: mail/mail-callbacks.c:2781
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Chyba při načítání informací o filtrech:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr "Filtry"
-
-#: mail/mail-callbacks.c:2830
-#, c-format
-msgid "Page %d of %d"
-msgstr "Stránka %d z %d"
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr "Tisknout zprávu"
-
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr "Tisk zprávy selhal"
-
-#: mail/mail-callbacks.c:3147
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "Opravdu chcete otevřít všechny zprávy (%d) v samostatných oknech?"
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12399,11 +12310,19 @@ msgstr "Přidat skript podpisu"
 msgid "Signature(s)"
 msgstr "Podpis(y)"
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Kontroluje se služba"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Připojuji se k serveru..."
+
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:369
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12413,11 +12332,11 @@ msgstr ""
 "být vyplněna, ledaže byste si přáli, aby byly tyto informace obsaženy v "
 "odesílaných emailech."
 
-#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 msgid "Receiving Mail"
 msgstr "Příjem pošty"
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:377
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12425,15 +12344,15 @@ msgstr ""
 "Zadejte prosím informace o svém serveru pro příchozí poštu. Pokud si nejste "
 "jisti, kontaktujte svého správce nebo poskytovatele připojení k Internetu."
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr "Vyberte si prosím z následujících možností"
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 msgid "Sending Mail"
 msgstr "Odesílání pošty"
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:389
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12441,11 +12360,11 @@ msgstr ""
 "Zadejte prosím informace o způsobu odesílání pošty. Pokud si nejste jisti, "
 "kontaktujte svého správce nebo poskytovatele připojení k Internetu."
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Správa účtu"
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:396
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12458,14 +12377,6 @@ msgstr ""
 "pro vytvoření poštovního účtu Evolution. Zadejte prosím níže název pro tento "
 "účet. Tento název bude použit pouze pro zobrazení."
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Kontroluje se služba"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Připojuji se k serveru..."
-
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "Zkontrolovat _podporované typy"
@@ -12586,6 +12497,10 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Výchozí"
 
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Výchozí"
+
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Předem nastavené chování"
@@ -13034,212 +12949,25 @@ msgstr "Použít _bezpečné připojení (SSL):"
 msgid "_Use the same fonts as other applications"
 msgstr "Používat _stejná písma jako jiné aplikace"
 
-#: mail/mail-config.glade.h:171
-msgid "color"
-msgstr "barva"
-
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "popis"
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr "Nepodařilo se vytvořit kontext podpisu S/MIME."
-
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
-msgstr "Nepodařilo se vytvořit kontext certsonly S/MIME."
-
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr "Nepodařilo se vytvořit kontext zašifrovaní S/MIME."
-
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
-msgstr "Nepodařilo se vytvořit kontext obálky S/MIME."
-
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr "Nepodařilo se vytvořit kontext dekódování S/MIME."
-
-#: mail/mail-display.c:197
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Soubor `%s' již existuje.\n"
-"Přepsat jej?"
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr "Uložit přílohu"
-
-#: mail/mail-display.c:409
-#, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "Nelze vytvořit dočasný soubor '%s': %s"
-
-#: mail/mail-display.c:457
-msgid "Save Attachment..."
-msgstr "Uložit přílohu..."
-
-#: mail/mail-display.c:458
-msgid "View Inline"
-msgstr "Zobrazit v textu"
-
-#: mail/mail-display.c:459
-#, c-format
-msgid "Open in %s..."
-msgstr "Otevřít v %s..."
-
-#: mail/mail-display.c:515
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Zobrazit v textu (pomocí %s)"
-
-#: mail/mail-display.c:519
-msgid "Hide"
-msgstr "Skrýt"
-
-#: mail/mail-display.c:539
-msgid "External Viewer"
-msgstr "Externí prohlížeč"
-
-#: mail/mail-display.c:1368
-msgid "Downloading images"
-msgstr "Stahování obrázků"
-
-#: mail/mail-display.c:1545
-msgid "Loading message content"
-msgstr "Načítání obsahu zprávy"
-
-#: mail/mail-display.c:1887
-msgid "Overdue:"
-msgstr "Úkoly po termínu:"
-
-#: mail/mail-display.c:1891
-msgid "by %B %d, %Y, %l:%M %P"
-msgstr "do %B %d, %Y, %l:%M %P"
-
-#: mail/mail-display.c:2255
-msgid "Open Link in Browser"
-msgstr "Otevřít odkaz v prohlížeči"
-
-#: mail/mail-display.c:2256
-msgid "Copy Link Location"
-msgstr "Kopírovat umístění odkazu"
-
-#: mail/mail-display.c:2258
-msgid "Save Link as (FIXME)"
-msgstr "Uložit odkaz jako"
-
-#: mail/mail-display.c:2260
-msgid "Save Image as..."
-msgstr "Uložit obrázek jako..."
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Zkouší se %s"
 
-#: mail/mail-format.c:665
-#, c-format
-msgid "%s attachment"
-msgstr "%s příloha"
-
-#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
-#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Není možné zpracovat zprávu MIME. Zobrazí se jako zdrojový kód."
-
-#: mail/mail-format.c:785 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/mail-format.c:871
-msgid "Bad Address"
-msgstr "Špatná adresa"
-
-#: mail/mail-format.c:912 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Od"
-
-#: mail/mail-format.c:916
-msgid "Reply-To"
-msgstr "Odpovědět-komu"
-
-#: mail/mail-format.c:921 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Komu"
-
-#: mail/mail-format.c:926
-msgid "Cc"
-msgstr "Kopie"
-
-#: mail/mail-format.c:931
-msgid "Bcc"
-msgstr "Skrytá kopie"
-
-#: mail/mail-format.c:1482
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Tato zpráva je digitálně podepsaná. Kliknutím na ikonu zámku získáte "
-"podrobnosti."
-
-#: mail/mail-format.c:1510
-msgid "Could not create a PGP verfication context"
-msgstr "Nepodařilo se vytvořit kontext ověření PGP."
-
-#: mail/mail-format.c:1518
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Tato zpráva je digitálně podepsaná a byla shledána platnou."
-
-#: mail/mail-format.c:1525
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Tato zpráva je digitálně podepsaná, ale nelze ověřit její platnost."
-
-#: mail/mail-format.c:1789
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Odkaz na FTP server (%s)"
-
-#: mail/mail-format.c:1800
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Odkaz na lokální soubor (%s) platný na serveru \"%s\""
-
-#: mail/mail-format.c:1803
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Odkaz na lokální soubor (%s)"
-
-#: mail/mail-format.c:1830
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Odkaz na vzdálená data (%s)"
-
-#: mail/mail-format.c:1836
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Odkaz na neznámá externí data (typ \"%s\")"
-
-#: mail/mail-format.c:1838
-msgid "Malformed external-body part."
-msgstr "Chybná část externího těla."
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Místní složky/%s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:711
 msgid "Reconfiguring folder"
 msgstr "Znovu nastavuji složku"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:792
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13248,22 +12976,22 @@ msgstr ""
 "Nelze uložit metainformace složky, asi zjistíte,\n"
 "že ji již není možné ani otevřít: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:848
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nelze uložit metainformace složky do %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:900
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nelze odstranit metainformace složky %s: %s"
 
-#: mail/mail-local.c:1323
+#: mail/mail-local.c:1363
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mění se složka \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1388
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13271,16 +12999,16 @@ msgstr ""
 "Pokud již nemůžete otevřít tuto poštovní schránku, budete\n"
 "ji možná muset opravit ručně."
 
-#: mail/mail-local.c:1448
+#: mail/mail-local.c:1488
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znovu nastavit /%s"
 
-#: mail/mail-local.c:1512
+#: mail/mail-local.c:1552
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nemůžete změnit formát nelokálních složek."
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:259
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13289,7 +13017,7 @@ msgstr ""
 "Chyba během '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:262
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13298,118 +13026,131 @@ msgstr ""
 "Chyba při vykonávání operace:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:913
 msgid "Working"
 msgstr "Pracuje se"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:87
 msgid "Filtering Folder"
 msgstr "Filtruje se složka"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Přijímá se pošta"
 
-#: mail/mail-ops.c:550 mail/mail-ops.c:579
-msgid "However, the message was successfully sent."
-msgstr "Zpráva byla ale úspěšně odeslána."
+#: mail/mail-ops.c:557
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Nepodařilo se uložit poštu v dočasném souboru %s: %s"
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:578
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: mail/mail-ops.c:587
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Nepodařilo se uložit poštu v dočasném souboru %s: %s"
+
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posílá se \"%s\""
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posílá se zpráva č. %d z %d"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Selhání na zprávě %d z %d"
 
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr "Dokončeno."
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "Ukládá se zpráva do složky"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Přesouvají se zprávy do %s"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírují se zprávy do %s"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prochází se složky v \"%s\""
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr "Přeposlané zprávy"
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otevírá se složka %s"
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr "Otevírá se úložiště %s"
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňuje se složka %s"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukládá se složka '%s'"
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr "Aktualizuje se složka"
 
-#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr "Čistí se složka"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1666
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vyprazdňuji koš v '%s'"
 
-#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Místní složky"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získává se zpráva %s"
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Získávají se zprávy (%d)"
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ukládají se zprávy (%d)"
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13418,7 +13159,7 @@ msgstr ""
 "Nepodařilo se vytvořit výstupní soubor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13427,11 +13168,11 @@ msgstr ""
 "Chyba při ukládání zpráv do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Ukládá se příloha"
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13440,106 +13181,74 @@ msgstr ""
 "Nepodařilo se vytvořit výstupní soubor: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nelze zapisovat data: %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojuji se od %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu se připojuji na %s"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Nepojmenovaná zpráva)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Nepojmenovaná zpráva"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Prázdná zpráva"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "Hledat ve zprávě"
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr "Rozlišovat malá/velká"
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "Hledat dopředu"
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr "Hledat:"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Odpovídá:"
-
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr "Ruší se..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, typ: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cesta: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:259
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:308
 msgid "Send & Receive Mail"
 msgstr "Odeslat a přijmout poštu"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 msgid "Cancel _All"
 msgstr "Zrušit _vše"
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:390
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 msgid "Waiting..."
 msgstr "Čeká se..."
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:229
 msgid "User canceled operation."
 msgstr "Uživatel zrušil operaci."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:262
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadat heslo pro %s"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:264
 msgid "Enter Password"
 msgstr "Zadat heslo"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:287
 msgid "_Remember this password"
 msgstr "_Zapamatovat si toto heslo"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:288
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamatovat si toto heslo pro zbytek tohoto sezení"
 
@@ -13587,21 +13296,17 @@ msgstr "Přeposlaná zpráva - %s"
 msgid "Forwarded message"
 msgstr "Přeposlaná zpráva"
 
-#: mail/mail-tools.c:438
-msgid "Forwarded Message"
-msgstr "Přeposlaná zpráva"
-
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavuje se v-složka: %s"
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:209
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizuje se v-složka pro uri: %s"
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:467
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13614,100 +13319,95 @@ msgstr ""
 "    '%s'\n"
 "A byly aktualizovány."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:776
 msgid "VFolders"
 msgstr "V-složky"
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:834
 msgid "vFolders"
 msgstr "v-složky"
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:873
 msgid "Edit VFolder"
 msgstr "Upravit V-složku"
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokus o úpravu v-složky '%s', která neexistuje."
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:965
 msgid "New VFolder"
 msgstr "Nová V-složka"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Bez předmětu)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - zpráva"
-
-#: mail/message-list.c:741
+#: mail/message-list.c:900
 msgid "Unseen"
 msgstr "Nepřečtené"
 
-#: mail/message-list.c:742
+#: mail/message-list.c:901
 msgid "Seen"
 msgstr "Přečtené"
 
-#: mail/message-list.c:743
+#: mail/message-list.c:902
 msgid "Answered"
 msgstr "Odpovězené"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:903
 msgid "Multiple Unseen Messages"
 msgstr "Více nepřečtených zpráv"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:904
 msgid "Multiple Messages"
 msgstr "Více zpráv"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:908
 msgid "Lowest"
 msgstr "Nejnižší"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:909
 msgid "Lower"
 msgstr "Nižší"
 
-#: mail/message-list.c:754
+#: mail/message-list.c:913
 msgid "Higher"
 msgstr "Vyšší"
 
-#: mail/message-list.c:755
+#: mail/message-list.c:914
 msgid "Highest"
 msgstr "Nejvyšší"
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1231
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1238
 msgid "Today %l:%M %p"
 msgstr "Dnes %k:%M"
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1247
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %k:%M"
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1259
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1267
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1269
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3062
 msgid "Generating message list"
 msgstr "Generuje se seznam zpráv"
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datum"
+
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Termín dokončení"
@@ -13724,6 +13424,10 @@ msgstr "Označeno"
 msgid "Follow Up Flag"
 msgstr "Značka Follow up"
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Od"
+
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Původní umístění"
@@ -13736,6 +13440,10 @@ msgstr "Přijato"
 msgid "Size"
 msgstr "Velikost"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Komu"
+
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Zavolat"
@@ -13752,7 +13460,7 @@ msgstr "Follow Up"
 msgid "For Your Information"
 msgstr "Pro vaši informaci"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr "Přeposlat"
 
@@ -13760,11 +13468,11 @@ msgstr "Přeposlat"
 msgid "No Response Necessary"
 msgstr "Není nutná odpověď"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
 msgid "Reply to All"
 msgstr "Odpovědět všem"
 
@@ -13796,39 +13504,6 @@ msgstr "Termín _dokončení:"
 msgid "_Flag:"
 msgstr "_Značka:"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "Prochází se složky pod %s na \"%s\""
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "Prochází se kořenové složky na \"%s\""
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Přihlašuji si složku \"%s\""
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Odhlašuji se ze složky \"%s\""
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Složka"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "Nebyl vybrán žádný server"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Vyberte prosím server."
-
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Přihlášené složky"
@@ -13842,17 +13517,123 @@ msgid "S_erver:"
 msgstr "S_erver:"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Scanning folders ..."
-msgstr "Zkoumám složky..."
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Přihlásit se"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
 msgstr "_Odhlásit se"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Adresář obsahující souhrn Evolution"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %e %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Prosím čekejte..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Tisk souhrnu"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Tisk souhrnu selhal"
+
+#: my-evolution/e-summary-calendar.c:384
+msgid "Appointments"
+msgstr "Události"
+
+#: my-evolution/e-summary-calendar.c:392
+msgid "No appointments."
+msgstr "Žádné události."
+
+#: my-evolution/e-summary-calendar.c:409
+msgid "%k:%M %d %B"
+msgstr "%d. %B %k:%M"
+
+#: my-evolution/e-summary-calendar.c:411
+#, fuzzy
+msgid "%l:%M%p %d %B"
+msgstr "%d. %B %k:%M"
+
+#: my-evolution/e-summary-calendar.c:429
+msgid "No description"
+msgstr "Bez popisu"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Pošta"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Slovo dne"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Citát dne"
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr "Nové novinky"
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr "_URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Chyba při stahování RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Novinky"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Vše"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Zobrazené"
+
+#: my-evolution/e-summary-tasks.c:349
+msgid "No tasks"
+msgstr "Žádné úkoly"
+
+#: my-evolution/e-summary-tasks.c:387
+#, fuzzy
+msgid "blue"
+msgstr "Ambler"
+
+#: my-evolution/e-summary-tasks.c:387
+msgid "(No Description)"
+msgstr "(Bez popisu)"
+
+#: my-evolution/e-summary-weather.c:72
+msgid "My Weather"
+msgstr "Moje počasí"
+
+#: my-evolution/e-summary-weather.c:261
+msgid "There was an error downloading data for"
+msgstr "Nastala chyba při stahování dat pro"
+
+#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Počasí"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:582
+msgid "KBOS"
+msgstr "KBOS"
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Zde se nastavuje vzhled souhrnu Evolution"
@@ -23658,110 +23439,6 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Curych"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Adresář obsahující souhrn Evolution"
-
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr "Události"
-
-#: my-evolution/e-summary-calendar.c:389
-msgid "No appointments."
-msgstr "Žádné události."
-
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr "%d. %B %k:%M"
-
-#: my-evolution/e-summary-calendar.c:408
-msgid "%l:%M%P %d %B"
-msgstr "%d. %B %k:%M"
-
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr "Bez popisu"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Pošta"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Slovo dne"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Citát dne"
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr "Nové novinky"
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "_URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Chyba při stahování RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Novinky"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Vše"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Zobrazené"
-
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr "Žádné úkoly"
-
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr "(Bez popisu)"
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Moje počasí"
-
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr "Nastala chyba při stahování dat pro"
-
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Počasí"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr "KBOS"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Prosím čekejte..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Tisk souhrnu"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Tisk souhrnu selhal"
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -25020,21 +24697,27 @@ msgstr "_Jeden den"
 msgid "_Show full path for folders"
 msgstr "Zobrazovat _celé cesty ke složkám"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Zde lze nastavit speciální složky a chování odpojené složky"
+#: notes/component-factory.c:27
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nový"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Shell Evolution"
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Vytvořit novou složku"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Ovládací prvek nastavení složky Evolution"
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Nelze inicializovat shell Ximian Evolution: %s"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Nastavení složky"
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Nelze spustit Bonobo"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25129,6 +24812,49 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Pro vás vytvořili"
 
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Nelze aktivovat komponentu %s :\n"
+"Chyba aktivačního systému je:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Nelze vytvořit lokální úložiště -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Komponenta Evolution, která se stará o složky typu \"%s\"\n"
+"neočekávaně skončila. Musíte ukončit aplikaci Evolution a znovu ji\n"
+"spustit, chcete-li znovu získat přístup k vašim datům."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Neplatné argumenty"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Nelze registrovat u OAF"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Databáze nastavení nebyla nalezena"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Obecná chyba"
+
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Další složky dokončení"
@@ -25217,26 +24943,31 @@ msgstr ""
 "Nelze přejmenovat složku:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:538
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Přejmenovat složku \"%s\" na:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:541
 msgid "Rename Folder"
 msgstr "Přejmenovat složku"
 
-#: shell/e-shell-folder-commands.c:553
+#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Zadaný název složky není platný: %s"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr "Vybraná složka nepatří jinému uživateli"
 
-#: shell/e-shell-folder-commands.c:590
+#: shell/e-shell-folder-commands.c:587
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25279,11 +25010,19 @@ msgstr ""
 "\n"
 "Použijte \"Automaticky\" pokud typ neznáte a Evolution se jej pokusí určit."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
 msgid "Please select the information that you would like to import:"
 msgstr "Vyberte prosím informace, které chcete importovat:"
 
-#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
+#: shell/e-shell-importer.c:151
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25292,21 +25031,21 @@ msgstr ""
 "Importuje se %s\n"
 "Importuje se položka %d."
 
-#: shell/e-shell-importer.c:317
+#: shell/e-shell-importer.c:323
 msgid "Select importer"
 msgstr "Vyberte importér"
 
-#: shell/e-shell-importer.c:458
+#: shell/e-shell-importer.c:464
 #, c-format
 msgid "File %s does not exist"
 msgstr "Soubor %s neexistuje"
 
-#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
-#: shell/e-shell-importer.c:518
+#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
+#: shell/e-shell-importer.c:524
 msgid "Evolution Error"
 msgstr "Chyba Evolution"
 
-#: shell/e-shell-importer.c:475
+#: shell/e-shell-importer.c:481
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25315,11 +25054,11 @@ msgstr ""
 "Není k dispozici importér pro zpracování\n"
 "%s"
 
-#: shell/e-shell-importer.c:484
+#: shell/e-shell-importer.c:490
 msgid "Importing"
 msgstr "Importuje se"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25328,17 +25067,17 @@ msgstr ""
 "Importuje se %s\n"
 "Začíná %s"
 
-#: shell/e-shell-importer.c:503
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid "Error starting %s"
 msgstr "Chyba při startu %s"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:523
 #, c-format
 msgid "Error loading %s"
 msgstr "Chyba při načítání %s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:540
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25347,31 +25086,35 @@ msgstr ""
 "Importuje se %s\n"
 "Importuje se položka 1."
 
-#: shell/e-shell-importer.c:588
+#: shell/e-shell-importer.c:594
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:637
-msgid "Filename:"
+#: shell/e-shell-importer.c:643
+#, fuzzy
+msgid "_Filename:"
 msgstr "Název souboru:"
 
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr "Vyberte soubor"
 
-#: shell/e-shell-importer.c:651
-msgid "File type:"
+#: shell/e-shell-importer.c:658
+#, fuzzy
+msgid "File _type:"
 msgstr "Typ souboru:"
 
-#: shell/e-shell-importer.c:676
-msgid "Import data and settings from older programs"
+#: shell/e-shell-importer.c:684
+#, fuzzy
+msgid "Import data and settings from _older programs"
 msgstr "Import dat a nastavení ze starších programů"
 
-#: shell/e-shell-importer.c:680
-msgid "Import a single file"
+#: shell/e-shell-importer.c:687
+#, fuzzy
+msgid "Import a _single file"
 msgstr "Importovat jeden soubor"
 
-#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
+#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25379,25 +25122,26 @@ msgstr ""
 "Prosím čekejte...\n"
 "Hledají se existující nastavení"
 
-#: shell/e-shell-importer.c:749
+#: shell/e-shell-importer.c:758
 msgid "Starting Intelligent Importers"
 msgstr "Spouští se inteligentní importy"
 
-#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
+#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
 #, c-format
 msgid "From %s:"
 msgstr "Z %s:"
 
-#: shell/e-shell-importer.c:1047
+#: shell/e-shell-importer.c:1061
 msgid "Select folder"
 msgstr "Vyberte složku"
 
-#: shell/e-shell-importer.c:1048
+#: shell/e-shell-importer.c:1062
 msgid "Select a destination folder for importing this data"
 msgstr "Výběr složky, do které mají být importována tato data"
 
-#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
-msgid "Import"
+#: shell/e-shell-importer.c:1193
+#, fuzzy
+msgid "_Import"
 msgstr "Importovat"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25457,11 +25201,19 @@ msgstr "Nelze otevřít sdílenou složku: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Nelze nalézt zadanou sdílenou složku."
 
-#: shell/e-shell-user-creatable-items-handler.c:586
-#: shell/e-shell-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nový"
+#: shell/e-shell-startup-wizard.c:771
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:782
+#, fuzzy
+msgid "Quit Assistant"
+msgstr "Asistent"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25483,6 +25235,37 @@ msgstr "Název složky nesmí obsahovat znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' a '..' jsou rezervované názvy složek."
 
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Není zobrazena žádná složka)"
+
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(Nic)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution je nyní on-line. Stiskem tohoto tlačítka přejdete do režimu "
+"off-line."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution přechází do režimu off-line."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution je nyní off-line. Stiskem tohoto tlačítka přejdete do "
+"režimu on-line."
+
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Zdá se, že nemáte nainstalované nástroje pro PalmPilota GNOME."
@@ -25532,79 +25315,13 @@ msgstr "_Pracovat při odpojení"
 msgid "Work Offline"
 msgstr "Pracovat při odpojení"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Není zobrazena žádná složka)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Nic)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution je nyní on-line. Stiskem tohoto tlačítka přejdete do režimu "
-"off-line."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution přechází do režimu off-line."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution je nyní off-line. Stiskem tohoto tlačítka přejdete do "
-"režimu on-line."
-
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Nelze aktivovat komponentu %s :\n"
-"Chyba aktivačního systému je:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Nelze vytvořit lokální úložiště -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Komponenta Evolution, která se stará o složky typu \"%s\"\n"
-"neočekávaně skončila. Musíte ukončit aplikaci Evolution a znovu ji\n"
-"spustit, chcete-li znovu získat přístup k vašim datům."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Neplatné argumenty"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Nelze registrovat u OAF"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Databáze nastavení nebyla nalezena"
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Chyba při ukládání zkratek."
 
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Obecná chyba"
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Zkratky"
 
 #: shell/e-shortcuts-view.c:80
 msgid "Create New Shortcut Group"
@@ -25719,18 +25436,6 @@ msgstr "_Odstranit"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstranit tuto zkratku z lišty zkratek"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Chyba při ukládání zkratek."
-
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Zkratky"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Zaškrtávací políčko"
-
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Žádná chyba"
@@ -25787,6 +25492,14 @@ msgstr "Nelze vytvořit složku s tímto názvem"
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Tuto operaci nelze provést v režimu odpojení"
 
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Zaškrtávací políčko"
+
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Složka"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25801,103 +25514,103 @@ msgstr "%s (%d%% hotovo)"
 msgid "<click here to select a folder>"
 msgstr "<kliknutím zde vyberete složku>"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Neznámá chyba."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Chyba ze systému komponent:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Chyba z aktivačního systému je:\n"
-"%s"
-
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr "Chyba CORBA"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1189
 msgid "Interrupted"
 msgstr "Přerušeno"
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1191
 msgid "Invalid argument"
 msgstr "Neplatný argument"
 
-#: shell/evolution-shell-component.c:1190
+#: shell/evolution-shell-component.c:1193
 msgid "Already has an owner"
 msgstr "Již má vlastníka"
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1195
 msgid "No owner"
 msgstr "Žádný vlastník"
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1197
 msgid "Not found"
 msgstr "Nenalezeno"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1199
 msgid "Unsupported type"
 msgstr "Nepodporovaný typ"
 
-#: shell/evolution-shell-component.c:1198
+#: shell/evolution-shell-component.c:1201
 msgid "Unsupported schema"
 msgstr "Nepodporované schéma"
 
-#: shell/evolution-shell-component.c:1200
+#: shell/evolution-shell-component.c:1203
 msgid "Unsupported operation"
 msgstr "Nepodporovaná operace"
 
-#: shell/evolution-shell-component.c:1202
+#: shell/evolution-shell-component.c:1205
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: shell/evolution-shell-component.c:1206
+#: shell/evolution-shell-component.c:1209
 msgid "Exists"
 msgstr "Existuje"
 
-#: shell/evolution-shell-component.c:1208
+#: shell/evolution-shell-component.c:1211
 msgid "Invalid URI"
 msgstr "Neplatné URI"
 
-#: shell/evolution-shell-component.c:1212
+#: shell/evolution-shell-component.c:1215
 msgid "Has subfolders"
 msgstr "Má podsložky"
 
-#: shell/evolution-shell-component.c:1214
+#: shell/evolution-shell-component.c:1217
 msgid "No space left"
 msgstr "Nezbývá žádné místo"
 
-#: shell/evolution-shell-component.c:1216
+#: shell/evolution-shell-component.c:1219
 msgid "Old owner has died"
 msgstr "Starý vlastník zemřel"
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Neznámá chyba."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Chyba ze systému komponent:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Chyba z aktivačního systému je:\n"
+"%s"
+
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Typ testu"
@@ -26004,6 +25717,22 @@ msgstr ""
 "\n"
 "Stiskem \"Použít\" své nastavení uložíte."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Zde lze nastavit speciální složky a chování odpojené složky"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Shell Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Ovládací prvek nastavení složky Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Nastavení složky"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Spusťte import souboru do Evolution kliknutím na \"Import\"."
@@ -26042,6 +25771,10 @@ msgstr ""
 msgid "Importers"
 msgstr "Importéry"
 
+#: shell/importer/intelligent.c:191
+msgid "Import"
+msgstr "Importovat"
+
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Neimportovat"
@@ -26228,7 +25961,7 @@ msgstr "Přesunout kontakt(y) do jiné složky..."
 msgid "Move to Folder..."
 msgstr "Přesunout do složky..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "Vložit schránku"
 
@@ -26236,9 +25969,9 @@ msgstr "Vložit schránku"
 msgid "Previews the contacts to be printed"
 msgstr "Náhled kontaktů před tiskem"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "_Náhled před tiskem"
 
@@ -26282,17 +26015,21 @@ msgstr "Zastavit načítání"
 msgid "View the current contact"
 msgstr "Zobrazit aktuální kontakt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Akce"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "_Kopírovat do složky..."
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Přeposlat kontakt..."
 
@@ -26360,46 +26097,61 @@ msgstr "Jít na určité datum"
 msgid "Go to today"
 msgstr "Jít na dnešek"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "měsíc"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr "Náhledy kalendáře k tisku"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Tisknout tento kalendář"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Zveřejnit informace o volném/obsazeném čase pro tento kalendář"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#, fuzzy
+msgid "Purg_e"
+msgstr "Bourges"
+
+#: ui/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Purge old appointments and meetings"
+msgstr "Veřejná složka obsahující události a schůzky"
+
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Show as list"
+msgstr "Ukázat podrobnosti"
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr "Ukázat jeden den"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr "Ukázat jeden měsíc"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr "Ukázat jeden týden"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Ukázat pracovní týden"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr "týden"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Zavřít"
@@ -26408,7 +26160,7 @@ msgstr "Zavřít"
 msgid "Close this item"
 msgstr "Zavřít tuto položku"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Smazat tuto položku"
 
@@ -26421,47 +26173,58 @@ msgstr "Hlavní nástrojová lišta"
 msgid "Preview the printed item"
 msgstr "Náhled položky před tiskem"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Tisknout tuto položku"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Uložit"
-
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
-msgstr "Uložit jako..."
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Uložit j_ako..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Uložit a zavřít"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save and _Close"
+msgstr "Uložit a zavřít"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
 msgstr "Uložit tuto položku a zavřít dialog"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr "Uložit tuto položku na disk"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Soubor"
 
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Uložit"
+
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Kopírovat vybraný text do schránky"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Vyjmou_t"
 
@@ -26482,51 +26245,39 @@ msgstr "Vybrat _vše"
 msgid "Select all text"
 msgstr "Vybrat všechen text"
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr "Tisknout _obálku..."
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Uložit j_ako..."
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
 msgstr "Uložit kontakt a zavřít dialog"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
 msgstr "_Poslat kontaktu zprávu..."
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Uložit"
-
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
 msgstr "Smazat tento seznam"
 
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
-msgstr "Smazat..."
-
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
 msgstr "Uložit seznam a zavřít dialog"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."
 msgstr "Po_slat seznam dalším..."
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
 msgid "Send _message to list..."
 msgstr "Poslat _zprávu seznamu..."
 
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Smazat..."
+
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Zrušit _schůzku"
@@ -26601,7 +26352,8 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Natrvalo odstranit všechny smazané zprávy ze všech složek"
 
 #: ui/evolution-mail-global.xml.h:11
-msgid "Post New Message"
+#, fuzzy
+msgid "Post Ne_w Message"
 msgstr "Poslat novou zprávu"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26636,14 +26388,19 @@ msgstr "_Panel náhledu"
 msgid "Change the properties of this folder"
 msgstr "Změnit vlastnosti této složky"
 
-#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopírovat vybrané zprávy do schránky"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Vyjmout vybrané zprávy do schránky"
 
+#: ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "E_xpunge"
+msgstr "_Vyčistit"
+
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Skrýt _vybrané zprávy"
@@ -26662,14 +26419,15 @@ msgid ""
 msgstr "Skrýt smazané zprávy (nezobrazovat je přeškrtnuté)"
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as R_ead"
+#, fuzzy
+msgid "Mark All as _Read"
 msgstr "Označit vše jako př_ečtené"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Označit všechny viditelné zprávy jako přečtené"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
 msgid "Paste message(s) from the clipboard"
 msgstr "Vložit zprávy ze schránky"
 
@@ -26713,26 +26471,37 @@ msgstr "Dočasně skrýt vybrané zprávy"
 msgid "Threaded Message list"
 msgstr "Seznam zpráv dle vláken"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
-msgid "_Expunge"
-msgstr "_Vyčistit"
-
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Složka"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obrátit výběr"
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Vla_stnosti..."
 
-#: ui/evolution-mail-list.xml.h:31
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "Seznam zpráv dle _vláken"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Zavřít toto okno"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "_Zavřít"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Zobrazení"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Přidat _odesílatele do adresáře"
@@ -26750,401 +26519,413 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Použít pravidla filtru na vybrané zprávy"
 
 #: ui/evolution-mail-message.xml.h:5
+#, fuzzy
+msgid "Caret _Mode"
+msgstr "Textový model"
+
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Napsat odpověď všem příjemcům vybrané zprávy"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Napsat odpověď do poštovní konference z vybraných zpráv"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Napsat odpověď odesílateli vybrané zprávy"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Kopírovat vybrané zprávy do jiné složky"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr "Ze zprávy vytvořit _virtuální složku"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Vytvořit pravidlo pro filtrování zpráv od tohoto odesílatele"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Vytvořit pravidlo pro filtrování zpráv těmto příjemcům"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Vytvořit pravidlo pro filtrování zpráv pro tuto poštovní konferenci"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr "Vytvořit pravidlo pro filtrování zpráv s tímto předmětem"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr "Vytvořit virtuální složku pro tyto příjemce"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr "Vytvořit virtuální složku pro tuto poštovní konferenci"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr "Vytvořit virtuální složku pro tohoto odesílatele"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr "Vytvořit virtuální složku pro tento předmět"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Zmenšit velikost textu"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Zobrazit následující důležitou zprávu"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Zobrazit následující zprávu"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Zobrazit následující nepřečtenou zprávu"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Zobrazit následující nepřečtené vlákno"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Zobrazit předcházející důležitou zprávu"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Zobrazit předcházející zprávu"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Zobrazit předcházející nepřečtenou zprávu"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "F_orward"
 msgstr "Př_eposlat"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "Filtr podle poštovní _konference..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Filtr podle _odesílatele..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Filtr podle _příjemců..."
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Filtr podle pře_dmětu..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:37
 msgid "Flag selected message(s) for follow-up"
 msgstr "Označí vybrané zprávy pro follow up"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:38
 msgid "Follow _Up..."
 msgstr "Follow _Up..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 msgid "Force images in HTML mail to be loaded"
 msgstr "Vždy nahrávat obrázky v HTML zprávách"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message in the body of a new message"
 msgstr "Přeposlat vybranou zprávu v těle nové zprávy"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message quoted like a reply"
 msgstr "Přeposlat vybranou zprávu uvedenou jako odpověď"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message to someone"
 msgstr "Přeposlat někomu vybranou zprávu"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Přeposlat někomu vybranou zprávu jako přílohu"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:45
 msgid "Increase the text size"
 msgstr "Zvětšit velikost textu"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:46
 msgid "Load _Images"
 msgstr "Nahrávat _obrázky"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr "Označit jako _přečtené"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr "Označit jako _důležité"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as U_nread"
 msgstr "Označit jako _nepřečtené"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as Unimp_ortant"
 msgstr "Označit jako nedů_ležité"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as having been read"
 msgstr "Označit vybrané zprávy jako přečtené"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as important"
 msgstr "Označit vybrané zprávy jako důležité"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Označit vybrané zprávy jako nepřečtené"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Označit vybrané zprávy jako nedůležité"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Označit vybrané zprávy ke smazání"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:56
 msgid "Move"
 msgstr "Přesunout"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:57
 msgid "Move selected message(s) to another folder"
 msgstr "Přesunout vybrané zprávy do jiné složky"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Další"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr "další důležit_ou zprávu"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "další _vlákno"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "d_alší nepřečtenou zprávu"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:62
 msgid "Open the selected message in a new window"
 msgstr "Otevřít vybranou zprávu v novém okně"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:63
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Otevřít vybranou zprávu a upravit ji pro znovu-poslání"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:64
 msgid "Original Si_ze"
 msgstr "Původní _velikost"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:65
 msgid "P_revious Unread Message"
 msgstr "pře_dchozí nepřečtenou zprávu"
 
-#: ui/evolution-mail-message.xml.h:62
-msgid "Post a Reply"
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Post a Repl_y"
 msgstr "Poslat odpověď"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:68
 msgid "Post a reply to a message in a Public folder"
 msgstr "Poslat odpověď na zprávu do veřejné složky"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:69
 msgid "Pr_evious Important Message"
 msgstr "př_edchozí důležitou zprávu"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:70
 msgid "Preview the message to be printed"
 msgstr "Náhled zprávy před tiskem"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:71
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:74
 msgid "Print this message"
 msgstr "Vytisknout tuto zprávu"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:75
 msgid "Re_direct"
 msgstr "Přesmě_rovat"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:76
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Přesměruje (bounce) vybranou zprávu někomu jinému"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "Odpovědět _všem"
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr "Odpovědět _do konference"
+
+#: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr "Obnovit text v jeho původní velikosti"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch Message..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "S_earch in Message..."
 msgstr "Hledat _ve zprávě..."
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "S_maller"
 msgstr "_Menší"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
 msgid "Save the message as a text file"
 msgstr "Uložit tuto zprávu jako textový soubor"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:85
 msgid "Search for text in the body of the displayed message"
 msgstr "Hledat text v těle zobrazené zprávy"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:86
 msgid "Set up the page settings for your current printer"
 msgstr "Nastavit stránku pro vaši aktuální tiskárnu"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show Email _Source"
 msgstr "Ukázat _zdroj emailu"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show Full _Headers"
 msgstr "Ukázat celou _hlavičku"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Hledat text v těle zobrazené zprávy"
+
+#: ui/evolution-mail-message.xml.h:90
 msgid "Show message in the normal style"
 msgstr "Ukázat zprávu v normálním stylu"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Show message with all email headers"
 msgstr "Ukázat zprávu se všemi e-mailovými hlavičkami"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Zobrazit zdrojový formát poštovní zprávy"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Text Si_ze"
 msgstr "_Velikost textu"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr "Obnovit smazané vybrané zprávy"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "VFolder on Mailing _List..."
 msgstr "V-složku podle poštovní _konference..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "VFolder on Se_nder..."
 msgstr "V-složku podle _odesílatele..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "VFolder on _Recipients..."
 msgstr "V-složku podle _příjemců"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "VFolder on _Subject..."
 msgstr "V-složku podle pře_dmětu..."
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Přiložené"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Copy to Folder"
 msgstr "_Kopírovat do složky"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Create Filter From Message"
 msgstr "_Vytvořit filtr ze zprávy"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Forward Message"
 msgstr "_Přeposlat zprávu"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Jít na"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Inline"
 msgstr "_Vložené"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Larger"
 msgstr "_Větší"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Message Display"
 msgstr "_Zobrazení zprávy"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Move to Folder"
 msgstr "_Přesunout do složky"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Next Message"
 msgstr "_následující zprávu"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Normal Display"
 msgstr "_Normální zobrazení"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Open Message"
 msgstr "_Otevřít zprávu"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Previous Message"
 msgstr "_předchozí zprávu"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Quoted"
 msgstr "_Citace"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr "_Odpovědět odesílateli"
+
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Resend..."
 msgstr "_Znovu poslat..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Undelete"
 msgstr "_Obnovit smazané"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Zavřít toto okno"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "_Zavřít"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Zobrazení"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Příloha"
@@ -27153,7 +26934,7 @@ msgstr "Příloha"
 msgid "Attach a file"
 msgstr "Připojit soubor"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Uzavřít aktuální soubor"
 
@@ -27169,7 +26950,7 @@ msgstr "Zašifrovat tuto zprávu pomocí PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Zašifrovat tuto zprávu vaším šifrovacím certifikátem S/MIME"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "For_mát"
 
@@ -27201,6 +26982,11 @@ msgstr "Šifrování S/MIME"
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Uložit"
+
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Uložit jako"
@@ -27214,7 +27000,7 @@ msgid "Save in folder..."
 msgstr "Uložit ve složce..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Uložit aktuální soubor"
 
@@ -27231,7 +27017,7 @@ msgid "Send"
 msgstr "Poslat"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Poslat zprávu ve formátu HTML"
 
@@ -27296,7 +27082,7 @@ msgid "_From Field"
 msgstr "_Od:"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Vložit"
 
@@ -27312,11 +27098,11 @@ msgstr "Odpovědět-_komu:"
 msgid "_Security"
 msgstr "_Zabezpečení"
 
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Uložit aktuální soubor a zavřít okno"
 
@@ -27392,15 +27178,20 @@ msgstr "Smazat vybrané úkoly"
 msgid "Mar_k as Complete"
 msgstr "Označit jako _dokončený"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Mark selected tasks as complete"
+msgstr "Označit _vybrané úkoly jako dokončené"
+
+#: ui/evolution-tasks.xml.h:11
 msgid "Paste task from the clipboard"
 msgstr "Vloží úlohu ze schránky"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Previews the list of tasks to be printed"
 msgstr "Náhled seznamu úkolů před tiskem"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:14
 msgid "Print the list of tasks"
 msgstr "Tisknout seznam úkolů"
 
@@ -27649,27 +27440,33 @@ msgid "_Work Week View"
 msgstr "Náhled na _pracovní týden"
 
 #: views/mail/galview.xml.h:1
-msgid "As Sent Folder"
+#, fuzzy
+msgid "As _Sent Folder"
 msgstr "Jako složka Odeslané"
 
 #: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr "Podle příznaku Follow up"
+#, fuzzy
+msgid "By S_tatus"
+msgstr "Podle stavu"
 
 #: views/mail/galview.xml.h:3
-msgid "By Sender"
+#, fuzzy
+msgid "By Se_nder"
 msgstr "Podle odesílatele"
 
 #: views/mail/galview.xml.h:4
-msgid "By Status"
-msgstr "Podle stavu"
+#, fuzzy
+msgid "By Su_bject"
+msgstr "Podle předmětu"
 
 #: views/mail/galview.xml.h:5
-msgid "By Subject"
-msgstr "Podle předmětu"
+#, fuzzy
+msgid "By _Follow Up Flag"
+msgstr "Podle příznaku Follow up"
 
 #: views/mail/galview.xml.h:6
-msgid "Messages"
+#, fuzzy
+msgid "_Messages"
 msgstr "Zprávy"
 
 #: views/tasks/galview.xml.h:1
@@ -27726,20 +27523,20 @@ msgstr "Definovat zobrazení..."
 
 #. 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:427
+#: widgets/misc/e-calendar-item.c:456
 msgid "MTWTFSS"
 msgstr "PÚSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
+#: widgets/misc/e-calendar-item.c:1174
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
 msgid "Now"
 msgstr "Nyní"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
 msgid "Today"
 msgstr "Dnes"
 
@@ -27856,22 +27653,6 @@ msgstr "_Upravit uložená vyhledávání..."
 msgid "_Advanced..."
 msgstr "_Pokročilé..."
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr "Předformátované"
-
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr "Chyba"
-
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr "Otázka"
-
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr "Zpráva"
-
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Vyhledávání"
@@ -27917,5 +27698,537 @@ msgstr "Obsluha místního souboru kalendáře Evolution"
 msgid "Evolution Addressbook local file backend"
 msgstr "Obsluha místního souboru adresáře Evolution"
 
+#~ msgid "That person is already attending the meeting!"
+#~ msgstr "Tato osoba se již schůzky účastní!"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "_Save as..."
+#~ msgstr "_Uložit jako..."
+
+#~ msgid "End Date"
+#~ msgstr "Konec"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nová _událost"
+
+#~ msgid "Print..."
+#~ msgstr "Tisk..."
+
+#~ msgid "Chair Persons"
+#~ msgstr "Předsedové"
+
+#~ msgid "Required Participants"
+#~ msgstr "Vyžadovaní účastníci"
+
+#~ msgid "Optional Participants"
+#~ msgstr "Nepovinní účastníci"
+
+#~ msgid "Resources"
+#~ msgstr "Zdroje"
+
+#~ msgid "Individual"
+#~ msgstr "Individuálně"
+
+#~ msgid "Group"
+#~ msgstr "Skupina"
+
+#~ msgid "Resource"
+#~ msgstr "Zdroj"
+
+#~ msgid "Room"
+#~ msgstr "Místnost"
+
+#~ msgid "Chair"
+#~ msgstr "Předseda"
+
+#~ msgid "Required Participant"
+#~ msgstr "Vyžadovaný účastník"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Nepovinný účastník"
+
+#~ msgid "Non-Participant"
+#~ msgstr "Bez účasti"
+
+#~ msgid "Needs Action"
+#~ msgstr "Potřebné akce"
+
+#~ msgid "Delegated"
+#~ msgstr "Delegováno"
+
+#~ msgid "In Process"
+#~ msgstr "Probíhá"
+
+#~ msgid "Hey you, dunce. You need an account to send mail doncha know."
+#~ msgstr "Hej ty, truhlíku. Potřebuješ účet, abys mohl poslat poštu, chápeš."
+
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Vlastnosti \"%s\""
+
+#~ msgid "Properties"
+#~ msgstr "Vlastnosti"
+
+#~ msgid "Could not create temporary directory: %s"
+#~ msgstr "Nelze vytvořit dočasný adresář: %s"
+
+#~ msgid "%d new"
+#~ msgstr "nové %d"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "%d hidden"
+#~ msgstr "skryté %d"
+
+#~ msgid "%d visible"
+#~ msgstr "viditelné %d"
+
+#~ msgid "%d selected"
+#~ msgstr "vybráno %d"
+
+#~ msgid "%d unsent"
+#~ msgstr "neodesláno %d"
+
+#~ msgid "%d sent"
+#~ msgstr "odesláno %d"
+
+#~ msgid "%d total"
+#~ msgstr "celkem %d"
+
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "Vytvořit _virtuální složku z vyhledávání..."
+
+#~ msgid "VFolder on _Subject"
+#~ msgstr "V-složka podle _předmětu"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "V-složka podle _odesílatele"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "V-složka podle příje_mců"
+
+#~ msgid "VFolder on Mailing _List"
+#~ msgstr "V-složka podle poštovní _konference"
+
+#~ msgid "Filter on Sub_ject"
+#~ msgstr "Filtr podle _předmětu"
+
+#~ msgid "Filter on Sen_der"
+#~ msgstr "Filtr podle _odesílatele"
+
+#~ msgid "Filter on Re_cipients"
+#~ msgstr "Filtr podle příje_mců"
+
+#~ msgid "Filter on _Mailing List"
+#~ msgstr "Filtr podle poštovní _konference"
+
+#~ msgid "_Edit as New Message..."
+#~ msgstr "_Upravit jako novou zprávu..."
+
+#~ msgid "_Print"
+#~ msgstr "_Tisknout"
+
+#~ msgid "_Forward"
+#~ msgstr "_Přeposlat"
+
+#~ msgid "Follo_w Up..."
+#~ msgstr "Follo_w Up..."
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "Označit jako _dokončeno"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Vymazat _značky"
+
+#~ msgid "Mark as _Unread"
+#~ msgstr "Označit jako _nepřečtené"
+
+#~ msgid "Mark as _Important"
+#~ msgstr "Označit jako _důležité"
+
+#~ msgid "_Mark as Unimportant"
+#~ msgstr "_Označit jako nedůležité"
+
+#~ msgid "U_ndelete"
+#~ msgstr "Obnovit _smazané"
+
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "Pře_sunout do složky..."
+
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Přidat odesílatele do _adresáře"
+
+#~ msgid "Appl_y Filters"
+#~ msgstr "Použít _filtry"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Vy_tvořit pravidlo ze zprávy"
+
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "V-složku podle _poštovní konference"
+
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Filtr podle poštovní ko_nference (%s)"
+
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "V-složku podle poštovní _konference (%s)"
+
+#~ msgid "Don't show this message again."
+#~ msgstr "Příště tuto zprávu nezobrazovat."
+
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "Nemáte nastaveného poštovního klienta.\n"
+#~ "To je nutné udělat před tím, než budete\n"
+#~ "posílat, přijímat nebo psát poštu.\n"
+#~ "Chcete ho nastavit nyní?"
+
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Než začnete psát zprávu,\n"
+#~ "musíte nastavit identitu."
+
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Než začnete psát zprávu,\n"
+#~ "musíte nastavit způsob přenosu."
+
+#~ msgid ""
+#~ "You are sending an HTML-formatted message. Please make sure that\n"
+#~ "the following recipients are willing and able to receive HTML mail:\n"
+#~ msgstr ""
+#~ "Posíláte zprávu ve formátu HTML. Ujistěte se, že následující příjemci\n"
+#~ "si přejí a mohou dostávat zprávy ve formátu HTML:\n"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Přesto poslat?"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Tato zpráva nemá předmět.\n"
+#~ "Opravdu ji chcete poslat?"
+
+#~ msgid ""
+#~ "Since the contact list you are sending to is configured to hide the "
+#~ "list's addresses, this message will contain only Bcc recipients."
+#~ msgstr ""
+#~ "Protože je seznam kontaktů, na který posíláte zprávu, nastavený tak, aby "
+#~ "skrýval adresy, tato zpráva bude obsahovat pouze adresáty ve skryté kopii."
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "Tato zpráva je určena pouze skrytým příjemcům."
+
+#~ msgid ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "Je možné, že poštovní server zveřejní seznam adresátů přidáním hlavičky "
+#~ "Apparently-To.\n"
+#~ "Přesto poslat?"
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "Aby mohla být tato zpráva odeslána, je nutné určit příjemce."
+
+#~ msgid ""
+#~ "Unable to open the drafts folder for this account.\n"
+#~ "Would you like to use the default drafts folder?"
+#~ msgstr ""
+#~ "Není možné otevřít složku konceptů pro tento účet.\n"
+#~ "Chcete použít výchozí složku konceptů?"
+
+#~ msgid "an unknown sender"
+#~ msgstr "neznámý odesílatel"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+#~ msgstr "V %a, %d. %m. %Y v %H:%M, %%s píše:"
+
+#~ msgid "Move message(s) to"
+#~ msgstr "Přesunout zprávu(y) do"
+
+#~ msgid "Copy message(s) to"
+#~ msgstr "Kopírovat zprávu(y) do"
+
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "Opravdu chcete upravit všechny zprávy (%d)?"
+
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Upravovat můžete pouze zprávy uložené\n"
+#~ "ve složce Koncepty."
+
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Pouze zprávy ze složky Odeslané je možné\n"
+#~ "znovu poslat."
+
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr "Opravdu chcete přeposlat všechny zprávy (%d)?"
+
+#~ msgid "No Message Selected"
+#~ msgstr "Žádná vybraná zpráva"
+
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Nelze uložit do `%s'\n"
+#~ " %s"
+
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "`%s' již existuje.\n"
+#~ "Chcete jej přepsat?"
+
+#~ msgid "Save Message As..."
+#~ msgstr "Uložit zprávu jako..."
+
+#~ msgid "Save Messages As..."
+#~ msgstr "Uložit zprávy jako..."
+
+#~ msgid ""
+#~ "This operation will permanently erase all messages marked as\n"
+#~ "deleted. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "Tato operace trvale vymaže všechny zprávy označené jako smazané.\n"
+#~ "Pokud budete pokračovat, nebude už možné tyto zprávy obnovit.\n"
+#~ "\n"
+#~ "Opravdu vymazat tyto zprávy?"
+
+#~ msgid ""
+#~ "Error loading filter information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Chyba při načítání informací o filtrech:\n"
+#~ "%s"
+
+#~ msgid "Filters"
+#~ msgstr "Filtry"
+
+#~ msgid "Page %d of %d"
+#~ msgstr "Stránka %d z %d"
+
+#~ msgid "Print Message"
+#~ msgstr "Tisknout zprávu"
+
+#~ msgid "Printing of message failed"
+#~ msgstr "Tisk zprávy selhal"
+
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr "Opravdu chcete otevřít všechny zprávy (%d) v samostatných oknech?"
+
+#~ msgid "Could not create a S/MIME signature context."
+#~ msgstr "Nepodařilo se vytvořit kontext podpisu S/MIME."
+
+#~ msgid "Could not create a S/MIME certsonly context."
+#~ msgstr "Nepodařilo se vytvořit kontext certsonly S/MIME."
+
+#~ msgid "Could not create a S/MIME encryption context."
+#~ msgstr "Nepodařilo se vytvořit kontext zašifrovaní S/MIME."
+
+#~ msgid "Could not create a S/MIME envelope context."
+#~ msgstr "Nepodařilo se vytvořit kontext obálky S/MIME."
+
+#~ msgid "Could not create a S/MIME decode context."
+#~ msgstr "Nepodařilo se vytvořit kontext dekódování S/MIME."
+
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Soubor `%s' již existuje.\n"
+#~ "Přepsat jej?"
+
+#~ msgid "Save Attachment"
+#~ msgstr "Uložit přílohu"
+
+#~ msgid "Could not create temporary file '%s': %s"
+#~ msgstr "Nelze vytvořit dočasný soubor '%s': %s"
+
+#~ msgid "Save Attachment..."
+#~ msgstr "Uložit přílohu..."
+
+#~ msgid "View Inline"
+#~ msgstr "Zobrazit v textu"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Otevřít v %s..."
+
+#~ msgid "View Inline (via %s)"
+#~ msgstr "Zobrazit v textu (pomocí %s)"
+
+#~ msgid "Hide"
+#~ msgstr "Skrýt"
+
+#~ msgid "External Viewer"
+#~ msgstr "Externí prohlížeč"
+
+#~ msgid "Downloading images"
+#~ msgstr "Stahování obrázků"
+
+#~ msgid "Loading message content"
+#~ msgstr "Načítání obsahu zprávy"
+
+#~ msgid "Overdue:"
+#~ msgstr "Úkoly po termínu:"
+
+#~ msgid "by %B %d, %Y, %l:%M %P"
+#~ msgstr "do %B %d, %Y, %l:%M %P"
+
+#~ msgid "Open Link in Browser"
+#~ msgstr "Otevřít odkaz v prohlížeči"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "Kopírovat umístění odkazu"
+
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Uložit odkaz jako"
+
+#~ msgid "Save Image as..."
+#~ msgstr "Uložit obrázek jako..."
+
+#~ msgid "%s attachment"
+#~ msgstr "%s příloha"
+
+#~ msgid "Could not parse MIME message. Displaying as source."
+#~ msgstr "Není možné zpracovat zprávu MIME. Zobrazí se jako zdrojový kód."
+
+#~ msgid "Bad Address"
+#~ msgstr "Špatná adresa"
+
+#~ msgid "Reply-To"
+#~ msgstr "Odpovědět-komu"
+
+#~ msgid "Cc"
+#~ msgstr "Kopie"
+
+#~ msgid "Bcc"
+#~ msgstr "Skrytá kopie"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Tato zpráva je digitálně podepsaná. Kliknutím na ikonu zámku získáte "
+#~ "podrobnosti."
+
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "Nepodařilo se vytvořit kontext ověření PGP."
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr "Tato zpráva je digitálně podepsaná a byla shledána platnou."
+
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr "Tato zpráva je digitálně podepsaná, ale nelze ověřit její platnost."
+
+#~ msgid "Pointer to FTP site (%s)"
+#~ msgstr "Odkaz na FTP server (%s)"
+
+#~ msgid "Pointer to local file (%s) valid at site \"%s\""
+#~ msgstr "Odkaz na lokální soubor (%s) platný na serveru \"%s\""
+
+#~ msgid "Pointer to local file (%s)"
+#~ msgstr "Odkaz na lokální soubor (%s)"
+
+#~ msgid "Pointer to remote data (%s)"
+#~ msgstr "Odkaz na vzdálená data (%s)"
+
+#~ msgid "Pointer to unknown external data (\"%s\" type)"
+#~ msgstr "Odkaz na neznámá externí data (typ \"%s\")"
+
+#~ msgid "Malformed external-body part."
+#~ msgstr "Chybná část externího těla."
+
+#~ msgid "However, the message was successfully sent."
+#~ msgstr "Zpráva byla ale úspěšně odeslána."
+
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Nepojmenovaná zpráva)"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Nepojmenovaná zpráva"
+
+#~ msgid "Empty Message"
+#~ msgstr "Prázdná zpráva"
+
+#~ msgid "Find in Message"
+#~ msgstr "Hledat ve zprávě"
+
+#~ msgid "Case Sensitive"
+#~ msgstr "Rozlišovat malá/velká"
+
+#~ msgid "Search Forward"
+#~ msgstr "Hledat dopředu"
+
+#~ msgid "Find:"
+#~ msgstr "Hledat:"
+
+#~ msgid "Matches:"
+#~ msgstr "Odpovídá:"
+
+#~ msgid "Forwarded Message"
+#~ msgstr "Přeposlaná zpráva"
+
+#~ msgid "(No subject)"
+#~ msgstr "(Bez předmětu)"
+
+#~ msgid "%s - Message"
+#~ msgstr "%s - zpráva"
+
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "Prochází se složky pod %s na \"%s\""
+
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "Prochází se kořenové složky na \"%s\""
+
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "Přihlašuji si složku \"%s\""
+
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "Odhlašuji se ze složky \"%s\""
+
+#~ msgid "No server has been selected"
+#~ msgstr "Nebyl vybrán žádný server"
+
+#~ msgid "Please select a server."
+#~ msgstr "Vyberte prosím server."
+
+#~ msgid "Scanning folders ..."
+#~ msgstr "Zkoumám složky..."
+
+#~ msgid "Save As..."
+#~ msgstr "Uložit jako..."
+
+#~ msgid "Information"
+#~ msgstr "Předformátované"
+
+#~ msgid "Question"
+#~ msgstr "Otázka"
+
+#~ msgid "Message"
+#~ msgstr "Zpráva"
+
 #~ msgid "Search"
 #~ msgstr "Hledat"
diff --git a/po/da.po b/po/da.po
index 8d9ac0d00d..d0b0c96bec 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2003-06-25 13:24-0400\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2003-02-02 12:41+0100\n"
 "Last-Translator: Søren Boll Overgaard <boll@debian.org>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -20,64 +20,191 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Evolution LDIF-importerer"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP-dataudvækslingsformat (.ldif)"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Evolution VCard-importerer"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Evolutions VCard-importerer"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
-
-#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Gem som"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Fulde navn"
+
 #: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Navn"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Adresse"
+
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Adresseetikette"
+
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Telefon"
+
 #: addressbook/backend/ebook/e-card.c:1347
+#: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr "Primær"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Fødselsdato"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "Pri"
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Organisationsenhed"
+
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Kontor"
+
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Titel"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rolle"
+
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Leder"
 
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Kaldenavn"
+
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Ægtefælle"
+
+#: addressbook/backend/ebook/e-card.c:1430
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniversary"
+msgstr "Bryllupsdag"
+
+#: addressbook/backend/ebook/e-card.c:1436
+msgid "Mailer"
+msgstr "E-postprogram"
+
+#: addressbook/backend/ebook/e-card.c:1443
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr "Kalender URI"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "Ledig/Optaget-URL"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "ICS-kalender"
+
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Kommentar"
+
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Beslægtede kontakter"
+
+#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorier"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Kategoriliste"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Ønsker HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Vil have HTML valgt"
+
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
+msgid "List"
+msgstr "Liste"
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Vis visningsadresser"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Tilfældig"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Seneste anvendelse"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Anvend point"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
+msgstr "Primær"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr "Pri"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -112,12 +239,6 @@ msgid "Home"
 msgstr "Hjemme"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
@@ -236,21 +357,9 @@ msgid "Dep"
 msgstr "Afd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Ktr"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Titel"
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -261,12 +370,6 @@ msgid "Prof"
 msgstr "Prof."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Leder"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Leder"
 
@@ -275,32 +378,9 @@ msgid "Ass"
 msgstr "Ass."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Kaldenavn"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Kaldt"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Ægtefælle"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Kommentar"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr "Kalender URI"
-
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CALUri"
@@ -323,11 +403,6 @@ msgid "icsCalendar"
 msgstr "icsKalender"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr "Bryllupsdag"
-
-#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Br.dag"
 
@@ -335,12 +410,6 @@ msgstr "Br.dag"
 msgid "Birth Date"
 msgstr "Fødselsdato"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorier"
-
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Efternavn"
@@ -355,105 +424,29 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-destination.c:709
 msgid "Unnamed List"
 msgstr "Navnløs liste"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Fulde navn"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Adresse"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Adresseetikette"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Fødselsdato"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Organisationsenhed"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolle"
-
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
-msgid "Mailer"
-msgstr "E-postprogram"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Ledig/Optaget-URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "ICS-kalender"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Beslægtede kontakter"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Kategoriliste"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Ønsker HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Vil have HTML valgt"
-
-#: addressbook/backend/ebook/e-card.c:1506
-msgid "List"
-msgstr "Liste"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Vis visningsadresser"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Tilfældig"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Evolution LDIF-importerer"
 
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "ID"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP-dataudvækslingsformat (.ldif)"
 
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Seneste anvendelse"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Evolution VCard-importerer"
 
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Anvend point"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Evolutions VCard-importerer"
 
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:171
-msgid "Could not initialize Bonobo"
-msgstr "Kunne ikke initialisere Bonobo"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -510,14 +503,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook ikke indlæst\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat-server"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
@@ -526,137 +519,6 @@ msgstr "Kunne ikke starte wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke læse pilotens adresseapplikationsblok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Konfigurer adgang til LDAP-katalogservere her"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Katalogservere"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution adressebog - LDAP-opsætningsstyring"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebog - adresse-pop-op"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebog - adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebog - kortvisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Evolutions adressebogskomponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adressebog - mappevisning"
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:620
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Mappe som indeholder kontaktinformation"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP-server"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "LDAP-server som indeholder kontaktinformation"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Offentlige kontakter"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Offentlig folder som indeholder kontaktinformation"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "New Contact"
-msgstr "Ny kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:575
-msgid "Create a new contact"
-msgstr "Opret en ny kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
-msgstr "Ny kontaktliste"
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "Contact _List"
-msgstr "Kontakt_liste"
-
-#: addressbook/gui/component/addressbook-component.c:579
-msgid "Create a new contact list"
-msgstr "Opret en ny kontaktliste"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Tilslutning til LDAP-serveren mislykkedes"
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Mislykkedes med godkendelse på LDAP-server"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Kunne ikke gennemføre forespørgsel på rod-DSE"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "Serveren svarede at ingen søgebaser understøttes"
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Fejl ved hentning af schemainformation"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "Serveren svarede ikke med gyldig schemainformation"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Kontonavn"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Servernavn"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP understøttes ikke i denne udgave af Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -785,6 +647,101 @@ msgstr "Enhver kategori"
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappe-skimmeren vil vise"
 
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:628
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Mappe som indeholder kontaktinformation"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP-server"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "LDAP-server som indeholder kontaktinformation"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Offentlige kontakter"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Offentlig folder som indeholder kontaktinformation"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "Create a new contact"
+msgstr "Opret en ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "Contact _List"
+msgstr "Kontakt_liste"
+
+#: addressbook/gui/component/addressbook-component.c:587
+msgid "Create a new contact list"
+msgstr "Opret en ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Tilslutning til LDAP-serveren mislykkedes"
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Mislykkedes med godkendelse på LDAP-server"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Kunne ikke gennemføre forespørgsel på rod-DSE"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "Serveren svarede at ingen søgebaser understøttes"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Fejl ved hentning af schemainformation"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Serveren svarede ikke med gyldig schemainformation"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Kontonavn"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Servernavn"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP understøttes ikke i denne udgave af Evolution"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Andre kontakter"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -813,33 +770,69 @@ msgstr "Opret en ny kontakt \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Tilføj adresse for eksisterende kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:914
+#: addressbook/gui/component/e-address-popup.c:917
 msgid "Querying Addressbook..."
 msgstr "Kører forespørgsel i adressebog..."
 
-#: addressbook/gui/component/e-address-popup.c:998
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-popup.c:1001
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr "Redigér kontaktinfo"
 
-#: addressbook/gui/component/e-address-popup.c:1028
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Tilføj i kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:1053
+#: addressbook/gui/component/e-address-popup.c:1056
 msgid "Merge E-Mail Address"
 msgstr "Flet e-postadresse"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Disable Queries"
 msgstr "Deaktivér forespørgsler"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktivér forespørgsler (farligt!)"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Konfigurer adgang til LDAP-katalogservere her"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Katalogservere"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution adressebog - LDAP-opsætningsstyring"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebog - adresse-pop-op"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebog - adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebog - kortvisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Evolutions adressebogskomponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adressebog - mappevisning"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -987,10 +980,9 @@ msgstr "Én"
 msgid "S_earch scope: "
 msgstr "S_øgningsomfang: "
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1256
+#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr "Søger..."
 
@@ -1228,11 +1220,11 @@ msgstr "_Nedhæntningsgrænse:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "R_edigér"
 
@@ -1272,20 +1264,24 @@ msgstr "generel-faneblad"
 msgid "searching-tab"
 msgstr "søgefaneblad"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution adressebog - navnevalgsgrænseflade"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Vælg kontakter fra adressebogen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Fjern alle"
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Søg kontakt i"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Fjern"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Fjern alle"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Vis kontaktliste"
@@ -1308,13 +1304,9 @@ msgstr "Kontakt uden navn:"
 msgid "Source"
 msgstr "Kilde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Vælg kontakter fra adressebogen"
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Søg kontakt i"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution adressebog - navnevalgsgrænseflade"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1390,7 +1382,7 @@ msgid "D_epartment:"
 msgstr "Af_deling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:197
+#: calendar/gui/dialogs/task-editor.c:200
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1461,11 +1453,13 @@ msgid "_Categories..."
 msgstr "Ka_tegorier..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
-#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -1510,15 +1504,15 @@ msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
+#: addressbook/gui/widgets/e-minicard.c:183
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2549,17 +2543,17 @@ msgstr "Zimbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 msgid "Book"
 msgstr "Bog"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
+#: addressbook/gui/widgets/e-minicard-widget.c:93
 msgid "Card"
 msgstr "Kort"
 
@@ -2787,7 +2781,7 @@ msgstr "Er ny liste"
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 msgid "Save List as VCard"
 msgstr "Gem liste som VCard"
 
@@ -2833,7 +2827,7 @@ msgstr ""
 "eksisterer allerede i denne mappe. Vil du tilføje den alligevel?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Avanceret søgning"
@@ -2852,10 +2846,10 @@ msgid "%d cards"
 msgstr "%d kort"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 msgid "Query"
 msgstr "Forespørgsel"
 
@@ -2863,113 +2857,113 @@ msgstr "Forespørgsel"
 msgid "Error getting book view"
 msgstr "Fejl ved bogvisning"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 msgid "Model"
 msgstr "Model"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Fejl ved ændring af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr "Succes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1210
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Tilgang nægtet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card not found"
 msgstr "Kort ikke fundet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke understøttet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:785
-#: camel/camel-service.c:875 camel/camel-service.c:917
-#: camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
+#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Failed"
 msgstr "Godkendelse mislykkedes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Authentication Required"
 msgstr "Godkendelse kræves"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgængelig"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Addressbook does not exist"
 msgstr "Adressbogen findes ikke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 msgid "Other error"
 msgstr "Anden fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr "Vil du gemme ændringene?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error adding list"
 msgstr "Fejl ved tilføjelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 msgid "Error adding card"
 msgstr "Fejl ved tilføjelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 msgid "Error modifying list"
 msgstr "Fejl ved ændring af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 msgid "Error removing card"
 msgstr "Fejl ved fjernelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2978,132 +2972,131 @@ msgstr ""
 "At åbna %d kort vil yderligere åbne %d nye vinduer.\n"
 "Ønsker du virkelig at vise alle disse kort?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 msgid "Move card to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 msgid "Copy card to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 msgid "Move cards to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 msgid "Copy cards to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.c:398
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adressebog"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-#: addressbook/gui/widgets/e-addressbook-view.c:895
-#: addressbook/gui/widgets/e-addressbook-view.c:1879
+#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1883
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gem som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Go to Folder..."
 msgstr "Gå til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Import..."
 msgstr "Importér..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Search for Contacts..."
 msgstr "Søg efter kontakter..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Addressbook Sources..."
 msgstr "Adressbogskilder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Pilot Settings..."
 msgstr "Pilotindstillinger..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Send Message to Contact"
 msgstr "Send besked til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Udskriv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Print Envelope"
 msgstr "Udskriv konvolut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 msgid "Copy to folder..."
 msgstr "Kopiér til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 msgid "Move to folder..."
 msgstr "Flyt til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:912
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klip ud"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Indsæt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Slet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: calendar/gui/e-cal-view.c:1109
 msgid "Current View"
 msgstr "Aktuel visning"
 
@@ -3113,7 +3106,7 @@ msgstr "Aktuel visning"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:949
+#: addressbook/gui/widgets/e-addressbook-view.c:953
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 
@@ -3121,11 +3114,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:954
+#: addressbook/gui/widgets/e-addressbook-view.c:958
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1352
+#: addressbook/gui/widgets/e-addressbook-view.c:1356
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3196,6 +3189,29 @@ msgstr "Anden telefon"
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
+#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "Bredde"
+
+#: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "Højde"
+
+#: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr "Har fokus"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Valgt"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Har markør"
+
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3209,21 +3225,6 @@ msgstr "og ét andet kort."
 msgid "Save in addressbook"
 msgstr "Gem i adressebog"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:146
-msgid "Width"
-msgstr "Bredde"
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:153
-msgid "Height"
-msgstr "Højde"
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:161
-msgid "Has Focus"
-msgstr "Har fokus"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Felt"
@@ -3240,10 +3241,6 @@ msgstr "Tekstmodel"
 msgid "Max field name length"
 msgstr "Maksimal feltnavnslængde"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr "Kolonnebredde"
-
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3272,13 +3269,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Valgt"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Har markør"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr "Kolonnebredde"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3288,20 +3281,20 @@ msgstr "Kortvisning"
 msgid "GTK Tree View"
 msgstr "GTK-trævisning"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Udskriv konvolut"
-
-#: addressbook/printing/e-contact-print.c:1139
+#: addressbook/printing/e-contact-print.c:1158
 msgid "Print cards"
 msgstr "Udskriv kort"
 
-#: addressbook/printing/e-contact-print.c:1204
-#: addressbook/printing/e-contact-print.c:1226
+#: addressbook/printing/e-contact-print.c:1224
+#: addressbook/printing/e-contact-print.c:1250
 msgid "Print card"
 msgstr "Udskriv kort"
 
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Udskriv konvolut"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3471,6 +3464,63 @@ msgstr "Bredde:"
 msgid "_Font..."
 msgstr "Skri_fttype..."
 
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "med alle lokale og aktive eksterne mapper"
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "kort"
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Intern fejl"
+
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Unavngivet aftale"
@@ -3600,28 +3650,30 @@ msgid "31st"
 msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:912
 msgid "High"
 msgstr "Høj"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
+#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:910
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr "Udefineret"
 
@@ -3629,13 +3681,13 @@ msgstr "Udefineret"
 msgid "Split Multi-Day Events:"
 msgstr "Dél flerdagshændelser:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr "Fejl under kommunikation med kalenderserveren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke læse pilotens kalender-programblok"
 
@@ -3643,75 +3695,33 @@ msgstr "Kunne ikke læse pilotens kalender-programblok"
 msgid "Default Priority:"
 msgstr "Standardprioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke læse pilotens programblok for opgaveliste"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender og opgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og opgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolution kalender-og-opgaver-komponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalender-opsætnings-styringselement"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalendertilrettelægnings-beskedvisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalendervisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender/opgave-redigering"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution opgavevisning"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalenderalarmbekendgørelsestjeneste"
-
 # Konteksten er planlægning af opgaver. Dette er tidspunktet for begyndelsen
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Begynder:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Slutter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr "Ugyldig tidsangivelse"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 msgid "Evolution Alarm"
 msgstr "Evolutionalarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarmer %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Luk"
 
@@ -3727,16 +3737,25 @@ msgstr "Udsæt-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_edigér aftale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgængelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3748,7 +3767,7 @@ msgstr ""
 "at sende e-post. Evolution vil vise en normal dialog\n"
 "for påmindelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3765,71 +3784,86 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil køre dette program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 msgid "Do not ask me about this program again."
 msgstr "Spørg mig ikke om dette program igen."
 
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution kalenderalarmbekendgørelsestjeneste"
+
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize Bonobo"
+msgstr "Kunne ikke initialisere Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:176
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
+#: calendar/gui/alarm-notify/notify-main.c:185
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Sammendrag indeholder"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Beskrivelse indeholder"
+#: calendar/gui/calendar-commands.c:376
+#, fuzzy
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Denne handling vil permanent fjerne alle opgaver markeret som udførte Hvis "
+"du fortsætter vil du ikke længere kunne tilvejebringe disse opgaver.\n"
+"\n"
+"Vil du virkelig fjerne disse opgaver?"
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentar indeholder"
+#: calendar/gui/calendar-commands.c:382
+#, fuzzy
+msgid "Purge events older than"
+msgstr "returnerer mindre end"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
-msgid "Unmatched"
-msgstr "Ingen træffere"
+#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "dage"
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A den %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
+#: calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d. %b"
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:518
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:849
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunne ikke oprette kalendervisning. Kontrollér venligs din konfiguration af "
 "ORBit og OAF."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3848,11 +3882,11 @@ msgstr "Offentlig kalender"
 msgid "Public folder containing appointments and events"
 msgstr "Offentlig mappe som indeholder mødelser og hændelser"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Opgaver"
@@ -3917,107 +3951,6 @@ msgstr "Hel_dagsmøde"
 msgid "Create a new all-day appointment"
 msgstr "Opret et nyt heldagsmøde"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Fortroligt"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Offentlig"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "Ø"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr "Ledig"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1204
-msgid "Busy"
-msgstr "Optaget"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr "Ikke startet"
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr "I gang"
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr "Fuldført"
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiske positionen skal skrives ind på formatet: \n"
-"\n"
-"45.436845,125.862501"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
-#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
-msgstr "Ingen"
-
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr "Genindtræffer"
-
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr "Tildelt"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
-msgstr "Ja"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
-msgstr "Nej"
-
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Dagvisning"
@@ -4034,48 +3967,69 @@ msgstr "Ugevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Tilrettet visning"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Sammendrag indeholder"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Beskrivelse indeholder"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentar indeholder"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
+msgid "Unmatched"
+msgstr "Ingen træffere"
+
+#: calendar/gui/comp-editor-factory.c:462
 msgid "Error while opening the calendar"
 msgstr "Fejl under åbning af kalender"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr "Metode ikke understøttet under åbning af kalenderen"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 msgid "Permission denied to open the calendar"
 msgstr "Du har ikke rettigheder til at åbne kalenderen"
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:125
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Kunne ikke åbne mappen i \"%s\""
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr "Typen af visning der skal bruges"
 
-#: calendar/gui/dialogs/alarm-options.c:420
+#: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Valgmuligheder for lyd-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:429
+#: calendar/gui/dialogs/alarm-options.c:475
 msgid "Message Alarm Options"
 msgstr "Valgmuligheder for beskedsalarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:438
+#: calendar/gui/dialogs/alarm-options.c:484
 msgid "Email Alarm Options"
 msgstr "Valgmuligheder for e-post-alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:447
+#: calendar/gui/dialogs/alarm-options.c:493
 msgid "Program Alarm Options"
 msgstr "Valgmuligheder for program-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:456
+#: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
 msgstr "Valgmuligheder for ukendte alarmer"
 
@@ -4111,10 +4065,6 @@ msgstr "Send-til:"
 msgid "With these arguments:"
 msgstr "Med disse argumenter:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "dage"
-
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr "dialog1"
@@ -4127,7 +4077,8 @@ msgstr "ekstra gange hver"
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minutter"
 
@@ -4141,11 +4092,11 @@ msgstr "Basis"
 msgid "Date/Time:"
 msgstr "Dato/klokke:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr "Vis en besked"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr "Afspil en lyd"
 
@@ -4153,7 +4104,7 @@ msgstr "Afspil en lyd"
 msgid "Reminders"
 msgstr "Påmindelser"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr "Kør et program"
 
@@ -4163,7 +4114,8 @@ msgstr "Send et e-brev"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -4246,7 +4198,7 @@ msgstr "Dage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr "Fredag"
 
@@ -4260,7 +4212,7 @@ msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr "Mandag"
 
@@ -4270,7 +4222,7 @@ msgstr "_søn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -4284,7 +4236,7 @@ msgstr "Vis uge_nummer i datonavigation"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -4302,7 +4254,7 @@ msgstr "Opgaveliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4320,7 +4272,7 @@ msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -4330,12 +4282,12 @@ msgstr "_Ugen begynder:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr "Arbejdsuge"
 
@@ -4445,79 +4397,54 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker på, at du vil aflyse og slette denne journalopføring?"
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Denne hændelse er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Denne opgave er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Denne journalopføring er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen "
 "lukkes?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har ikke lavet ændringer. Skal redigeringen lukkes?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Denne hændelse er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Denne opgave er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Denne journalopføring er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen "
 "opdateres?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort ændringer. Opdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideringsfejl: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
-msgid " to "
-msgstr " til "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
-msgid " (Completed "
-msgstr " (Fuldført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
-msgid "Completed "
-msgstr "Fuldført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
-msgid " (Due "
-msgstr " (Færdig "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
-msgid "Due "
-msgstr "Færdig "
-
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "Kunne ikke opdatera ugyldigt objekt"
@@ -4563,24 +4490,50 @@ msgid "No summary"
 msgstr "Ingen sammendrag"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
-#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/dialogs/comp-editor.c:1406
-#: calendar/gui/dialogs/comp-editor.c:1432
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ændringer i dette objekt kan bliver muligvis ignoreret hvis en opdatering "
 "ankommer via e-post"
 
-#: calendar/gui/dialogs/comp-editor.c:1459
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versionsdata!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfejl: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
+msgid " to "
+msgstr " til "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
+msgid " (Completed "
+msgstr " (Fuldført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
+msgid "Completed "
+msgstr "Fuldført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
+msgid " (Due "
+msgstr " (Færdig "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
+msgid "Due "
+msgstr "Færdig "
+
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4684,31 +4637,31 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
 msgid "Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Påmindelse"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Genindtræffelse"
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Mødeplanlægning"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Møde"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
 msgid "Start date is wrong"
 msgstr "Startdatoen er forkert"
 
@@ -4744,9 +4697,9 @@ msgid "Classification"
 msgstr "Klassificering"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Kon_fidensiel"
+#, fuzzy
+msgid "Co_nfidential"
+msgstr "Fortroligt"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4772,7 +4725,6 @@ msgid "Pu_blic"
 msgstr "Of_fentlig"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Vis tid som"
 
@@ -4789,74 +4741,34 @@ msgstr "S_lut-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr "Ingen"
+
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr "Den valgte organisator har ikke længere en konto."
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "En organisator er påkrævet."
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er nødvendig"
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr "Denne person er allerede sat op til dette møde!"
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:630
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Deltager"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Klik her for at tilføje en deltager"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Normalt navn"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegeret fra"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegeret til"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Sprog"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Medlem"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "SU"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Status"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4867,7 +4779,7 @@ msgid "_Change Organizer"
 msgstr "Æn_dr organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Invitér andre..."
 
@@ -5019,7 +4931,7 @@ msgstr ""
 "\n"
 "Vil du gemme ændringene?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr "_Forkast ændringer"
 
@@ -5044,52 +4956,82 @@ msgstr "Opgaveinformationen er genereret. Send den?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Opgaveinformationen er ændret. Send en opdateret version?"
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 msgid "Completed date is wrong"
 msgstr "Udførelsesdatoen er forkert"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#, fuzzy, no-c-format
+msgid "% _Complete"
 msgstr "% færdig"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
-msgstr "Dato for fuldførelse:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311
+msgid "Completed"
+msgstr "Fuldført"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
+msgid "In Progress"
+msgstr "I gang"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305
+msgid "Not Started"
+msgstr "Ikke startet"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Fremgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Date Completed:"
+msgstr "Dato for fuldførelse:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "_Hjemmeside-adresse:"
+
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Grundlæggende"
 
-#: calendar/gui/dialogs/task-editor.c:204
-#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:480
+#: calendar/gui/dialogs/task-page.c:482
 msgid "Due date is wrong"
 msgstr "Forfaldsdatoen er forkert"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.c:542
+msgid "Due date is before start date!"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "Kon_fidensiel"
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Beskrivelse:"
@@ -5102,223 +5044,259 @@ msgstr "Sta_rt dato:"
 msgid "_Due Date:"
 msgstr "Fær_dig-dato:"
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr "%d dage"
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr "%d uger"
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr "1 uge"
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr "%d timer"
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr "1 time"
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutter"
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr "1 minut"
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr "Send en besked"
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr "Ukendt handling som skal udføres"
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s før aftalen starter"
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s efter aftalen er startet"
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved aftalens start"
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s før aftalen slutter"
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s efter aftalens slutning"
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved aftalens slutning"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukendt udløsertype"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
+msgid "Public"
+msgstr "Offentlig"
+
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
+msgid "Confidential"
+msgstr "Fortroligt"
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1933
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Ledig"
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:393
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Optaget"
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
-#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Åbn"
 
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Save as..."
-msgstr "_Gem som..."
+#: calendar/gui/e-calendar-table.c:989
+#, fuzzy
+msgid "Open _Web Page"
+msgstr "_Åbn besked"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Save As..."
+msgstr "Gem _som..."
+
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
+#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ud..."
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
-#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klip _ud"
 
-#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
+#: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopiér"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
-#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
+#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Indsæt"
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Assign Task"
 msgstr "_Tildel opgave"
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Mark as Complete"
 msgstr "_Markér som fuldført"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markér valgte opgaver som komplette"
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
-#: calendar/gui/e-week-view.c:4335
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik for at tilføje en opgave"
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% færdig"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr "Fuldført"
 
@@ -5327,12 +5305,13 @@ msgid "Completion Date"
 msgstr "Fuldført dato"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr "Færdig-dato"
+#, fuzzy
+msgid "Description"
+msgstr "Beskrivelse:"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
-msgstr "Slutdato"
+msgid "Due Date"
+msgstr "Færdig-dato"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
@@ -5342,242 +5321,299 @@ msgstr "Geografisk placering"
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Status"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Opgavesortering"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %Y-%m-%d %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+msgid "color"
+msgstr "farve"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m-%Y %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:20
+#, fuzzy
+msgid "component"
+msgstr "Aftale"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Datoen skal skrives ind på formatet: \n"
-"\n"
-"%s"
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Ukendt"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters opdeling"
+#: calendar/gui/e-cal-model.c:828
+msgid "Recurring"
+msgstr "Genindtræffer"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
-msgid "%A %d %B"
-msgstr "%A %d %B"
+#: calendar/gui/e-cal-model.c:830
+msgid "Assigned"
+msgstr "Tildelt"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "Yes"
+msgstr "Ja"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr " "
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "No"
+msgstr "Nej"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr " "
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr "Ø"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:550
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Den geografiske positionen skal skrives ind på formatet: \n"
+"\n"
+"45.436845,125.862501"
 
-#: calendar/gui/e-day-view.c:3694
-msgid "New _Appointment"
-msgstr "Ny _aftale"
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+msgid "New _Appointment..."
+msgstr "Ny _aftale..."
 
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
 msgid "New Meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Udskriv..."
-
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
+#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
-#: ui/evolution-calendar.xml.h:34
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
+#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Indstillinger..."
 
-#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
-#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr "Gem _som..."
-
-#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
+#: calendar/gui/e-cal-view.c:1139
 msgid "_Schedule Meeting..."
 msgstr "_Book møde..."
 
-#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
+#: calendar/gui/e-cal-view.c:1140
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
+#: calendar/gui/e-cal-view.c:1145
 msgid "Make this Occurrence _Movable"
 msgstr "Gør denne hændelse _flytbar"
 
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _hændelse"
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle hændelser"
 
-#: calendar/gui/e-itip-control.c:706
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %Y-%m-%d %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m-%Y %H:%M:%S"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Datoen skal skrives ind på formatet: \n"
+"\n"
+"%s"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr " "
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr " "
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
+msgid "%A %d %B"
+msgstr "%A %d %B"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutters opdeling"
+
+#: calendar/gui/e-itip-control.c:676
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (Kompleks genindtræffelse)"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 msgid "Every day"
 msgstr "Hver dag"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, c-format
 msgid "Every %d days"
 msgstr "Hver %d. dag"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 msgid "Every week"
 msgstr "Hver uge"
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, c-format
 msgid "Every %d weeks"
 msgstr "Hver %d. uge"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 msgid "Every week on "
 msgstr "Hver uge på "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Hver %d uge på "
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s. dag af "
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s af "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 msgid "every month"
 msgstr "hver månede"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 msgid "Every year"
 msgstr "Hver år"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr "Hver %d. år"
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr " i alt %d gange"
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ", sluttende på "
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr "<b>Begynder:</b>"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 msgid "<b>Ends:</b> "
 msgstr "<b>Slutter:<b>"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Completed:</b> "
 msgstr "<b>Færdig:</b> "
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Due:</b> "
 msgstr "<b>Udføres inden:</b> "
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 msgid "iCalendar Error"
 msgstr "iCalendar-fejl"
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 msgid "An unknown person"
 msgstr "en ukendt afsender"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1005
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5585,339 +5621,333 @@ msgstr ""
 "<br>Kontrollér venligst følgende information og vælg så en handling fra "
 "menuen nedenfor."
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 msgid "Location:"
 msgstr "Sted:"
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Accepteret"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Preliminært godtaget"
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
-#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 msgid "Choose an action:"
 msgstr "Vælg en handling"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 msgid "Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "O.k."
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 msgid "Accept"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 msgid "Tentatively accept"
 msgstr "Foreslået"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 msgid "Decline"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "SU"
+
+#: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr "Send oplysning om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr "Opdaterer modpartens status"
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 msgid "Send Latest Information"
 msgstr "Send nyeste oplysninger"
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har offentliggjort mødeoplysning."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 msgid "Meeting Information"
 msgstr "Mødeinformation"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ønsker at %s er til stede ved et møde."
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> beder om din tilstedeværelse i et møde."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1309
 msgid "Meeting Proposal"
 msgstr "Mødeforslag"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ønsker at tilføje information til et eksisterende møde."
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 msgid "Meeting Update"
 msgstr "Mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ønsker at modtage seneste mødeinformation."
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 msgid "Meeting Update Request"
 msgstr "Anmodning om mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svaret på en mødeforespørgsel."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Reply"
 msgstr "Mødesvar"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har aflyst et møde."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 msgid "Meeting Cancellation"
 msgstr "Mødeaflysing"
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforståelig besked."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 msgid "Bad Meeting Message"
 msgstr "Ugyldig mødebesked"
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har offentliggjort information om en opgave."
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 msgid "Task Information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ønsker at %s udfører en opgave."
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> anmoder om at du udfører en opgave."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 msgid "Task Proposal"
 msgstr "Forslag om opgave"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ønsker at tilføje information til en eksisterende opgave."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1381
 msgid "Task Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ønsker at modtage den seneste information om opgaven."
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 msgid "Task Update Request"
 msgstr "Anmodning om opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svaret på en opgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 msgid "Task Reply"
 msgstr "Svar på opgave"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har aflyst en opgave."
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1402
 msgid "Task Cancellation"
 msgstr "Aflysing af opgave"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 msgid "Bad Task Message"
 msgstr "Ugyldig opgavebesked"
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publiseret ledig/optaget-information."
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 msgid "Free/Busy Information"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> anmoder om din oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 msgid "Free/Busy Request"
 msgstr "Forespørgsel om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> har svaret på en forespørgsel efter oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 msgid "Free/Busy Reply"
 msgstr "Svar på ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelelsen ser ikke ud til at være korrekt udformet"
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 msgid "The message contains only unsupported requests."
 msgstr "Denne besked indeholder forespørgsler, som ikke er understøttet."
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen synlige kalender-elementer"
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldigt og kan ikke opdateres\n"
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 msgid "There was an error on the CORBA system\n"
 msgstr "Der opstod en fejl i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke findes\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheder til at opdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 msgid "Update complete\n"
 msgstr "Opdatering fuldført\n"
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltagerstatus kan ikke opdateres, fordi elementet ikke længere eksisterer"
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dette svar er ikke fra en nuværende mødesdeltager. Tilføj som mødesdeltager?"
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheder for at opdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltagerstatus kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 msgid "Removal Complete"
 msgstr "Fjernelse fuldført"
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 msgid "Select Calendar Folder"
 msgstr "Vælg kalendermappe"
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 msgid "Select Tasks Folder"
 msgstr "Vælg opgavefolder"
 
@@ -5958,185 +5988,167 @@ msgstr "slut-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr "Formænd"
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
-msgid "Required Participants"
-msgstr "Obligatoriske deltagere"
-
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
-msgstr "Valgfrie deltagere"
-
-#: calendar/gui/e-meeting-model.c:82
-msgid "Resources"
-msgstr "Ressourcer"
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
-msgid "Individual"
-msgstr "Individuel"
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
-msgid "Group"
-msgstr "Gruppe"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
-msgid "Resource"
-msgstr "Ressourse"
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
-msgid "Room"
-msgstr "Rum"
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
-msgid "Chair"
-msgstr "Formand"
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
-msgid "Required Participant"
-msgstr "Obligatorisk deltager"
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
-msgid "Optional Participant"
-msgstr "Valgfri deltager"
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
-msgid "Non-Participant"
-msgstr "Ikke-deltager"
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
-msgid "Needs Action"
-msgstr "Behøver handling"
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Foreslået"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
-msgid "Delegated"
-msgstr "Delegeret"
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
-msgstr "I gang"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
-msgid "%A, %B %d, %Y"
-msgstr "%A den %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m-%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
-msgid "%m/%d/%Y"
-msgstr "%d/%m-%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ude"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "_Options"
 msgstr "_Tilvalg"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbejdstid"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ud"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update Free/Busy"
 msgstr "_Opdatér ledig/optaget"
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "_Autovælg"
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr "_>>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
+#: calendar/gui/e-meeting-time-sel.c:541
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressourser"
 
-#: calendar/gui/e-meeting-time-sel.c:563
+#: calendar/gui/e-meeting-time-sel.c:550
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:572
+#: calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required People"
 msgstr "_Obligatoriske deltagere"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "Required People and _One Resource"
 msgstr "Obligatoriske deltagere _og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "Meeting _start time:"
 msgstr "Tid for mødets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Meeting _end time:"
 msgstr "Tid for mødets slutning:"
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
-#: calendar/gui/gnome-cal.c:2017
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2054
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A den %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2087
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m-%Y"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Deltager"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Klik her for at tilføje en deltager"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Normalt navn"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegeret fra"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegeret til"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Sprog"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Medlem"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+msgid "%m/%d/%Y"
+msgstr "%d/%m-%Y"
+
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
+msgstr "Ugyldig tidsangivelse"
+
+#: calendar/gui/e-tasks.c:221
+#, fuzzy
+msgid "Start Date:"
+msgstr "Sta_rt dato:"
+
+#: calendar/gui/e-tasks.c:237
+#, fuzzy
+msgid "Due Date:"
+msgstr "Fær_dig-dato:"
+
+#. write priority
+#: calendar/gui/e-tasks.c:265
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioritet:"
+
+#. URL
+#: calendar/gui/e-tasks.c:321
+#, fuzzy
+msgid "Web Page:"
+msgstr "Side"
+
+#: calendar/gui/e-tasks.c:702
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åbner lager %s"
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indlæse opgaverne i `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:746
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Den nødvendige metode til indlæsning af `%s' er ikke understøttet"
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Du har ikke rettigheder til at åbne mappen i \"%s\""
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6145,68 +6157,110 @@ msgstr ""
 "Fejl ved %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:899
 msgid "Completing tasks..."
 msgstr "Færdiggør opgaver..."
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:922
 msgid "Deleting selected objects..."
 msgstr "Fjerner markerede objekter..."
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1017
 msgid "Expunging"
 msgstr "Udrenser"
 
-#: calendar/gui/e-week-view.c:3581
-msgid "New _Appointment..."
-msgstr "Ny _aftale..."
-
-#: calendar/gui/gnome-cal.c:1481
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke åbne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Den nødvendige metode til åbning af `%s' er ikke understøttet"
 
-#: calendar/gui/gnome-cal.c:1556
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Tilføjer alarm for %s"
 
-#: calendar/gui/gnome-cal.c:1748
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Kalenderbagenden for\n"
+"Opgavebagenden for\n"
 "%s\n"
 " er gået ned. Du skal genstarte Evolution for at kunne bruge den igen"
 
-#: calendar/gui/gnome-cal.c:1757
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Opgavebagenden for\n"
+"Kalenderbagenden for\n"
 "%s\n"
 " er gået ned. Du skal genstarte Evolution for at kunne bruge den igen"
 
-#: calendar/gui/gnome-cal.c:1988
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Åbner kalender ved %s"
 
-#: calendar/gui/gnome-cal.c:2028
+#: calendar/gui/gnome-cal.c:2197
 msgid "Opening default tasks folder"
 msgstr "Åbner standardopgavemappen"
 
+#: calendar/gui/gnome-cal.c:3094
+#, fuzzy, c-format
+msgid "Purging event %s"
+msgstr "Pinger %s"
+
+#: calendar/gui/gnome-cal.c:3178
+#, fuzzy
+msgid "Purging"
+msgstr "Turin"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender og opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution kalender-og-opgaver-komponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalender-opsætnings-styringselement"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalendertilrettelægnings-beskedvisning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalendervisning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender/opgave-redigering"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution opgavevisning"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6313,7 +6367,7 @@ msgstr "Ledig/optaget-information (%s til %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i arrangementet"
 
@@ -6346,82 +6400,81 @@ msgid "Sa"
 msgstr "Lør"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1882
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1919
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1927
 msgid "Selected month (%b %Y)"
 msgstr "Valgt måned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1934
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2262
 msgid "Task"
 msgstr "Opgave"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2321
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2338
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Færdige procenter: %i"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2362
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2387
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Forhåndsvisning af udskrift"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2559
 msgid "Print Item"
 msgstr "Udskriv element"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2632
 msgid "Print Setup"
 msgstr "Printeropsætning"
 
@@ -6429,7 +6482,7 @@ msgstr "Printeropsætning"
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til opgavemappen, der skal vises"
 
-#: calendar/gui/tasks-control.c:465
+#: calendar/gui/tasks-control.c:448
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6441,11 +6494,11 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse opgaver?"
 
-#: calendar/gui/tasks-control.c:468
+#: calendar/gui/tasks-control.c:451
 msgid "Do not ask me again."
 msgstr "Spørg mig ikke igen."
 
-#: calendar/gui/tasks-control.c:610
+#: calendar/gui/tasks-control.c:593
 msgid "Print Tasks"
 msgstr "Udskriv opgaver"
 
@@ -8139,27 +8192,27 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:167
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:207
 msgid "Verifying is not supported by this cipher"
 msgstr "Verificering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:251
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:293
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke understøttet af dette cipher"
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:331
 msgid "You may not import keys with this cipher"
 msgstr "Du kan ikke importere nøgler med dette cipher"
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:363
 msgid "You may not export keys with this cipher"
 msgstr "Du kan ikke eksportere nøgler med dette cipher"
 
@@ -8198,7 +8251,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resynkroniserer med server"
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Forbereder mappen \"%s\" til afkoblet tilstand"
@@ -8219,57 +8276,57 @@ msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Mislykkedes med at oprette barneprocessen \"%s\": %s"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig beskedstrøm modtaget fra %s: %s"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fejl under læsning af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fejl under kørsel af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke åbne spool-mappen"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 msgid "Unable to process spool folder"
 msgstr "Kan ikke behandle spool-mappen"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr "Kan ikke åbne besked"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, c-format
 msgid "Failed on message %d"
 msgstr "Mislykkedes på besked %d"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mislykkedes på besked %d af %d"
@@ -8291,7 +8348,35 @@ msgstr "Ugyldige argumenter til (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fejl under udførelse af filtersøgning: %s: %s"
 
-#: camel/camel-folder-search.c:346
+#: camel/camel-folder.c:585
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Uunderstøttet operation: tillæg besked: for %s"
+
+#: camel/camel-folder.c:1163
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Uunderstøttet operation: søg efter udtryk: efter %s"
+
+#: camel/camel-folder.c:1203
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Uunderstøttet operation: søg efter uid'er: efter %s"
+
+#: camel/camel-folder.c:1321
+msgid "Moving messages"
+msgstr "Flytter beskeder"
+
+#: camel/camel-folder.c:1321
+msgid "Copying messages"
+msgstr "Kopierer meddelelser"
+
+#: camel/camel-folder.c:1571
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Henter %d beskeder"
+
+#: camel/camel-folder-search.c:348
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8300,7 +8385,7 @@ msgstr ""
 "Kan ikke tolke søgeudtrykket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:356
+#: camel/camel-folder-search.c:358
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8309,38 +8394,15 @@ msgstr ""
 "Fejl under kørsel af søgeudtrykket %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) kræver et enkelt boolsk resultat"
 
-#: camel/camel-folder-search.c:653
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Udfører forespørgsel på ukendt header: %s"
 
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Uunderstøttet operation: tillæg besked: for %s"
-
-#: camel/camel-folder.c:1161
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Uunderstøttet operation: søg efter udtryk: efter %s"
-
-#: camel/camel-folder.c:1201
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Uunderstøttet operation: søg efter uid'er: efter %s"
-
-#: camel/camel-folder.c:1319
-msgid "Moving messages"
-msgstr "Flytter beskeder"
-
-#: camel/camel-folder.c:1319
-msgid "Copying messages"
-msgstr "Kopierer meddelelser"
-
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8371,7 +8433,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr "Afbrudt."
 
@@ -8427,26 +8489,6 @@ msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan ikke verificere meddelelsesignatur: kunne ikke oprette temporær fil: %s"
 
-#: camel/camel-lock-client.c:111
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Kunne ikke bygge kanal for låsehjælper: %s"
-
-#: camel/camel-lock-client.c:124
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Kan ikke forgrene låsehjælper: %s"
-
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Kunne ikke låse '%s': protokolfejl med låsehjælper"
-
-#: camel/camel-lock-client.c:215
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Kunne ikke låse '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8467,6 +8509,26 @@ msgstr "Fejl under låsning ved brug af fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fejl under låsning ved brug af flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kunne ikke bygge kanal for låsehjælper: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan ikke forgrene låsehjælper: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Kunne ikke låse '%s': protokolfejl med låsehjælper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Kunne ikke låse '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8533,11 +8595,11 @@ msgstr "Kunne ikke dekryptere MIME-del: ugyldig struktur"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Kunne ikke dekryptere MIME-del: tolkningsfejl"
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 msgid "parse error"
 msgstr "tolkningsfejl"
 
@@ -8608,11 +8670,11 @@ msgstr ""
 "Dette alternativ kobler til serveren med brug af CRAM-MD5-adgangskode, hvis "
 "serveren understøtter det."
 
-#: camel/camel-sasl-digest-md5.c:46
+#: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:50
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8708,7 +8770,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1207
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar på autenticering fra server."
 
@@ -8766,23 +8828,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr "SIMPEL"
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr "POP før SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Dette alternativ vil godkende en POP-forbindelse før forsøg på SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
 msgstr "Kilde-URI for POP"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP før SMTP-godkendelse via en ukendt transport"
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP før SMTP-godkendelse via ikke-pop kilde"
 
@@ -8791,55 +8853,55 @@ msgstr "POP før SMTP-godkendelse via ikke-pop kilde"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Oversættelse af regulært udtryk mislykkedes: %s: %s"
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' skal indeholde et brugernavn"
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:285
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' skal indeholde et værtsnavn"
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:293
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' skal indeholde en sti"
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:738
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finder: \"%s\""
 
-#: camel/camel-service.c:783 camel/camel-service.c:915
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fejl i navneopslag: %s"
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Opslag af værtsnavn mislykkedes: ukendt årsag"
 
-#: camel/camel-service.c:818
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Værtsopslag mislykkedes: %s: vært ikke fundet"
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Værtsopslag mislykkedes: %s: ukendt årsag"
 
-#: camel/camel-service.c:880
+#: camel/camel-service.c:860
 msgid "Resolving address"
 msgstr "Slår adresse op"
 
-#: camel/camel-service.c:949
+#: camel/camel-service.c:929
 msgid "Host lookup failed: host not found"
 msgstr "Opslag af værtsnavn mislykkedes: vært kunne ikke findes"
 
-#: camel/camel-service.c:952
+#: camel/camel-service.c:932
 msgid "Host lookup failed: unknown reason"
 msgstr "Opslag af værtsnavn mislykkedes: ukendt årsag"
 
@@ -8851,12 +8913,12 @@ msgstr "E-post-udbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For læsning af e-post som en forespørgsel på et andet sæt mapper"
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen udbyder tilgængelig for protokol `%s'"
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8902,131 +8964,131 @@ msgstr "Kunne ikke afkode besked."
 msgid "Failed to verify certificates."
 msgstr "Fejl under verificering af certifikater."
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:212
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finde mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Kan ikke hente udstederens certifikat."
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr "Kan ikke hente certifikattilbagetrækningsliste"
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr "Kan ikke dekryptere certifikatsignatur"
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "Kan ikke dekryptera signatur for certifikattilbagetrækningsliste"
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr "Kan ikke afkode udsteders offentlige nøgle"
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
 msgstr "Certifikatsignaturfejl"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr "Signaturfejl i certifikattilbagetrækningslisten"
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr "Certifikatet er udløbet"
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr "CRL er ikke gyldig endnu"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr "CRL er udløbet"
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr "Fejl i CRL"
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr "Løbet tør for hukommelse"
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr "Nuldybde selvsigneret certifikat"
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr "Selvsigneret certifikat i kæden"
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr "Kan ikke finde udsteders certifikat lokalt"
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr "Kan ikke verificere bladsignatur"
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr "Certifikatkæden er for lang"
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr "Certifikat tilbagekaldt"
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Ugyldig certifikatmyndighed (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr "Søgestiens længde overskredet"
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr "Ugyldigt formål"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr "Certifikat utroværdigt"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr "Certifikat afvist"
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr "Emne/Udsteder stemmer ikke overens"
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID stemmer ikke overens"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/Udsteder-serienummer stemmer ikke overens"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr "Nøgleanvendelse understøtter ikke certifikatsignering"
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr "Fejl i programverifikation"
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9039,15 +9101,15 @@ msgstr ""
 "Fingeraftryk:      %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr "GOD"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr "DÅRLIG"
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9067,7 +9129,7 @@ msgstr ""
 "Vil du acceptere alligevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9082,7 +9144,7 @@ msgstr ""
 "\n"
 "Vil du acceptere?"
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9091,7 +9153,7 @@ msgstr ""
 "Certifikatproblem: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9100,7 +9162,7 @@ msgstr ""
 "Fejlagtigt certifikatdomæne: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9109,7 +9171,7 @@ msgstr ""
 "Certifikatet er udløbet: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9123,17 +9185,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL `%s'"
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Fejl ved lagring af \"%s\": %s"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen sådan besked %s i %s"
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 
@@ -9160,12 +9222,12 @@ msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2806
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2809
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %s"
@@ -9204,38 +9266,38 @@ msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet 'OK'-svar fra IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indlæse sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen blev ødelagt og genskabt på serveren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr "Søger efter ændrede beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1883
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente meddelelse: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9244,24 +9306,24 @@ msgstr ""
 "Kan ikke hente besked: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Ingen sådan besked"
 
-#: camel/providers/imap/camel-imap-folder.c:1943
-#: camel/providers/imap/camel-imap-folder.c:2539
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr "Denne besked er ikke tilgængelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2203
-#: camel/providers/imap/camel-imap-folder.c:2273
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformation for nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:2577
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedens indhold i FETCH-svar."
 
@@ -9311,87 +9373,103 @@ msgstr "Navneområde"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Brug filtre for nye beskeder i INDBAKKE på denne server"
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "Hent nye beskeder _automatisk hver(t)"
+
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For læsning og lagring af e-post på IMAP-servere."
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Adgangskode"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
 "adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s på %s"
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/imap/camel-imap-store.c:589
+#: camel/providers/imap/camel-imap-store.c:821
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Tilkobling afbrudt"
 
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:655
+#: camel/providers/imap/camel-imap-store.c:686
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikke tilslutte IMAP-servern %s i sikker tilstand: %s"
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-udvidelsen understøttes ikke."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:687
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandlinger mislykkedes"
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:824
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Kunne ikke koble til %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:1237
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s understøtter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen understøtte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIndtast venligst IMAP-adgangskode for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9402,42 +9480,70 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1660
+#: camel/providers/imap/camel-imap-store.c:1802
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2003
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mappnavnet \"%s\" er ugyldigt eftersom det indeholder tegnet \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2015
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukendt forældermappe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2051
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Beskedslager"
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Kunne ikke tilslutte POP-servern %s"
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "Send besked til kontakt"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:379
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:383
+#: camel/providers/local/camel-local-folder.c:386
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postkasse:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:390
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9495,50 +9601,54 @@ msgstr ""
 "Til at læse og gemme lokal post i eksterne standard mbox kø-filer.\n"
 "Kan også anvendes til at læse et træ mapper i Elm-, Pine- eller Mutt-format."
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrod %s er ikke en absolut sti"
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagerrod %s er ikke et normalt katalog"
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en indbakke"
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke skifte navn på \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
@@ -9552,17 +9662,17 @@ msgstr "Kunne ikke gemme sammendrag: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke tilføje besked i sammendraget: ukendt grund"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
 msgstr "Besked aflyst"
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke tilføje besked i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr "Ugyldig beskedsindhold"
 
@@ -9578,7 +9688,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9641,29 +9751,29 @@ msgstr "Checker for nye meddelelser"
 msgid "Storing folder"
 msgstr "Gemmer mappe"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke oprette mappelås på: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:289
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke åbne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:349
 msgid "Mail append cancelled"
 msgstr "Tilføjelse af brev blev aflyst"
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:352
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke tilføje besked i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9672,15 +9782,15 @@ msgstr ""
 "Kan ikke hente besked: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ud til at have blevet korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbygning af besked mislykkedes: Beskadiget postboks?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9689,7 +9799,16 @@ msgstr ""
 "Kunne ikke åbne fil `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr ""
+"Kan ikke oprette katalog %s:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9698,14 +9817,15 @@ msgstr ""
 "Kunne ikke oprette fil '%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' er ikke en normal fil."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9714,11 +9834,36 @@ msgstr ""
 "Kunne ikke slette mappen `%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen `%s' er ikke tom. Ikke slettet."
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Kan ikke oprette en mappe med det navn"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "Kan ikke oprette katalog %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:427
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "Specificeret mappenavn er ikke gyldigt: %s"
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9748,7 +9893,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åbne midlertidig postboks: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
@@ -9765,38 +9910,38 @@ msgstr "Kunne ikke ændre navn på mappe: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Fejl i sammendrag og mappe, selv efter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikke gemme mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks mislykkedes: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
 msgstr "Tilføjet brev er annulleret"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke tilføje besked i mh-mappe: %s: %s"
@@ -9876,6 +10021,67 @@ msgstr ""
 "Kunne ikke synkronisere spool-mappe %s: %s\n"
 "Mappen kan være beskadiget, kopi gemt i `%s'"
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, fuzzy, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+#, fuzzy
+msgid "Failed to send username to server"
+msgstr "Tilslutning til LDAP-serveren mislykkedes"
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Kan ikke hente meddelelse %s: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Brugeren afbrød"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "Kunne ikke hente gruppe: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, fuzzy, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+"Kunne ikke oprette uddatafil: %s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+"Kunne ikke oprette uddatafil: %s\n"
+" %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET nyheder"
@@ -9886,22 +10092,22 @@ msgstr ""
 "Dette er en udbyder for læsning af og postning af indlæg til USENET "
 "nyhedsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Kunne ikke oprette hilsen fra %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-serveren %s returnerede fejlkoden %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Nyheder via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9909,37 +10115,37 @@ msgstr ""
 "Dette alternativ vil autenticere mod NNTP-serveren ved brug af klartekst "
 "adgangskode."
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, c-format
 msgid "No such folder: %s"
 msgstr "Der findes ingen sådan mappe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Kunne ikke hente gruppe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-kommandoen mislykkedes: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Skanner nye meddelelser"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Ukendt serversvar: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 msgid "Use cancel"
 msgstr "Anvend afbryd"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Handlingen mislykkedes: %s"
@@ -9948,13 +10154,6 @@ msgstr "Handlingen mislykkedes: %s"
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-msgid "User cancelled"
-msgstr "Brugeren afbrød"
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -9964,34 +10163,22 @@ msgstr "Kan ikke hente POP-sammenfatning: %s"
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede beskeder"
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ingen besked med uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-besked %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Kan ikke hente meddelelse %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 msgid "Unknown reason"
 msgstr "Ukendt anledning"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Beskedslager"
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Behold beskeder på serveren"
@@ -10157,140 +10344,140 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering af e-post via en ekstern e-postserver med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfejl, kommando ikke genkendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfejl i parametre eller argumenter"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Kommando ikke implementeret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementeret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar på systemhjælp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Hjælpebesked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgængelig, lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Forespurgt e-post handling er ok, fuldført"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruger; videresender til <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Forespurgt e-post-handling er ikke udført: postboks ikke tilgængelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurgt handling ikke udført: postboks ikke tilgængelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurgt handling afbrudt: fejl i processering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruger; venligst prøv <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurgt handling ikke udført: utilstrækkelig lagringsplads"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurgt e-post handling afbrudt: lagringsallokering overskredet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Forespurgt handling ikke udført: postboksnavn ikke tilladt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slut med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Transaktionen mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Adgangskodeoverføring kræves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Autenticeringsmekanismen er for svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kræves for forespurgt autenticeringsmekanisme."
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autenticeringsfejl"
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autenticering kræves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:298
 msgid "Welcome response error"
 msgstr "Fejl i velkomstsvar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Tilslutning til SMTP-servern %s mislykkedes i sikkert tilstand: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid "server does not appear to support SSL"
 msgstr "serveren ser ikke ud til at understøtte SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "STARTTLS-forespørgslen gav time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:372
 msgid "STARTTLS response error"
 msgstr "Fejl i STARTTLS-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-serveren %s understøtter ikke den ønskede godkendelsestype %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10301,87 +10488,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr "Sender besked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende meddelelse: en eller flere ugyldige modtagere"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "HELO-forespørgsel gav time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 msgid "HELO response error"
 msgstr "Fejl i HELO-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "SMTP-autenticering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "Fejl under opretelse af SASL-autenticeringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsafbrud for AUTH-forespørgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "AUTH-forespørgsel mislykkedes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar på autenticering fra server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"MAIL FROM\"-forespørgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr "Fejl i MAIL FROM-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"RCPT TO\"-forespørgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-forespørgsel: %s: besked ikke sendt."
@@ -10389,67 +10576,66 @@ msgstr "Tidsafbrud for DATA-forespørgsel: %s: besked ikke sendt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 msgid "DATA response error"
 msgstr "Fejl i DATA-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-send: beskedsterminering: %s: besked ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 msgid "DATA termination response error"
 msgstr "Fejl i DATA-termineringssvar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsafbrud for RSET-forespørgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "RSET response error"
 msgstr "Fejl i RSET-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "QUIT-forespørgslen gav time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "QUIT response error"
 msgstr "Fejl i QUIT-svar"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f k"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f M"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "bilag"
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte opføringer fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Tilføj bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Vedlæg en fil til beskeden"
 
@@ -10481,88 +10667,11 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning af bilag"
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Klik her for at få adressebogen op"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Fra:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Emne:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Til:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Indtast modtagerene for beskeden"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Indtast adresserne som skal modtage en kopi af beskeden"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Indtast adresserne som skal modtage en kopi af beskeden uden at komme til "
-"syne i modtagerlisten for beskeden."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Send til:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Postdestination"
-
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Vedhæft fil(er)"
-
-#: composer/e-msg-composer.c:535
+#: composer/e-msg-composer.c:562
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikke oprette et PGP-signaturkontekst"
 
-#: composer/e-msg-composer.c:814
+#: composer/e-msg-composer.c:841
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10571,30 +10680,30 @@ msgstr ""
 "Fejl under læsning af fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1177
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1195
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl under gemning af fil: %s"
 
-#: composer/e-msg-composer.c:1218
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl under indlæsning af fil: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved adgang til fil: %s"
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10603,7 +10712,7 @@ msgstr ""
 "Kunne ikke søge i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10612,7 +10721,7 @@ msgstr ""
 "Kunne ikke afkorte fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1287
+#: composer/e-msg-composer.c:1325
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10621,7 +10730,7 @@ msgstr ""
 "Kan ikke kopiere filhandtag: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1296
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10630,7 +10739,7 @@ msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10638,7 +10747,7 @@ msgstr ""
 "Ximian Evolution har fundet ikke-gemte filer fra en tidligere session.\n"
 "Vil du prøve at genoprette dem?"
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1594
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10649,28 +10758,28 @@ msgstr ""
 "\n"
 "Vil du gemme dine ændringar?"
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Ændret besked"
 
-#: composer/e-msg-composer.c:1593
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Åbn fil"
 
-#: composer/e-msg-composer.c:2017
+#: composer/e-msg-composer.c:2054
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "Automatisk genereret"
 
-#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Skriv en besked"
 
-#: composer/e-msg-composer.c:2934
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10678,7 +10787,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "adresseudvælgelses-kontrol kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:2962
+#: composer/e-msg-composer.c:3030
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10690,7 +10799,7 @@ msgstr ""
 "Verficér at du har de rette versioner af\n"
 "gtkhtml og libgtkhtml installeret.\n"
 
-#: composer/e-msg-composer.c:3029
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10698,7 +10807,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:4045
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10706,6 +10815,85 @@ msgstr ""
 "<b>(Redigeringsværktøjet indeholder et meddelelse som ikke er text og som "
 "ikke kan redigeres.)<b>"
 
+#: composer/e-msg-composer-hdrs.c:290
+#, fuzzy
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+"Du skal konfigurere en konto\n"
+"inden du kan skrive e-post."
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Klik her for at få adressebogen op"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Svar-til:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Fra:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Emne:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Til:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Indtast modtagerene for beskeden"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Indtast adresserne som skal modtage en kopi af beskeden"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Indtast adresserne som skal modtage en kopi af beskeden uden at komme til "
+"syne i modtagerlisten for beskeden."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Send til:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Postdestination"
+
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Vedhæft fil(er)"
+
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Gruppevaresuiten Evolution"
@@ -10868,7 +11056,7 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
@@ -10890,90 +11078,210 @@ msgstr "Synkroniser kategorier:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %Y-%m-%d %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %Y-%m-%d %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %Y-%m-%d %H"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %Y-%m-%d %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d %H:%M:%S"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%Y-%m-%d %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%Y-%m-%d %H:%M"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%Y-%m-%d %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%Y-%m-%d %H %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%Y-%m-%d %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 msgid "%I:%M %p"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%H"
 
+#: executive-summary/component/component-factory.c:151
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
+
+#: executive-summary/component/e-summary.c:925
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Kunne ikke ændre navn på mappe:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:939
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Fejl under indlæsning af %s"
+
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:125
+#, fuzzy
+msgid "Select a service"
+msgstr "Vælg en fil"
+
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Send en besked"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Change the view to %s"
+msgstr "Typen af visning der skal bruges"
+
+#: executive-summary/component/e-summary-url.c:73
+#, fuzzy, c-format
+msgid "Run %s"
+msgstr "URL: %s"
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Luk"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Flyt denne mappe til et andet sted"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Konfigurér /%s igen"
+
+#: executive-summary/component/e-summary-url.c:553
+#, fuzzy
+msgid "page"
+msgstr "Side"
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+msgid "Error"
+msgstr "Fejl"
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update now"
+msgstr "Opgaveopdatering"
+
+#: executive-summary/test-service/rdf-summary.c:795
+#, fuzzy
+msgid "Update every "
+msgstr "_Opdatér ledig/optaget"
+
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr "1 sekund siden"
@@ -11089,84 +11397,6 @@ msgstr "Du skal angive en mappe."
 msgid "Select Folder"
 msgstr "Vælg mappe"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Fejl i regulært udtryk '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
-msgid "Important"
-msgstr "Vigtig"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-msgid "Work"
-msgstr "Arbejde"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-msgid "Personal"
-msgstr "Personligt"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
-msgid "To Do"
-msgstr "At-gøre"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
-msgid "Later"
-msgstr "Senere"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Du skal give navn til dette filter."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Regelnavn: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Uden navn"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Hvis"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Udfør handlinger"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "hvis alle kriterier er mødt"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "hvis nogen betingelser er opfyldt"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "indkommende"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "udgående"
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Sammenlign med"
@@ -11268,6 +11498,84 @@ msgstr "med alle lokale mapper"
 msgid "years"
 msgstr "år"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Fejl i regulært udtryk '%s':\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+msgid "Important"
+msgstr "Vigtig"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Arbejde"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Personligt"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+msgid "To Do"
+msgstr "At-gøre"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1458
+msgid "Later"
+msgstr "Senere"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Du skal give navn til dette filter."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Regelnavn: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Uden navn"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Hvis"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Udfør handlinger"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "hvis alle kriterier er mødt"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "hvis nogen betingelser er opfyldt"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "indkommende"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "udgående"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11290,217 +11598,217 @@ msgid "Beep"
 msgstr "Bip"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "indeholder"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Dato modtaget"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Slettet"
 
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr "Eksisterer ikke"
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "indeholder ikke"
+msgid "Draft"
+msgstr "Skitse"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "slutter ikke med"
+msgid "Exist"
+msgstr "Eksisterer"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "eksisterer ikke"
+msgid "Expression"
+msgstr "Udtryk"
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "returnerer ikke"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ligner ikke"
+msgid "Follow Up"
+msgstr "Følg op"
 
 #: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "starter ikke med"
+msgid "Label"
+msgstr "Etiket"
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Eksisterer ikke"
+msgid "Mailing list"
+msgstr "E-post-liste"
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Skitse"
+msgid "Message Body"
+msgstr "Beskedskrop"
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "slutter med"
+msgid "Message Header"
+msgstr "Beskedshoved"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Eksisterer"
+msgid "Move to Folder"
+msgstr "Flyt til mappe"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "eksisterer"
+msgid "Pipe Message to Shell Command"
+msgstr "Send meddelelse igennem skalkommando"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Udtryk"
+msgid "Play Sound"
+msgstr "Afspil lyd"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Følg op"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Læs"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Modtagere"
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "er"
+msgid "Regex Match"
+msgstr "Træffer på regulært udtryk"
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "er efter"
+msgid "Replied to"
+msgstr "Svaret til"
 
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "er inden"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Point"
 
 #: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "er markeret med flag"
+msgid "Sender"
+msgstr "Afsender"
 
 #: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "er større end"
+msgid "Set Status"
+msgstr "Sæt status"
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "er mindre end"
+msgid "Shell Command"
+msgstr "Skalkommando"
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "er ikke"
+msgid "Size (kB)"
+msgstr "Størrelse (kB)"
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "er ikke markeret med flag"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
-msgid "Label"
-msgstr "Etiket"
+msgid "Source Account"
+msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr "E-post-liste"
+#: filter/libfilter-i18n.h:35
+msgid "Specific header"
+msgstr "Specifik header"
 
 #: filter/libfilter-i18n.h:37
-msgid "Message Body"
-msgstr "Beskedskrop"
+msgid "Stop Processing"
+msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:38
-msgid "Message Header"
-msgstr "Beskedshoved"
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Emne"
 
 #: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
-msgstr "Flyt til mappe"
+msgid "Unset Status"
+msgstr "Neutraliser status"
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
-msgstr "Send meddelelse igennem skalkommando"
+msgid "contains"
+msgstr "indeholder"
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
-msgstr "Afspil lyd"
+msgid "does not contain"
+msgstr "indeholder ikke"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Læs"
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
+msgstr "slutter ikke med"
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
-msgstr "Modtagere"
+msgid "does not exist"
+msgstr "eksisterer ikke"
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
-msgstr "Træffer på regulært udtryk"
+msgid "does not return"
+msgstr "returnerer ikke"
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
-msgstr "Svaret til"
+msgid "does not sound like"
+msgstr "ligner ikke"
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
-msgstr "returnerer"
+msgid "does not start with"
+msgstr "starter ikke med"
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
-msgstr "returnerer større end"
+msgid "ends with"
+msgstr "slutter med"
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
-msgstr "returnerer mindre end"
+msgid "exists"
+msgstr "eksisterer"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Point"
+#: filter/libfilter-i18n.h:49
+msgid "is Flagged"
+msgstr "er markeret med flag"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
-msgid "Sender"
-msgstr "Afsender"
+#: filter/libfilter-i18n.h:50
+msgid "is after"
+msgstr "er efter"
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
-msgstr "Sæt status"
+msgid "is before"
+msgstr "er inden"
 
 #: filter/libfilter-i18n.h:52
-msgid "Shell Command"
-msgstr "Skalkommando"
+msgid "is greater than"
+msgstr "er større end"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "Størrelse (kB)"
+msgid "is less than"
+msgstr "er mindre end"
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "lyder som"
+msgid "is not Flagged"
+msgstr "er ikke markeret med flag"
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
-msgstr "Kildekonto"
+msgid "is not"
+msgstr "er ikke"
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
-msgstr "Specifik header"
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "starter med"
+msgid "returns greater than"
+msgstr "returnerer større end"
+
+#: filter/libfilter-i18n.h:58
+msgid "returns less than"
+msgstr "returnerer mindre end"
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
-msgstr "Stop behandling"
+msgid "returns"
+msgstr "returnerer"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Emne"
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
+msgstr "lyder som"
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
-msgstr "Neutraliser status"
+msgid "starts with"
+msgstr "starter med"
 
-#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:916
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnavnet \"%s\" er ikke unikt, vælg et andet."
@@ -11568,10 +11876,9 @@ msgid "Scanning %s"
 msgstr "Søger i %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Post"
 
@@ -11658,7 +11965,7 @@ msgstr "Evolution importerer dine gamle data fra Netscape"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Affald"
 
@@ -11672,7 +11979,7 @@ msgid "Scanning directory"
 msgstr "Søger i katalog"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:541
+#: shell/e-shell-startup-wizard.c:556
 msgid "Starting import"
 msgstr "Starter import"
 
@@ -11708,98 +12015,39 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Redigererindstillinger"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfigurér e-post-indstillinger, inklusive sikkerhed og meddelelsesvisning, "
-"hér"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Konfigurér stavekontrol, signaturer, og meddelelseredigeringen hér"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurér dine e-post-konti her"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution e-post-kontoopsætnings-styreelement"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolutions e-post-komponent"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolutions e-post-redigering"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutions e-post-redigereropsætnings-styreelement"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Evolution e-post-opsætningsgrænseflade"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution e-post-mappevisning"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-post-indstillings-styreelement"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-post-konti"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "E-post-indstillinger"
-
-#: mail/component-factory.c:117
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Mappe som indeholder e-post"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Offentlig post"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Offentlig mappe som indeholder e-post"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtuelt affald"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtuel affaldsmappe"
 
-#: mail/component-factory.c:147
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikke indeholde beskeder."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Change this folder's properties"
 msgstr "Ændr denne mappes egenskaber"
 
-#: mail/component-factory.c:819
+#: mail/component-factory.c:826
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11807,234 +12055,108 @@ msgstr ""
 "Nogen af dine indstillinger for e-post ser ud til at være beskadiget. "
 "Venligst tjek at alt er i orden."
 
-#: mail/component-factory.c:1000
+#: mail/component-factory.c:1008
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke sat en transportmetode for e-post"
 
-#: mail/component-factory.c:1023
+#: mail/component-factory.c:1031
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meddelelser, vil du afslutte alligevel?"
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "New Mail Message"
 msgstr "Ny e-post-besked"
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "_Mail Message"
 msgstr "Send _besked"
 
-#: mail/component-factory.c:1064
+#: mail/component-factory.c:1072
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-post-meddelelse"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 msgid "New Message Post"
 msgstr "Postning af ny meddelelse"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 msgid "_Post Message"
 msgstr "_Post meddelelse"
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1081
 msgid "Post a new mail message"
 msgstr "Post en ny e-post-meddelelse"
 
-#: mail/component-factory.c:1365
+#: mail/component-factory.c:1373
 msgid "Connecting..."
 msgstr "Tilslutter..."
 
-#: mail/component-factory.c:1376
+#: mail/component-factory.c:1384
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring med skallen"
 
-#: mail/folder-browser-ui.c:486
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Egenskaber for \"%s\""
-
-#: mail/folder-browser-ui.c:488
-msgid "Properties"
-msgstr "Egenskaber"
-
-#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kunne ikke oprette midlertidigt katalog: %s"
-
-#: mail/folder-browser.c:782
-#, c-format
-msgid "%d new"
-msgstr "%d nye"
-
-#: mail/folder-browser.c:785 mail/folder-browser.c:793
-#: mail/folder-browser.c:796
-msgid ", "
-msgstr ", "
-
-#: mail/folder-browser.c:787
-#, c-format
-msgid "%d hidden"
-msgstr "%d skjulte"
-
-#: mail/folder-browser.c:789
-#, c-format
-msgid "%d visible"
-msgstr "%d synlige"
-
-#: mail/folder-browser.c:794
-#, c-format
-msgid "%d selected"
-msgstr "%d valgte"
-
-#: mail/folder-browser.c:799
-#, c-format
-msgid "%d unsent"
-msgstr "%d usendte"
-
-#: mail/folder-browser.c:801
-#, c-format
-msgid "%d sent"
-msgstr "%d sendte"
-
-#: mail/folder-browser.c:803
-#, c-format
-msgid "%d total"
-msgstr "%d totalt"
-
-#: mail/folder-browser.c:1182
-msgid "Create _Virtual Folder From Search..."
-msgstr "Opret _virtuel mappe fra søgning..."
-
-#: mail/folder-browser.c:1736
-msgid "VFolder on _Subject"
-msgstr "Virtuel mappe for e_mnet"
-
-#: mail/folder-browser.c:1737
-msgid "VFolder on Se_nder"
-msgstr "Virtuel mappe for afse_nder"
-
-#: mail/folder-browser.c:1738
-msgid "VFolder on _Recipients"
-msgstr "Virtuel mappe for modtage_re"
-
-#: mail/folder-browser.c:1739
-msgid "VFolder on Mailing _List"
-msgstr "Virtuel mappe på e-post-_liste"
-
-#: mail/folder-browser.c:1743
-msgid "Filter on Sub_ject"
-msgstr "Filtrér på em_ne"
-
-#: mail/folder-browser.c:1744
-msgid "Filter on Sen_der"
-msgstr "Filtrér på afsen_der"
-
-#: mail/folder-browser.c:1745
-msgid "Filter on Re_cipients"
-msgstr "Filtrér på modta_gere"
-
-#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
-msgid "Filter on _Mailing List"
-msgstr "Filtrér på e-_postliste"
-
-#: mail/folder-browser.c:1764
-msgid "_Edit as New Message..."
-msgstr "R_edigér som ny besked..."
-
-#: mail/folder-browser.c:1766
-msgid "_Print"
-msgstr "S_kriv ud"
-
-#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
-msgid "_Reply to Sender"
-msgstr "Sva_r til sender"
-
-#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
-msgid "Reply to _List"
-msgstr "Svar til _listen"
-
-#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
-msgid "Reply to _All"
-msgstr "Svar til _alle"
-
-#: mail/folder-browser.c:1773
-msgid "_Forward"
-msgstr "_Videresend"
-
-#: mail/folder-browser.c:1777
-msgid "Follo_w Up..."
-msgstr "Føl_g op..."
-
-#: mail/folder-browser.c:1778
-msgid "Fla_g Completed"
-msgstr "Marker færdi_ge med flag"
-
-#: mail/folder-browser.c:1779
-msgid "Cl_ear Flag"
-msgstr "Neutralis_er flag"
-
-#. separator here?
-#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
-msgid "Mar_k as Read"
-msgstr "Mar_kér som læst"
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Henter mappeinformation"
 
-#: mail/folder-browser.c:1784
-msgid "Mark as _Unread"
-msgstr "Marker som _ulæst"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Redigererindstillinger"
 
-#: mail/folder-browser.c:1785
-msgid "Mark as _Important"
-msgstr "Markér som v_igtig"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurér e-post-indstillinger, inklusive sikkerhed og meddelelsesvisning, "
+"hér"
 
-#: mail/folder-browser.c:1786
-msgid "_Mark as Unimportant"
-msgstr "Markér som uvi_gtig"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfigurér stavekontrol, signaturer, og meddelelseredigeringen hér"
 
-#: mail/folder-browser.c:1791
-msgid "U_ndelete"
-msgstr "_Fortryd sletning"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Konfigurér dine e-post-konti her"
 
-#: mail/folder-browser.c:1795
-msgid "Mo_ve to Folder..."
-msgstr "Fl_yt til mappe..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
 
-#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "K_opiér til mappe..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution e-post-kontoopsætnings-styreelement"
 
-#: mail/folder-browser.c:1804
-msgid "Add Sender to Address_book"
-msgstr "Tilføj afsenderen til adresse_bogen"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolutions e-post-komponent"
 
-#: mail/folder-browser.c:1808
-msgid "Appl_y Filters"
-msgstr "Anvend filtre"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolutions e-post-redigering"
 
-#: mail/folder-browser.c:1812
-msgid "Crea_te Rule From Message"
-msgstr "Ska_b regel fra meddelelse"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutions e-post-redigereropsætnings-styreelement"
 
-#: mail/folder-browser.c:2071
-msgid "VFolder on M_ailing List"
-msgstr "Virtuele mappe på postliste"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail configuration interface"
+msgstr "Evolution e-post-opsætningsgrænseflade"
 
-#: mail/folder-browser.c:2073
-#, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Filtre på postliste (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution e-post-mappevisning"
 
-#: mail/folder-browser.c:2074
-#, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "Virtuel mappe på postliste (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-post-indstillings-styreelement"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Standard"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-post-konti"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Henter mappeinformation"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "E-post-indstillinger"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -12119,7 +12241,7 @@ msgstr "Bruger_navn:"
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1886
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke oprette to konti med samme navn."
 
@@ -12150,16 +12272,16 @@ msgstr "[Standard]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -12202,218 +12324,6 @@ msgstr ""
 "    \"%s\"\n"
 "og er blevet opdateret."
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "Vis ikke denne besked igen."
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Du har ikke konfigureret e-post-klienten.\n"
-"Du skal gøre dette før du kan sende,\n"
-"modtage eller skrive beskeder.\n"
-"Vil du konfigurere den nu?"
-
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-"Du skal konfigurere en konto\n"
-"inden du kan skrive e-post."
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Du skal konfigurere en identitet\n"
-"før du kan skrive e-post."
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Du skal konfigurere en e-post-transport\n"
-"før du kan skrive e-post."
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-"Du sender et HTML-formaterat brev. Sørg for at følgende\n"
-"modtagere ønsker, og kan modtage, HTML-formateret e-post:\n"
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "Send alligevel?"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Denne besked har ikke et emne.\n"
-"Send alligevel?"
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-"Siden kontaktlisten du sender til er konfigureret til at skjule listens "
-"adresser vil denne besked kun indeholde Bcc-modtagere."
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "Denne besked indeholder kun Bcc-modtagere."
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-"Det er muligt at e-post-serveren kan vise modtagerne ved at tilføje en "
-"\"Apparently-To\" header.\n"
-"Send alligevel?"
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Du skal specificere modtagere for at kunne sende denne besked."
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Kunne ikke åbne skitse-mappen for denne konto.\n"
-"Vil du bruge standard skitse-mappe?"
-
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr "en ukendt afsender"
-
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
-
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "Flyt beskeder til"
-
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "Kopiér beskeder til"
-
-#: mail/mail-callbacks.c:2344
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "Er du sikker på at du vil redigere alle %d beskeder?"
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Du kan kun redigere beskeder gemt\n"
-"i Skitser-kataloget."
-
-#: mail/mail-callbacks.c:2393
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Du kan kun sende beskeder igen\n"
-"som er gemt i sendt-kataloget."
-
-#: mail/mail-callbacks.c:2403
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "Er du sikker på at du vil sende alle %d beskederne igen?"
-
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr "Ingen besked valgt"
-
-#: mail/mail-callbacks.c:2465
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"Kan ikke gemme til \"%s\":\n"
-" %s"
-
-#: mail/mail-callbacks.c:2470
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"\"%s\" findes allerede.\n"
-"Vil du overskrive den?"
-
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr "Gem besked som..."
-
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr "Gem beskeder som..."
-
-#: mail/mail-callbacks.c:2686
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"Denne handling vil permanent fjerne de meddelelser der er\n"
-"markeret som slettede. Hvis du fortsætter kan du ikke længere tilvejebringe\n"
-"disse meddelelser.\n"
-"\n"
-"Vil du virkelig fjerne disse meddelelser?"
-
-#: mail/mail-callbacks.c:2781
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Fejl under indlæsning af filter-information:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr "Filtre"
-
-#: mail/mail-callbacks.c:2830
-#, c-format
-msgid "Page %d of %d"
-msgstr "Side %d af %d"
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr "Udskriv besked"
-
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr "Fejl under udskrift af besked"
-
-#: mail/mail-callbacks.c:3147
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "Er du sikker på at du vil åbne alle %d beskeder i separate vinduer?"
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12439,11 +12349,19 @@ msgstr "Tilføj skriptsignatur"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Tjekker tjeneste"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Kobler til server..."
+
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:369
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12453,11 +12371,11 @@ msgstr ""
 "nedenfor er ikke obligatoriske, medmindre du ønsker at inkludere "
 "informationen i den e-post du sender."
 
-#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 msgid "Receiving Mail"
 msgstr "Modtager post"
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:377
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12466,15 +12384,15 @@ msgstr ""
 "ikke er sikker bør du spørge din systemadministrator eller "
 "Internetleverandør."
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr "Venligst vælg mellem følgende alternativer"
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 msgid "Sending Mail"
 msgstr "Sender post"
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:389
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12482,11 +12400,11 @@ msgstr ""
 "Angiv information om hvordan du vil sende e-post. Hvis du ikke er sikker bør "
 "du spørge din systemadministrator eller Internetleverandør."
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Håndtering af konti"
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:396
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12499,14 +12417,6 @@ msgstr ""
 "angav samles til en Evolution-epostkonto. Angiv et navn for denne konto "
 "nedenfor. Dette navn anvendes kun til visning."
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Tjekker tjeneste"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Kobler til server..."
-
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Søg efter understøttede typer"
@@ -12627,6 +12537,10 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Forvalgt"
 
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Standard"
+
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Standardopførsel"
@@ -13071,212 +12985,25 @@ msgstr "_Brug sikker anslutning (SSL):"
 msgid "_Use the same fonts as other applications"
 msgstr "Br_ug de samme skrifttyper som andre programmer"
 
-#: mail/mail-config.glade.h:171
-msgid "color"
-msgstr "farve"
-
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr "Kunne ikke oprette S/MIME-signaturkontekst."
-
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
-msgstr "Kunne ikke oprette S/MIME \"certsonly\" kontekst."
-
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr "Kunne ikke oprette S/MIME-krypteringskontekst."
-
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
-msgstr "Kunne ikke oprette S/MIME-\"envelope\"-kontekst."
-
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr "Kunne ikke oprette S/MIME-afkodningskontekst."
-
-#: mail/mail-display.c:197
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Filen \"%s\" findes allerede.\n"
-"Skal den overskrives?"
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr "Gem bilag"
-
-#: mail/mail-display.c:409
-#, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "Kunne ikke oprette temporær fil \"%s\": %s"
-
-#: mail/mail-display.c:457
-msgid "Save Attachment..."
-msgstr "Gem bilag..."
-
-#: mail/mail-display.c:458
-msgid "View Inline"
-msgstr "Vis indlejret"
-
-#: mail/mail-display.c:459
-#, c-format
-msgid "Open in %s..."
-msgstr "Åbn i %s..."
-
-#: mail/mail-display.c:515
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Vis indlejret (via %s)"
-
-#: mail/mail-display.c:519
-msgid "Hide"
-msgstr "Skjul"
-
-#: mail/mail-display.c:539
-msgid "External Viewer"
-msgstr "Ekstern visning"
-
-#: mail/mail-display.c:1368
-msgid "Downloading images"
-msgstr "Henter billeder"
-
-#: mail/mail-display.c:1545
-msgid "Loading message content"
-msgstr "Indlæser beskedsindhold"
-
-#: mail/mail-display.c:1887
-msgid "Overdue:"
-msgstr "Overskredet:"
-
-#: mail/mail-display.c:1891
-msgid "by %B %d, %Y, %l:%M %P"
-msgstr "den %d. %B %Y %H:%M"
-
-#: mail/mail-display.c:2255
-msgid "Open Link in Browser"
-msgstr "Åbn henvisning i netlæser"
-
-#: mail/mail-display.c:2256
-msgid "Copy Link Location"
-msgstr "Kopiér henvisning"
-
-#: mail/mail-display.c:2258
-msgid "Save Link as (FIXME)"
-msgstr "Gem henvisning som"
-
-#: mail/mail-display.c:2260
-msgid "Save Image as..."
-msgstr "Gem billede som..."
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: mail/mail-format.c:665
-#, c-format
-msgid "%s attachment"
-msgstr "%s-bilag"
-
-#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
-#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
-
-#: mail/mail-format.c:785 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dato"
-
-#: mail/mail-format.c:871
-msgid "Bad Address"
-msgstr "Ugyldig e-post-adresse:"
-
-#: mail/mail-format.c:912 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Fra"
-
-#: mail/mail-format.c:916
-msgid "Reply-To"
-msgstr "Svar-til"
-
-#: mail/mail-format.c:921 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Til"
-
-#: mail/mail-format.c:926
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/mail-format.c:931
-msgid "Bcc"
-msgstr "Bcc:"
-
-#: mail/mail-format.c:1482
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Denne besked er digitalt signeret. For flere informationer, klik på "
-"låsikonen."
-
-#: mail/mail-format.c:1510
-msgid "Could not create a PGP verfication context"
-msgstr "Kunne ikke oprette en PGP-verifieringssammenhæng"
-
-#: mail/mail-format.c:1518
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Denne besked er digitalt signeret og er fundet autentisk."
-
-#: mail/mail-format.c:1525
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
-
-#: mail/mail-format.c:1789
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Peger til FTP-server (%s)"
-
-#: mail/mail-format.c:1800
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\""
-
-#: mail/mail-format.c:1803
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Peger til lokal fil (%s)"
-
-#: mail/mail-format.c:1830
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Peger til eksterne data (%s)"
-
-#: mail/mail-format.c:1836
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
-
-#: mail/mail-format.c:1838
-msgid "Malformed external-body part."
-msgstr "Fejludformet del for ekstern-krop."
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokale mapper/%s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:711
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:792
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13285,22 +13012,22 @@ msgstr ""
 "Kan ikke gemme mappemetainformation; du vil måske\n"
 "opdage at du ikke kan åbne denne mappe længere: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:848
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke gemme metainformation om mappe på: %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:900
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformation for mappe %s: %s"
 
-#: mail/mail-local.c:1323
+#: mail/mail-local.c:1363
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Ændrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1388
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13308,16 +13035,16 @@ msgstr ""
 "Hvis du ikke kan åbne denne postboks igen må\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1448
+#: mail/mail-local.c:1488
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurér /%s igen"
 
-#: mail/mail-local.c:1512
+#: mail/mail-local.c:1552
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan ikke ændre format på en ikke-lokal mappe."
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:259
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13326,7 +13053,7 @@ msgstr ""
 "Fejl under '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:262
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13335,118 +13062,131 @@ msgstr ""
 "Fejl under udførsel af operation:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:913
 msgid "Working"
 msgstr "Arbejder"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:87
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:550 mail/mail-ops.c:579
-msgid "However, the message was successfully sent."
-msgstr "Fuldførte alligevel sending af beskeden."
+#: mail/mail-ops.c:557
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
+
+#: mail/mail-ops.c:578
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: mail/mail-ops.c:587
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender besked %d af %d"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fejlet på besked %d af %d"
 
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr "Fuldført."
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "Gemmer besked til mappe"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åbner mappe %s"
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr "Åbner lager %s"
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1666
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importerer %s som %s"
 
-#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter besked %s"
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d beskeder"
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gemmer %d beskeder"
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13455,7 +13195,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13464,11 +13204,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13477,106 +13217,74 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Besked uden titel)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Besked uden titel"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Tom besked"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "Find i besked"
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr "Skeln mellem store og små bogstaver"
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "Søg fremad"
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr "Find:"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Træffere:"
-
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr "Afbryder..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Type: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sti: %s, Type: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:259
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:308
 msgid "Send & Receive Mail"
 msgstr "Send & modtag e-post"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 msgid "Cancel _All"
 msgstr "Afbryd _alle"
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:390
 msgid "Updating..."
 msgstr "Opdaterer..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:229
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:262
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:264
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:287
 msgid "_Remember this password"
 msgstr "Husk denne adgangs_kode"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:288
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Husk denne adgangskode for resten af denne session"
 
@@ -13624,21 +13332,17 @@ msgstr "Videresendt besked - %s"
 msgid "Forwarded message"
 msgstr "Videresendt besked"
 
-#: mail/mail-tools.c:438
-msgid "Forwarded Message"
-msgstr "Videresendt besked"
-
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Opsætter vmappe: %s"
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:209
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Opdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:467
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13651,100 +13355,95 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:776
 msgid "VFolders"
 msgstr "Virtuelle mapper "
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:834
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:873
 msgid "Edit VFolder"
 msgstr "Rediger Virtuel mappe"
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøver at redigere en vfolder '%s' som ikke eksisterer."
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:965
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Uden emne)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - Besked"
-
-#: mail/message-list.c:741
+#: mail/message-list.c:900
 msgid "Unseen"
 msgstr "Ulæst"
 
-#: mail/message-list.c:742
+#: mail/message-list.c:901
 msgid "Seen"
 msgstr "Læst"
 
-#: mail/message-list.c:743
+#: mail/message-list.c:902
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:903
 msgid "Multiple Unseen Messages"
 msgstr "Flere ulæste beskeder"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:904
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:908
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:909
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:754
+#: mail/message-list.c:913
 msgid "Higher"
 msgstr "Højere"
 
-#: mail/message-list.c:755
+#: mail/message-list.c:914
 msgid "Highest"
 msgstr "Højest"
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1231
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1238
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1247
 msgid "Yesterday %l:%M %p"
 msgstr "I går %H:%M"
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1259
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1267
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1269
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3062
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Dato"
+
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Skal afleveres den"
@@ -13761,6 +13460,10 @@ msgstr "Mærket"
 msgid "Follow Up Flag"
 msgstr "Opfølgningsflag"
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Fra"
+
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Oprindelig plads"
@@ -13773,6 +13476,10 @@ msgstr "Modtaget"
 msgid "Size"
 msgstr "Størrelse"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Til"
+
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Ring"
@@ -13789,7 +13496,7 @@ msgstr "Følg op"
 msgid "For Your Information"
 msgstr "For information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr "Videresend"
 
@@ -13797,11 +13504,11 @@ msgstr "Videresend"
 msgid "No Response Necessary"
 msgstr "Intet svar krævet"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -13833,39 +13540,6 @@ msgstr "_Skal leveres den:"
 msgid "_Flag:"
 msgstr "_Flag:"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "Søger i mapper under %s på \"%s\""
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "Søger i mapper på rod-niveau på \"%s\""
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Abonnerer på mappe \"%s\""
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Fjerner abonnement på mappe \"%s\""
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Mappe"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "Ingen server er valgt"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Venligst vælg en server."
-
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Mappeabonnementer"
@@ -13879,17 +13553,125 @@ msgid "S_erver:"
 msgstr "S_erver:"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Scanning folders ..."
-msgstr "Gennemsøger mapper ..."
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Mappe som indeholder Evolution sammendrag"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A %e. %B %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Venligst vent..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Udskriv sammendrag"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Fejl under udskrift af sammendrag"
+
+#: my-evolution/e-summary-calendar.c:384
+msgid "Appointments"
+msgstr "Aftaler"
+
+#: my-evolution/e-summary-calendar.c:392
+msgid "No appointments."
+msgstr "Ingen aftaler."
+
+#: my-evolution/e-summary-calendar.c:409
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:411
+#, fuzzy
+msgid "%l:%M%p %d %B"
+msgstr "%l: %M %d %B"
+
+#: my-evolution/e-summary-calendar.c:429
+msgid "No description"
+msgstr "Inegn beskrivelse"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "E-post-sammendrag"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Ord for dagen"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Dagens citater"
+
+#: my-evolution/e-summary-preferences.c:565
+#, fuzzy
+msgid "New News Feed"
+msgstr "Nyhedstjenester"
+
+#: my-evolution/e-summary-preferences.c:581
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Fejl under nedhentning af RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Nyhedstjenester"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Alle"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Viste"
+
+#: my-evolution/e-summary-tasks.c:349
+msgid "No tasks"
+msgstr "Ingen opgaver"
+
+#: my-evolution/e-summary-tasks.c:387
+#, fuzzy
+msgid "blue"
+msgstr "Ambler"
+
+#: my-evolution/e-summary-tasks.c:387
+msgid "(No Description)"
+msgstr "(Ingen beskrivelse)"
+
+#: my-evolution/e-summary-weather.c:72
+msgid "My Weather"
+msgstr "Min vejrbesked"
+
+#: my-evolution/e-summary-weather.c:261
+msgid "There was an error downloading data for"
+msgstr "Et fejl opstod ved hentning af data for"
+
+#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Vejr"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:582
+msgid "KBOS"
+msgstr "KBOS"
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Konfigurér udseendet af Evolution-sammenfatningerne."
@@ -23695,113 +23477,6 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zürich"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Mappe som indeholder Evolution sammendrag"
-
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr "Aftaler"
-
-#: my-evolution/e-summary-calendar.c:389
-msgid "No appointments."
-msgstr "Ingen aftaler."
-
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:408
-#, fuzzy
-msgid "%l:%M%P %d %B"
-msgstr "%l: %M %d %B"
-
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr "Inegn beskrivelse"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "E-post-sammendrag"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Ord for dagen"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Dagens citater"
-
-#: my-evolution/e-summary-preferences.c:565
-#, fuzzy
-msgid "New News Feed"
-msgstr "Nyhedstjenester"
-
-#: my-evolution/e-summary-preferences.c:581
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Fejl under nedhentning af RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Nyhedstjenester"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Alle"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Viste"
-
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr "Ingen opgaver"
-
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr "(Ingen beskrivelse)"
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Min vejrbesked"
-
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr "Et fejl opstod ved hentning af data for"
-
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Vejr"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr "KBOS"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A %e. %B %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Venligst vent..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Udskriv sammendrag"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Fejl under udskrift af sammendrag"
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -25067,21 +24742,27 @@ msgstr "_En dag"
 msgid "_Show full path for folders"
 msgstr "V_is fuld sti for mapper"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Konfigurér opførsel for specialmapper og frakoblede mapper her"
+#: notes/component-factory.c:27
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Ny"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution skallen"
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Opret en ny mappe"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution mappeindstillingsopsætnings-styreelement"
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Mappeindstillinger"
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Kunne ikke initialisere Bonobo"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25176,6 +24857,49 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Bragt til dig af"
 
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Kan ikke aktivere komponenten %s:\n"
+"Fejlen fra aktiveringssystemet er:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan ikke opsætte lokal lagring -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Evolution-komponenten som håndterer mapper af type \"%s\"\n"
+"er afsluttet uventet. Du må afslutte Evolution og genstarte\n"
+"for at få adgang til disse data igen."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Ugyldige argumenter"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Kan ikke registrere i OAF"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Konfigurationsdatabase ikke fundet"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Generisk fejl"
+
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Ekstra udfyldningsmapper"
@@ -25264,26 +24988,31 @@ msgstr ""
 "Kunne ikke ændre navn på mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:538
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ændr navn på mappe \"%s\" til:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:541
 msgid "Rename Folder"
 msgstr "Ændr navn på mappe"
 
-#: shell/e-shell-folder-commands.c:553
+#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Specificeret mappenavn er ikke gyldigt: %s"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr "Den valgte mappe tilhører ikke en anden bruger"
 
-#: shell/e-shell-folder-commands.c:590
+#: shell/e-shell-folder-commands.c:587
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25327,11 +25056,19 @@ msgstr ""
 "Du kan vælge \"Automatisk\" hvis du ikke véd, så vil Evolution prøve at "
 "finde ud af hvilken type det er for dig."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
 msgid "Please select the information that you would like to import:"
 msgstr "Venligst vælg information du ønsker at importere:"
 
-#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
+#: shell/e-shell-importer.c:151
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25340,21 +25077,21 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opføring %d."
 
-#: shell/e-shell-importer.c:317
+#: shell/e-shell-importer.c:323
 msgid "Select importer"
 msgstr "Vælg importør"
 
-#: shell/e-shell-importer.c:458
+#: shell/e-shell-importer.c:464
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
-#: shell/e-shell-importer.c:518
+#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
+#: shell/e-shell-importer.c:524
 msgid "Evolution Error"
 msgstr "Evolution fejl"
 
-#: shell/e-shell-importer.c:475
+#: shell/e-shell-importer.c:481
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25363,11 +25100,11 @@ msgstr ""
 "Ingen importerer som kan håndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:484
+#: shell/e-shell-importer.c:490
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25376,17 +25113,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:503
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid "Error starting %s"
 msgstr "Fejl under start af %s"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:523
 #, c-format
 msgid "Error loading %s"
 msgstr "Fejl under indlæsning af %s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:540
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25395,31 +25132,35 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opføring 1."
 
-#: shell/e-shell-importer.c:588
+#: shell/e-shell-importer.c:594
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:637
-msgid "Filename:"
+#: shell/e-shell-importer.c:643
+#, fuzzy
+msgid "_Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr "Vælg en fil"
 
-#: shell/e-shell-importer.c:651
-msgid "File type:"
+#: shell/e-shell-importer.c:658
+#, fuzzy
+msgid "File _type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:676
-msgid "Import data and settings from older programs"
+#: shell/e-shell-importer.c:684
+#, fuzzy
+msgid "Import data and settings from _older programs"
 msgstr "Importer data og indstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:680
-msgid "Import a single file"
+#: shell/e-shell-importer.c:687
+#, fuzzy
+msgid "Import a _single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
+#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25427,25 +25168,26 @@ msgstr ""
 "Venligst vent...\n"
 "Søger efter eksisterende opsætning"
 
-#: shell/e-shell-importer.c:749
+#: shell/e-shell-importer.c:758
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent importering"
 
-#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
+#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1047
+#: shell/e-shell-importer.c:1061
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: shell/e-shell-importer.c:1048
+#: shell/e-shell-importer.c:1062
 msgid "Select a destination folder for importing this data"
 msgstr "Vælg en målmappe til at importere data"
 
-#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
-msgid "Import"
+#: shell/e-shell-importer.c:1193
+#, fuzzy
+msgid "_Import"
 msgstr "Importér"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25505,11 +25247,19 @@ msgstr "Kunne ikke åbne den delte mappe: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikke oprette den angivne delte mappe."
 
-#: shell/e-shell-user-creatable-items-handler.c:586
-#: shell/e-shell-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Ny"
+#: shell/e-shell-startup-wizard.c:771
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:782
+#, fuzzy
+msgid "Quit Assistant"
+msgstr "Assistent"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25531,6 +25281,35 @@ msgstr "Mappenavn kan ikke indeholde følgende tegn \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' og '..' er reserverede mappenavne."
 
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Ingen mappe vist)"
+
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(Ingen)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution er koblet til. Klik på denne knap for at arbejde frakoblet."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution er i færd med at koble fra."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution er frakoblet. Klik på denne knap for at arbejde tilkoblet."
+
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -25581,77 +25360,13 @@ msgstr "Ar_bejd frakoblet"
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Ingen)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution er koblet til. Klik på denne knap for at arbejde frakoblet."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution er i færd med at koble fra."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution er frakoblet. Klik på denne knap for at arbejde tilkoblet."
-
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Kan ikke aktivere komponenten %s:\n"
-"Fejlen fra aktiveringssystemet er:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan ikke opsætte lokal lagring -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Evolution-komponenten som håndterer mapper af type \"%s\"\n"
-"er afsluttet uventet. Du må afslutte Evolution og genstarte\n"
-"for at få adgang til disse data igen."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Ugyldige argumenter"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Kan ikke registrere i OAF"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Konfigurationsdatabase ikke fundet"
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Fejl ved gemning af genveje."
 
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Generisk fejl"
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Genveje"
 
 #: shell/e-shortcuts-view.c:80
 msgid "Create New Shortcut Group"
@@ -25766,18 +25481,6 @@ msgstr "_Fjern"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne genvej fra genvejslinjen"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Fejl ved gemning af genveje."
-
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Genveje"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Afkrydsningsboks"
-
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Ingen fejl"
@@ -25834,6 +25537,14 @@ msgstr "Kan ikke oprette en mappe med det navn"
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Denne handling kan ikke udføres i frakoblet tilstand"
 
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Afkrydsningsboks"
+
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Mappe"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25848,103 +25559,103 @@ msgstr "%s (%d%% fuldført)"
 msgid "<click here to select a folder>"
 msgstr "<klik her for at vælge en mappe>"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Ukendt fejl."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Fejlen fra komponentsystemet er:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Fejlen fra aktiveringssystemet er:\n"
-"%s"
-
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr "CORBA-fejl"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1189
 msgid "Interrupted"
 msgstr "Afbrudt"
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1191
 msgid "Invalid argument"
 msgstr "Ugyldige argumenter"
 
-#: shell/evolution-shell-component.c:1190
+#: shell/evolution-shell-component.c:1193
 msgid "Already has an owner"
 msgstr "Har en ejer allerede"
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1195
 msgid "No owner"
 msgstr "Ingen ejer"
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1197
 msgid "Not found"
 msgstr "Ikke fundet"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1199
 msgid "Unsupported type"
 msgstr "En ikke-understøttet type"
 
-#: shell/evolution-shell-component.c:1198
+#: shell/evolution-shell-component.c:1201
 msgid "Unsupported schema"
 msgstr "Et ikke understøttet skema"
 
-#: shell/evolution-shell-component.c:1200
+#: shell/evolution-shell-component.c:1203
 msgid "Unsupported operation"
 msgstr "En ikke-understøttet handling"
 
-#: shell/evolution-shell-component.c:1202
+#: shell/evolution-shell-component.c:1205
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: shell/evolution-shell-component.c:1206
+#: shell/evolution-shell-component.c:1209
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:1208
+#: shell/evolution-shell-component.c:1211
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1212
+#: shell/evolution-shell-component.c:1215
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1214
+#: shell/evolution-shell-component.c:1217
 msgid "No space left"
 msgstr "Ingen plads tilbage"
 
-#: shell/evolution-shell-component.c:1216
+#: shell/evolution-shell-component.c:1219
 msgid "Old owner has died"
 msgstr "Tidligere ejer er død FIXME"
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Ukendt fejl."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Fejlen fra komponentsystemet er:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Fejlen fra aktiveringssystemet er:\n"
+"%s"
+
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Testtype"
@@ -26051,6 +25762,22 @@ msgstr ""
 "\n"
 "Klik på knappen \"Afslut\" for at gemme dine indstillinger. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Konfigurér opførsel for specialmapper og frakoblede mapper her"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution skallen"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution mappeindstillingsopsætnings-styreelement"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Mappeindstillinger"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klik \"Importér\" for at starte import af filen til Evolution."
@@ -26089,6 +25816,10 @@ msgstr ""
 msgid "Importers"
 msgstr "Importerere"
 
+#: shell/importer/intelligent.c:191
+msgid "Import"
+msgstr "Importér"
+
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Importér ikke"
@@ -26278,7 +26009,7 @@ msgstr "Flyt kontakter til en anden mappe..."
 msgid "Move to Folder..."
 msgstr "Flyt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "Indsæt fra klippebordet"
 
@@ -26286,9 +26017,9 @@ msgstr "Indsæt fra klippebordet"
 msgid "Previews the contacts to be printed"
 msgstr "Forhåndsviser kontakterne som skal skrives ud"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning af udskrift"
 
@@ -26332,17 +26063,21 @@ msgstr "Stop indlæsning"
 msgid "View the current contact"
 msgstr "Vis den aktuelle kontakt"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "K_opiér til mappe..."
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt..."
 
@@ -26410,46 +26145,61 @@ msgstr "Gå til en specifik dato"
 msgid "Go to today"
 msgstr "Gå til i dag"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "Måned"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr "Forhåndsviser kalenderen som skal skrives ud"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Udskriv denne kalender"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Udgiv ledig/optaget information for denne kalender"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#, fuzzy
+msgid "Purg_e"
+msgstr "Bourges"
+
+#: ui/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Purge old appointments and meetings"
+msgstr "Offentlig mappe som indeholder mødelser og hændelser"
+
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Show as list"
+msgstr "Vis detaljer"
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr "Vis en uge"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Vis arbejdsugen"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr "Uge"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Luk"
@@ -26458,7 +26208,7 @@ msgstr "Luk"
 msgid "Close this item"
 msgstr "Luk denne opføring"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Slet denne opføring"
 
@@ -26471,47 +26221,58 @@ msgstr "Hovedværktøjslinje"
 msgid "Preview the printed item"
 msgstr "Forhåndsvisning af opføring som skal skrives ud"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Udskriv denne opføring"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Gem"
-
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
-msgstr "Gem som..."
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Gem _som..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Gem og luk"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save and _Close"
+msgstr "Gem og luk"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
 msgstr "Gem opføringen og luk dialogboksen"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr "Gem denne opføring på disk"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fil"
 
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Gem"
+
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiér markerede meddelelser til klippebord"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Klip u_d"
 
@@ -26532,51 +26293,39 @@ msgstr "Vælg _alle"
 msgid "Select all text"
 msgstr "Vælg hele teksten"
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr "Udskriv konvolut..."
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Gem _som..."
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
 msgstr "Gem kontakten og luk dialogboksen"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
 msgstr "Send _besked til kontakt..."
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Gem"
-
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
 msgstr "Slet denne liste"
 
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
-msgstr "Slet..."
-
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
 msgstr "Gem listen og luk dialogboksen"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."
 msgstr "Se_nd liste til andre..."
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
 msgid "Send _message to list..."
 msgstr "Send _besked til liste..."
 
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Slet..."
+
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Aflys mø_de"
@@ -26650,7 +26399,8 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Fjern alle slettede beskeder fra alle mapper permanent"
 
 #: ui/evolution-mail-global.xml.h:11
-msgid "Post New Message"
+#, fuzzy
+msgid "Post Ne_w Message"
 msgstr "Post ny meddelelse"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26685,14 +26435,19 @@ msgstr "_Forhåndsvisningsvindue"
 msgid "Change the properties of this folder"
 msgstr "Ændr egenskaber for denne mappe"
 
-#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopiér markerede meddelelser til klippebord"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Klip markerede meddelelser ud til klippebord"
 
+#: ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "E_xpunge"
+msgstr "_Fjern slettede beskeder"
+
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Skjul valgt_e beskeder"
@@ -26711,14 +26466,15 @@ msgid ""
 msgstr "Skjul slettede beskeder i stedet for at vise dem gennemstreget"
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as R_ead"
+#, fuzzy
+msgid "Mark All as _Read"
 msgstr "Markér alle som l_æst"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Markér alle synlige beskeder som læst"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
 msgid "Paste message(s) from the clipboard"
 msgstr "Indsæt meddelelsen fra klippebord"
 
@@ -26762,26 +26518,37 @@ msgstr "Skjul valgte beskeder midlertidigt"
 msgid "Threaded Message list"
 msgstr "Beskedsliste med tråde"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
-msgid "_Expunge"
-msgstr "_Fjern slettede beskeder"
-
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "M_appe"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Re_versér udvalg"
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Egenska_ber..."
 
-#: ui/evolution-mail-list.xml.h:31
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "Beskedsliste med _tråde"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Luk dette vindue"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "L_uk"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Vis"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "_Tilføj afsenderen i adressebogen"
@@ -26799,401 +26566,413 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Aktivér filterregler på de valgte beskeder"
 
 #: ui/evolution-mail-message.xml.h:5
+#, fuzzy
+msgid "Caret _Mode"
+msgstr "Tekstmodel"
+
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Skriv et svar til alle modtagere af den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-post-listen for den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til afsender af den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Kopiér valgte beskeder til en anden mappe"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lav en regel for at filtrere beskeder fra denne afsender"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lav en regel for at filtrere beskeder til disse modtagere"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lav en regel for at filtrere beskeder til denne beskedsliste"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lav en regel for filtrering af beskeder med dette emne"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr "Lav en virtuel mappe for disse modtagere"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr "Lav en virtuel mappe for denne e-post-liste"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr "Lav en virtuel mappe for denne afsender"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr "Lav en virtuel mappe for dette emne"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Formindsk tekstens størrelse"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Vis næste vigtige besked"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Vis næste besked"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Vis næste ulæste besked"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Vis næste ulæste tråd"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Vis forrige vigtige besked"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Vis forrige besked"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Vis forrige ulæste besked"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "F_orward"
 msgstr "_Videresend"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "Filtrér på e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Filtrér på se_nder..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Filtrér på modtage_re..."
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Filtrér på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:37
 msgid "Flag selected message(s) for follow-up"
 msgstr "Markér markerede meddelelser for opfølgning"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:38
 msgid "Follow _Up..."
 msgstr "Følg _op..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen indlæsning af billeder i HTML-baseret e-post"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte besked i kroppen af en ny besked"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte besked citeret som et svar"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte besked til nogen"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte besked til nogen som et bilag"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:45
 msgid "Increase the text size"
 msgstr "Forøg tekstens størrelse"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:46
 msgid "Load _Images"
 msgstr "Indlæs b_illeder"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr "Mar_kér som læst"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr "Markér som _vigtig"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as U_nread"
 msgstr "Markér som _ulæst"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as Unimp_ortant"
 msgstr "Markér som uv_igtig"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as having been read"
 msgstr "Markér de valgte beskeder som læste"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as important"
 msgstr "Markér de valgte beskeder som vigtige"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Markér de valgte beskeder som ulæste"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Markér de valgte beskeder som uvigtige"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Markér de valgte beskeder for sletning"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:56
 msgid "Move"
 msgstr "Flyt"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:57
 msgid "Move selected message(s) to another folder"
 msgstr "Flyt de valgte beskeder til en anden mappe"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Næste"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr "Næste _vigtige meddelelse"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "Næste _tråd"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "Næste _ulæste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:62
 msgid "Open the selected message in a new window"
 msgstr "Åbn valgt besked i et nyt vindue"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:63
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Åbn valgt besked i redigeringsvinduet for at sende den igen"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:64
 msgid "Original Si_ze"
 msgstr "Oprindelig _størrelse"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:65
 msgid "P_revious Unread Message"
 msgstr "F_oregående ulæste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:62
-msgid "Post a Reply"
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Post a Repl_y"
 msgstr "Post et svar"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:68
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post et svar til en meddelelse i en offentlig mappe"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:69
 msgid "Pr_evious Important Message"
 msgstr "Fo_regående vigtige meddelelse"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:70
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis beskeden som skal skrives ud"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:71
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:74
 msgid "Print this message"
 msgstr "Udskriv denne besked"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:75
 msgid "Re_direct"
 msgstr "_Omdirigér"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:76
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdirigér (bounce) den markerede meddelelse til nogen"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "Svar til _alle"
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr "Svar til _listen"
+
+#: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr "Nulstil tekststørrelsen til den oprindelige"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch Message..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "S_earch in Message..."
 msgstr "Søg i b_esked..."
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "S_maller"
 msgstr "_Mindre"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
 msgid "Save the message as a text file"
 msgstr "Gem beskeden som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:85
 msgid "Search for text in the body of the displayed message"
 msgstr "Søg efter tekst i kroppen af vist besked"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:86
 msgid "Set up the page settings for your current printer"
 msgstr "Konfigurér sideindstillingerne for din aktuelle printer"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show Full _Headers"
 msgstr "Vis brevets _kildetekst"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Søg efter tekst i kroppen af vist besked"
+
+#: ui/evolution-mail-message.xml.h:90
 msgid "Show message in the normal style"
 msgstr "Vis besked i normal stíl"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Show message with all email headers"
 msgstr "Vis besked med fulde e-post-headere"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post-beskeden i sin rå form"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Text Si_ze"
 msgstr "Tekst-større_lse"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr "Fortryd sletning af den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "VFolder on Mailing _List..."
 msgstr "Virtuel mappe for e-post-_liste..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "VFolder on Se_nder..."
 msgstr "Virtuel mappe for afse_nder..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "VFolder on _Recipients..."
 msgstr "Virtuel mappe for modtage_re..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "VFolder on _Subject..."
 msgstr "Virtuel mappe for e_mne..."
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Vedlagt"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Create Filter From Message"
 msgstr "_Opret filter fra besked"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Forward Message"
 msgstr "_Videresend besked"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Inline"
 msgstr "_Inlejret"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Message Display"
 msgstr "_Beskedsvisning"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Move to Folder"
 msgstr "_Flyt til mappe"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Next Message"
 msgstr "_Næste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Open Message"
 msgstr "_Åbn besked"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Previous Message"
 msgstr "_Foregående meddelelse"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Quoted"
 msgstr "_Citeret"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr "Sva_r til sender"
+
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Resend..."
 msgstr "Send igen..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Værktøjer"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Undelete"
 msgstr "Fortryd sletning"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Luk dette vindue"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "L_uk"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Vis"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Vedlæg"
@@ -27202,7 +26981,7 @@ msgstr "Vedlæg"
 msgid "Attach a file"
 msgstr "Vedlæg en fil"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Luk aktiv fil"
 
@@ -27218,7 +26997,7 @@ msgstr "Kryptér denne besked med PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Kryptér denne besked med dit S/MIME krypteringscertifikat"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "For_matér"
 
@@ -27250,6 +27029,11 @@ msgstr "Kryptér med S/MIME"
 msgid "S/MIME Sign"
 msgstr "Signér med S/MIME"
 
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Gem"
+
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Gem som"
@@ -27263,7 +27047,7 @@ msgid "Save in folder..."
 msgstr "Gem i mappe..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Gem aktiv fil"
 
@@ -27280,7 +27064,7 @@ msgid "Send"
 msgstr "Send"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Send beskeden i HTML-format"
 
@@ -27345,7 +27129,7 @@ msgid "_From Field"
 msgstr "_Fra-felt"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Indsæt"
 
@@ -27361,11 +27145,11 @@ msgstr "Svar-til felt"
 msgid "_Security"
 msgstr "_Sikkerhed"
 
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Gem den aktuelle fil og luk vinduet"
 
@@ -27441,15 +27225,20 @@ msgstr "Slet valgte opgaver"
 msgid "Mar_k as Complete"
 msgstr "Mar_kér som færdig"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Mark selected tasks as complete"
+msgstr "_Markér valgte opgaver som komplette"
+
+#: ui/evolution-tasks.xml.h:11
 msgid "Paste task from the clipboard"
 msgstr "Indsæt opgave fra klippeborder"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Previews the list of tasks to be printed"
 msgstr "Forhåndsgransker listen af opgaver som skal skrives ud"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:14
 msgid "Print the list of tasks"
 msgstr "Udskriv listen med opgaver"
 
@@ -27698,27 +27487,33 @@ msgid "_Work Week View"
 msgstr "_Arbejdsugesvisning"
 
 #: views/mail/galview.xml.h:1
-msgid "As Sent Folder"
+#, fuzzy
+msgid "As _Sent Folder"
 msgstr "Som ud-mappe"
 
 #: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr "Efter opfølgningsflag"
+#, fuzzy
+msgid "By S_tatus"
+msgstr "Efter status"
 
 #: views/mail/galview.xml.h:3
-msgid "By Sender"
+#, fuzzy
+msgid "By Se_nder"
 msgstr "Efter afsender"
 
 #: views/mail/galview.xml.h:4
-msgid "By Status"
-msgstr "Efter status"
+#, fuzzy
+msgid "By Su_bject"
+msgstr "Efter emne"
 
 #: views/mail/galview.xml.h:5
-msgid "By Subject"
-msgstr "Efter emne"
+#, fuzzy
+msgid "By _Follow Up Flag"
+msgstr "Efter opfølgningsflag"
 
 #: views/mail/galview.xml.h:6
-msgid "Messages"
+#, fuzzy
+msgid "_Messages"
 msgstr "Beskeder"
 
 #: views/tasks/galview.xml.h:1
@@ -27777,20 +27572,20 @@ msgstr "Definér visninger..."
 
 #. 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:427
+#: widgets/misc/e-calendar-item.c:456
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
+#: widgets/misc/e-calendar-item.c:1174
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
 msgid "Now"
 msgstr "nu"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
 msgid "Today"
 msgstr "I dag"
 
@@ -27907,22 +27702,6 @@ msgstr "_Redigér gemte søgninger..."
 msgid "_Advanced..."
 msgstr "_Avanceret..."
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr "Information"
-
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr "Fejl"
-
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr "Spørgsmål"
-
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr "Besked"
-
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Søg"
@@ -27968,6 +27747,537 @@ msgstr "Evolution kalender lokalfil-backend"
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolution adressebog lokalfil-backend"
 
+#~ msgid "That person is already attending the meeting!"
+#~ msgstr "Denne person er allerede sat op til dette møde!"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "_Save as..."
+#~ msgstr "_Gem som..."
+
+#~ msgid "End Date"
+#~ msgstr "Slutdato"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Ny _aftale"
+
+#~ msgid "Print..."
+#~ msgstr "Udskriv..."
+
+#~ msgid "Chair Persons"
+#~ msgstr "Formænd"
+
+#~ msgid "Required Participants"
+#~ msgstr "Obligatoriske deltagere"
+
+#~ msgid "Optional Participants"
+#~ msgstr "Valgfrie deltagere"
+
+#~ msgid "Resources"
+#~ msgstr "Ressourcer"
+
+#~ msgid "Individual"
+#~ msgstr "Individuel"
+
+#~ msgid "Group"
+#~ msgstr "Gruppe"
+
+#~ msgid "Resource"
+#~ msgstr "Ressourse"
+
+#~ msgid "Room"
+#~ msgstr "Rum"
+
+#~ msgid "Chair"
+#~ msgstr "Formand"
+
+#~ msgid "Required Participant"
+#~ msgstr "Obligatorisk deltager"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Valgfri deltager"
+
+#~ msgid "Non-Participant"
+#~ msgstr "Ikke-deltager"
+
+#~ msgid "Needs Action"
+#~ msgstr "Behøver handling"
+
+#~ msgid "Delegated"
+#~ msgstr "Delegeret"
+
+#~ msgid "In Process"
+#~ msgstr "I gang"
+
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Egenskaber for \"%s\""
+
+#~ msgid "Properties"
+#~ msgstr "Egenskaber"
+
+#~ msgid "Could not create temporary directory: %s"
+#~ msgstr "Kunne ikke oprette midlertidigt katalog: %s"
+
+#~ msgid "%d new"
+#~ msgstr "%d nye"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "%d hidden"
+#~ msgstr "%d skjulte"
+
+#~ msgid "%d visible"
+#~ msgstr "%d synlige"
+
+#~ msgid "%d selected"
+#~ msgstr "%d valgte"
+
+#~ msgid "%d unsent"
+#~ msgstr "%d usendte"
+
+#~ msgid "%d sent"
+#~ msgstr "%d sendte"
+
+#~ msgid "%d total"
+#~ msgstr "%d totalt"
+
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "Opret _virtuel mappe fra søgning..."
+
+#~ msgid "VFolder on _Subject"
+#~ msgstr "Virtuel mappe for e_mnet"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "Virtuel mappe for afse_nder"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "Virtuel mappe for modtage_re"
+
+#~ msgid "VFolder on Mailing _List"
+#~ msgstr "Virtuel mappe på e-post-_liste"
+
+#~ msgid "Filter on Sub_ject"
+#~ msgstr "Filtrér på em_ne"
+
+#~ msgid "Filter on Sen_der"
+#~ msgstr "Filtrér på afsen_der"
+
+#~ msgid "Filter on Re_cipients"
+#~ msgstr "Filtrér på modta_gere"
+
+#~ msgid "Filter on _Mailing List"
+#~ msgstr "Filtrér på e-_postliste"
+
+#~ msgid "_Edit as New Message..."
+#~ msgstr "R_edigér som ny besked..."
+
+#~ msgid "_Print"
+#~ msgstr "S_kriv ud"
+
+#~ msgid "_Forward"
+#~ msgstr "_Videresend"
+
+#~ msgid "Follo_w Up..."
+#~ msgstr "Føl_g op..."
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "Marker færdi_ge med flag"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Neutralis_er flag"
+
+#~ msgid "Mark as _Unread"
+#~ msgstr "Marker som _ulæst"
+
+#~ msgid "Mark as _Important"
+#~ msgstr "Markér som v_igtig"
+
+#~ msgid "_Mark as Unimportant"
+#~ msgstr "Markér som uvi_gtig"
+
+#~ msgid "U_ndelete"
+#~ msgstr "_Fortryd sletning"
+
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "Fl_yt til mappe..."
+
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Tilføj afsenderen til adresse_bogen"
+
+#~ msgid "Appl_y Filters"
+#~ msgstr "Anvend filtre"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Ska_b regel fra meddelelse"
+
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "Virtuele mappe på postliste"
+
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Filtre på postliste (%s)"
+
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "Virtuel mappe på postliste (%s)"
+
+#~ msgid "Don't show this message again."
+#~ msgstr "Vis ikke denne besked igen."
+
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "Du har ikke konfigureret e-post-klienten.\n"
+#~ "Du skal gøre dette før du kan sende,\n"
+#~ "modtage eller skrive beskeder.\n"
+#~ "Vil du konfigurere den nu?"
+
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Du skal konfigurere en identitet\n"
+#~ "før du kan skrive e-post."
+
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Du skal konfigurere en e-post-transport\n"
+#~ "før du kan skrive e-post."
+
+#~ msgid ""
+#~ "You are sending an HTML-formatted message. Please make sure that\n"
+#~ "the following recipients are willing and able to receive HTML mail:\n"
+#~ msgstr ""
+#~ "Du sender et HTML-formaterat brev. Sørg for at følgende\n"
+#~ "modtagere ønsker, og kan modtage, HTML-formateret e-post:\n"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Send alligevel?"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Denne besked har ikke et emne.\n"
+#~ "Send alligevel?"
+
+#~ msgid ""
+#~ "Since the contact list you are sending to is configured to hide the "
+#~ "list's addresses, this message will contain only Bcc recipients."
+#~ msgstr ""
+#~ "Siden kontaktlisten du sender til er konfigureret til at skjule listens "
+#~ "adresser vil denne besked kun indeholde Bcc-modtagere."
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "Denne besked indeholder kun Bcc-modtagere."
+
+#~ msgid ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "Det er muligt at e-post-serveren kan vise modtagerne ved at tilføje en "
+#~ "\"Apparently-To\" header.\n"
+#~ "Send alligevel?"
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "Du skal specificere modtagere for at kunne sende denne besked."
+
+#~ msgid ""
+#~ "Unable to open the drafts folder for this account.\n"
+#~ "Would you like to use the default drafts folder?"
+#~ msgstr ""
+#~ "Kunne ikke åbne skitse-mappen for denne konto.\n"
+#~ "Vil du bruge standard skitse-mappe?"
+
+#~ msgid "an unknown sender"
+#~ msgstr "en ukendt afsender"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+#~ msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
+
+#~ msgid "Move message(s) to"
+#~ msgstr "Flyt beskeder til"
+
+#~ msgid "Copy message(s) to"
+#~ msgstr "Kopiér beskeder til"
+
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "Er du sikker på at du vil redigere alle %d beskeder?"
+
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Du kan kun redigere beskeder gemt\n"
+#~ "i Skitser-kataloget."
+
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Du kan kun sende beskeder igen\n"
+#~ "som er gemt i sendt-kataloget."
+
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr "Er du sikker på at du vil sende alle %d beskederne igen?"
+
+#~ msgid "No Message Selected"
+#~ msgstr "Ingen besked valgt"
+
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Kan ikke gemme til \"%s\":\n"
+#~ " %s"
+
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "\"%s\" findes allerede.\n"
+#~ "Vil du overskrive den?"
+
+#~ msgid "Save Message As..."
+#~ msgstr "Gem besked som..."
+
+#~ msgid "Save Messages As..."
+#~ msgstr "Gem beskeder som..."
+
+#~ msgid ""
+#~ "This operation will permanently erase all messages marked as\n"
+#~ "deleted. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "Denne handling vil permanent fjerne de meddelelser der er\n"
+#~ "markeret som slettede. Hvis du fortsætter kan du ikke længere "
+#~ "tilvejebringe\n"
+#~ "disse meddelelser.\n"
+#~ "\n"
+#~ "Vil du virkelig fjerne disse meddelelser?"
+
+#~ msgid ""
+#~ "Error loading filter information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fejl under indlæsning af filter-information:\n"
+#~ "%s"
+
+#~ msgid "Filters"
+#~ msgstr "Filtre"
+
+#~ msgid "Page %d of %d"
+#~ msgstr "Side %d af %d"
+
+#~ msgid "Print Message"
+#~ msgstr "Udskriv besked"
+
+#~ msgid "Printing of message failed"
+#~ msgstr "Fejl under udskrift af besked"
+
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr "Er du sikker på at du vil åbne alle %d beskeder i separate vinduer?"
+
+#~ msgid "Could not create a S/MIME signature context."
+#~ msgstr "Kunne ikke oprette S/MIME-signaturkontekst."
+
+#~ msgid "Could not create a S/MIME certsonly context."
+#~ msgstr "Kunne ikke oprette S/MIME \"certsonly\" kontekst."
+
+#~ msgid "Could not create a S/MIME encryption context."
+#~ msgstr "Kunne ikke oprette S/MIME-krypteringskontekst."
+
+#~ msgid "Could not create a S/MIME envelope context."
+#~ msgstr "Kunne ikke oprette S/MIME-\"envelope\"-kontekst."
+
+#~ msgid "Could not create a S/MIME decode context."
+#~ msgstr "Kunne ikke oprette S/MIME-afkodningskontekst."
+
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Filen \"%s\" findes allerede.\n"
+#~ "Skal den overskrives?"
+
+#~ msgid "Save Attachment"
+#~ msgstr "Gem bilag"
+
+#~ msgid "Could not create temporary file '%s': %s"
+#~ msgstr "Kunne ikke oprette temporær fil \"%s\": %s"
+
+#~ msgid "Save Attachment..."
+#~ msgstr "Gem bilag..."
+
+#~ msgid "View Inline"
+#~ msgstr "Vis indlejret"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Åbn i %s..."
+
+#~ msgid "View Inline (via %s)"
+#~ msgstr "Vis indlejret (via %s)"
+
+#~ msgid "Hide"
+#~ msgstr "Skjul"
+
+#~ msgid "External Viewer"
+#~ msgstr "Ekstern visning"
+
+#~ msgid "Downloading images"
+#~ msgstr "Henter billeder"
+
+#~ msgid "Loading message content"
+#~ msgstr "Indlæser beskedsindhold"
+
+#~ msgid "Overdue:"
+#~ msgstr "Overskredet:"
+
+#~ msgid "by %B %d, %Y, %l:%M %P"
+#~ msgstr "den %d. %B %Y %H:%M"
+
+#~ msgid "Open Link in Browser"
+#~ msgstr "Åbn henvisning i netlæser"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "Kopiér henvisning"
+
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Gem henvisning som"
+
+#~ msgid "Save Image as..."
+#~ msgstr "Gem billede som..."
+
+#~ msgid "%s attachment"
+#~ msgstr "%s-bilag"
+
+#~ msgid "Could not parse MIME message. Displaying as source."
+#~ msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
+
+#~ msgid "Bad Address"
+#~ msgstr "Ugyldig e-post-adresse:"
+
+#~ msgid "Reply-To"
+#~ msgstr "Svar-til"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc:"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Denne besked er digitalt signeret. For flere informationer, klik på "
+#~ "låsikonen."
+
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "Kunne ikke oprette en PGP-verifieringssammenhæng"
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr "Denne besked er digitalt signeret og er fundet autentisk."
+
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
+
+#~ msgid "Pointer to FTP site (%s)"
+#~ msgstr "Peger til FTP-server (%s)"
+
+#~ msgid "Pointer to local file (%s) valid at site \"%s\""
+#~ msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\""
+
+#~ msgid "Pointer to local file (%s)"
+#~ msgstr "Peger til lokal fil (%s)"
+
+#~ msgid "Pointer to remote data (%s)"
+#~ msgstr "Peger til eksterne data (%s)"
+
+#~ msgid "Pointer to unknown external data (\"%s\" type)"
+#~ msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
+
+#~ msgid "Malformed external-body part."
+#~ msgstr "Fejludformet del for ekstern-krop."
+
+#~ msgid "However, the message was successfully sent."
+#~ msgstr "Fuldførte alligevel sending af beskeden."
+
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Besked uden titel)"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Besked uden titel"
+
+#~ msgid "Empty Message"
+#~ msgstr "Tom besked"
+
+#~ msgid "Find in Message"
+#~ msgstr "Find i besked"
+
+#~ msgid "Case Sensitive"
+#~ msgstr "Skeln mellem store og små bogstaver"
+
+#~ msgid "Search Forward"
+#~ msgstr "Søg fremad"
+
+#~ msgid "Find:"
+#~ msgstr "Find:"
+
+#~ msgid "Matches:"
+#~ msgstr "Træffere:"
+
+#~ msgid "Forwarded Message"
+#~ msgstr "Videresendt besked"
+
+#~ msgid "(No subject)"
+#~ msgstr "(Uden emne)"
+
+#~ msgid "%s - Message"
+#~ msgstr "%s - Besked"
+
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "Søger i mapper under %s på \"%s\""
+
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "Søger i mapper på rod-niveau på \"%s\""
+
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "Abonnerer på mappe \"%s\""
+
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "Fjerner abonnement på mappe \"%s\""
+
+#~ msgid "No server has been selected"
+#~ msgstr "Ingen server er valgt"
+
+#~ msgid "Please select a server."
+#~ msgstr "Venligst vælg en server."
+
+#~ msgid "Scanning folders ..."
+#~ msgstr "Gennemsøger mapper ..."
+
+#~ msgid "Save As..."
+#~ msgstr "Gem som..."
+
+#~ msgid "Information"
+#~ msgstr "Information"
+
+#~ msgid "Question"
+#~ msgstr "Spørgsmål"
+
+#~ msgid "Message"
+#~ msgstr "Besked"
+
 #~ msgid ""
 #~ "ping_timeout_callback: could not determine if the CORBA object is nil or "
 #~ "not"
@@ -28356,12 +28666,6 @@ msgstr "Evolution adressebog lokalfil-backend"
 #~ msgid "Cannot initialize the Evolution mail component."
 #~ msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#~ msgid "Cannot initialize Evolution's mail config component."
-#~ msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
-
-#~ msgid "Cannot initialize Evolution's folder info component."
-#~ msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
-
 #~ msgid "Factory to import mbox into Evolution"
 #~ msgstr "Fabrik for at importere mbox til Evolution"
 
diff --git a/po/de.po b/po/de.po
index 3bfa3ae60a..3782663948 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,73 +14,202 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-22 20:27+0200\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2003-07-22 20:27+0200\n"
 "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Evolution-LDIF-Importeur"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP-Data-Interchange-Format (.ldif)"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Evolution-VCard-Importeur"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Evolution-VCard-Importeur"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
-
-#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Voller Name"
+
 #: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Name"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Adresse"
+
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Adress-Beschriftung"
+
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Telefon"
+
 #: addressbook/backend/ebook/e-card.c:1347
+#: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-Mail"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr "Primär"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Geburtsdatum"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "Prim"
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
 
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Organisationseinheit"
+
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Büro"
+
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Titel"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Position"
+
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Vorgesetzter"
+
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Ehepartner"
+
+#: addressbook/backend/ebook/e-card.c:1430
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniversary"
+msgstr "Jahrestag"
+
+#: addressbook/backend/ebook/e-card.c:1436
+msgid "Mailer"
+msgstr "Mailer"
+
+#: addressbook/backend/ebook/e-card.c:1443
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr "Kalender-URI"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "Verfügbarkeits-URL"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "ICS-Kalender"
+
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Notiz"
+
+# CHECK
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Verwandte Kontakte"
+
+#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorien"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Liste der Kategorien"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Will HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Will HTML gesetzt"
+
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
+msgid "List"
+msgstr "Liste"
+
+# CHECK
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Liste der Anzeigeadressen"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Beliebig"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "Kennung"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Zuletzt verwendet"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Bewertung verwenden"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
+msgstr "Primär"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr "Prim"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -115,12 +244,6 @@ msgid "Home"
 msgstr "Zu Hause"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
@@ -239,21 +362,9 @@ msgid "Dep"
 msgstr "Abt"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Büro"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Büro"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Titel"
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -264,12 +375,6 @@ msgid "Prof"
 msgstr "Beruf"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Vorgesetzter"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Chef"
 
@@ -278,32 +383,9 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Spitzname"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Ehepartner"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Notiz"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr "Kalender-URI"
-
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "KalURI"
@@ -327,11 +409,6 @@ msgid "icsCalendar"
 msgstr "icsCalendar"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr "Jahrestag"
-
-#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "JTag"
 
@@ -339,12 +416,6 @@ msgstr "JTag"
 msgid "Birth Date"
 msgstr "Geburtsdatum"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorien"
-
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Familienname"
@@ -359,107 +430,29 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-destination.c:709
 msgid "Unnamed List"
 msgstr "Namenlose Liste"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Voller Name"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Adresse"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Adress-Beschriftung"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Geburtsdatum"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Organisationseinheit"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Position"
-
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:962
-msgid "Mailer"
-msgstr "Mailer"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Verfügbarkeits-URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "ICS-Kalender"
-
-# CHECK
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Verwandte Kontakte"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Liste der Kategorien"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Will HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Will HTML gesetzt"
-
-#: addressbook/backend/ebook/e-card.c:1506
-msgid "List"
-msgstr "Liste"
-
-# CHECK
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Liste der Anzeigeadressen"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Beliebig"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Evolution-LDIF-Importeur"
 
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "Kennung"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP-Data-Interchange-Format (.ldif)"
 
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Zuletzt verwendet"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Evolution-VCard-Importeur"
 
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Bewertung verwenden"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Evolution-VCard-Importeur"
 
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:171
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo konnte nicht initialisiert werden"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -516,14 +509,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
@@ -532,137 +525,6 @@ msgstr "Wombat konnte nicht gestartet werden"
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Verzeichnis-Server"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Evolution-Adressbuch"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Bedienelement zur LDAP-Konfiguration des Evolution-Adressbuchs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution-Adressbuch-Adress-Popup-Fenster"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution-Adressbuch-Adressbetrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Evolution-Adressbuch-Komponente"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution-Adressbuch-Ordnerbetrachter"
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:625
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Ordner mit Kontaktinformationen"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP-Server:"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "LDAP-Server mit Kontaktinformationen"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Öffentliche Kontakte"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Öffentlicher Ordner mit Kontaktinformationen"
-
-#: addressbook/gui/component/addressbook-component.c:579
-msgid "New Contact"
-msgstr "Neuer Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:579
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "Create a new contact"
-msgstr "Einen neuen Kontakt anlegen"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "New Contact List"
-msgstr "Neu Kontaktliste"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Contact _List"
-msgstr "Kontakt_liste"
-
-#: addressbook/gui/component/addressbook-component.c:584
-msgid "Create a new contact list"
-msgstr "Eine neue Kontaktliste anlegen"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "Der Server antwortete mit nicht unterstützen Suchbasen"
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Dieser Server unterstützt keine LDAPv3 Schema-Information"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Fehler beim Abrufen der Schema-Informationen"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "Server antwortetet nicht mit einer gültigen Schema-Information"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Kontoname"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Servername"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andere Kontakte"
-
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -795,6 +657,101 @@ msgstr "Beliebige Kategorie"
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:628
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Ordner mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP-Server:"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "LDAP-Server mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Öffentliche Kontakte"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Öffentlicher Ordner mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "New Contact"
+msgstr "Neuer Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "Create a new contact"
+msgstr "Einen neuen Kontakt anlegen"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "New Contact List"
+msgstr "Neu Kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "Contact _List"
+msgstr "Kontakt_liste"
+
+#: addressbook/gui/component/addressbook-component.c:587
+msgid "Create a new contact list"
+msgstr "Eine neue Kontaktliste anlegen"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "Der Server antwortete mit nicht unterstützen Suchbasen"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Dieser Server unterstützt keine LDAPv3 Schema-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Fehler beim Abrufen der Schema-Informationen"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Server antwortetet nicht mit einer gültigen Schema-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Kontoname"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Servername"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Andere Kontakte"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -828,12 +785,12 @@ msgid "Querying Addressbook..."
 msgstr "Anfrage beim Adressbuch..."
 
 #: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr "Kontaktinfo bearbeiten"
 
 #: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Zu Kontakten hinzufügen"
@@ -842,14 +799,50 @@ msgstr "Zu Kontakten hinzufügen"
 msgid "Merge E-Mail Address"
 msgstr "E-Mail-Adresse einfließen lassen"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Disable Queries"
 msgstr "Abfragen deaktivieren"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr "Abfragen aktivieren (gefährlich!)"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Verzeichnis-Server"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Evolution-Adressbuch"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Bedienelement zur LDAP-Konfiguration des Evolution-Adressbuchs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution-Adressbuch-Adress-Popup-Fenster"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-Adressbuch-Adressbetrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Evolution-Adressbuch-Komponente"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution-Adressbuch-Ordnerbetrachter"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -1003,10 +996,9 @@ msgstr "One"
 msgid "S_earch scope: "
 msgstr "Suchb_ereich: "
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1672
-#: calendar/gui/e-week-view.c:1306
+#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr "Suchen"
 
@@ -1252,10 +1244,10 @@ msgstr "_Downloadbegrenzung:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:33 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -1296,20 +1288,24 @@ msgstr "general-tab"
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Oberfläche zur Auswahl eines Namens für Evolution-Adressbücher"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Kontakte aus Adressbuch wählen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Alle Entfernen"
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Kontakt finden in"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:448
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Entfernen"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Alle Entfernen"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Kontaktliste anzeigen"
@@ -1332,13 +1328,9 @@ msgstr "Namenloser Kontakt"
 msgid "Source"
 msgstr "Quelle"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Kontakte aus Adressbuch wählen"
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Kontakt finden in"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Oberfläche zur Auswahl eines Namens für Evolution-Adressbücher"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1411,7 +1403,7 @@ msgid "D_epartment:"
 msgstr "_Abteilung:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:199
+#: calendar/gui/dialogs/task-editor.c:200
 msgid "Details"
 msgstr "Details"
 
@@ -1478,11 +1470,12 @@ msgid "_Categories..."
 msgstr "Ka_tegorien..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717
-#: calendar/gui/e-calendar-table.c:1000 calendar/gui/e-day-view.c:3718
-#: calendar/gui/e-week-view.c:3687 mail/folder-browser.c:1830
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:32
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-tasks.xml.h:18
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
 #: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Löschen"
@@ -1524,15 +1517,15 @@ msgid "_Web page address:"
 msgstr "Adresse der _Website:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:402
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
+#: addressbook/gui/widgets/e-minicard.c:183
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 msgid "Editable"
 msgstr "Editierbar"
 
@@ -2561,17 +2554,17 @@ msgstr "Simbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:388
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 msgid "Book"
 msgstr "Buch"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
+#: addressbook/gui/widgets/e-minicard-widget.c:93
 msgid "Card"
 msgstr "Karte"
 
@@ -2794,7 +2787,7 @@ msgstr "Ist neue Liste"
 msgid "Contact List Editor"
 msgstr "Kontaktlisten-Editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 msgid "Save List as VCard"
 msgstr "Liste als VCard speichern"
 
@@ -2841,7 +2834,7 @@ msgstr ""
 "trotzdem hinzufügen?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
@@ -2860,10 +2853,10 @@ msgid "%d cards"
 msgstr "%d Karten"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:395
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 msgid "Query"
 msgstr "Abfrage"
 
@@ -2871,22 +2864,22 @@ msgstr "Abfrage"
 msgid "Error getting book view"
 msgstr "Fehler beim Abrufen der Buchansicht"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:409
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 msgid "Model"
 msgstr "Modell"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr "Erfolg"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
@@ -2895,90 +2888,90 @@ msgstr "Erfolg"
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
 #: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card not found"
 msgstr "Karte nicht gefunden"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr "Kartenkennung existiert bereits"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2307 camel/camel-service.c:733
-#: camel/camel-service.c:770 camel/camel-service.c:854
-#: camel/camel-service.c:893 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
+#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Storniert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Failed"
 msgstr "Legitimation fehlgeschlagen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Authentication Required"
 msgstr "Legitimation erforderlich"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr "TLS nicht verfügbar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Addressbook does not exist"
 msgstr "Adressbuch existiert nicht"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 msgid "Other error"
 msgstr "Anderer Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr "Wollen Sie die Änderungen speichern?"
 
 # CHECK
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen der Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 msgid "Error adding card"
 msgstr "Fehler beim Hinzufügen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2988,34 +2981,33 @@ msgstr ""
 "%d zusätzliche Fenster auf ihrem Bildschirm angezeigt werden.\n"
 "Wollen Sie wirklich alle Karten anzeigen lassen?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 msgid "Move card to"
 msgstr "Karte verschieben nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 msgid "Copy card to"
 msgstr "Karte kopieren nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 msgid "Move cards to"
 msgstr "Karten verschieben nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 msgid "Copy cards to"
 msgstr "Karten kopieren nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard für %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Typ"
@@ -3070,9 +3062,9 @@ msgstr "Kontakt weiterleiten"
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drucken"
@@ -3105,15 +3097,15 @@ msgstr "Kopieren"
 msgid "Paste"
 msgstr "Einfügen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Löschen"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-day-view.c:3678 calendar/gui/e-week-view.c:3652
+#: calendar/gui/e-cal-view.c:1109
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
@@ -3205,6 +3197,29 @@ msgstr "Anderes Telefon"
 msgid "Primary Phone"
 msgstr "Primäres Telefon"
 
+#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "Breite"
+
+#: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "Höhe"
+
+#: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr "Hat den Fokus"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Gewählt"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Hat Cursor"
+
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3218,21 +3233,6 @@ msgstr "und eine andere Karte."
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:146
-msgid "Width"
-msgstr "Breite"
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:153
-msgid "Height"
-msgstr "Höhe"
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:161
-msgid "Has Focus"
-msgstr "Hat den Fokus"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Feld"
@@ -3249,10 +3249,6 @@ msgstr "Textmodell"
 msgid "Max field name length"
 msgstr "Maximale Länge des Feldnamens"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr "Spaltenbreite"
-
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3281,13 +3277,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Gewählt"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Hat Cursor"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr "Spaltenbreite"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3297,20 +3289,20 @@ msgstr "Kartenansicht"
 msgid "GTK Tree View"
 msgstr "GTK-Baumansicht"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Umschlag drucken"
-
-#: addressbook/printing/e-contact-print.c:1139
+#: addressbook/printing/e-contact-print.c:1158
 msgid "Print cards"
 msgstr "Karten drucken"
 
-#: addressbook/printing/e-contact-print.c:1204
-#: addressbook/printing/e-contact-print.c:1226
+#: addressbook/printing/e-contact-print.c:1224
+#: addressbook/printing/e-contact-print.c:1250
 msgid "Print card"
 msgstr "Karte drucken"
 
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Umschlag drucken"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 Punkt Tahoma"
@@ -3480,6 +3472,63 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "mit allen lokalen Ordnern und aktiven Ordnern im Netz"
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "Karten"
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Interner Fehler"
+
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Unbenannter Termin"
@@ -3610,30 +3659,29 @@ msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:401 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:753
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:912
 msgid "High"
 msgstr "Hoch"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:273
-#: mail/message-list.c:752
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
+#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:751
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:910
 msgid "Low"
 msgstr "Niedrig"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr "Undefiniert"
 
@@ -3641,13 +3689,13 @@ msgstr "Undefiniert"
 msgid "Split Multi-Day Events:"
 msgstr "Mehrtätige Ereignisse aufteilen:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -3655,77 +3703,32 @@ msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 msgid "Default Priority:"
 msgstr "Vorgabepriorität:"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
-"konfigurieren"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolution-Komponente für Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution-Kalender-Terminplan-Nachrichtenbetrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution-Kalenderbetrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution-Kalender/Aufgaben-Editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution-Aufgabenbetrachter"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Beginnt:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Endent:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
-msgstr "ungültige Zeit"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 msgid "Evolution Alarm"
 msgstr "Evolution-Alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm am %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "S_chließen"
 
@@ -3741,16 +3744,25 @@ msgstr "Weiterschlaf-Zeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr "Warnung"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3763,7 +3775,7 @@ msgstr ""
 "wird statt dessen eine normales Erinnerungsdialogfenster\n"
 "anzeigen."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3780,36 +3792,27 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 msgid "Do not ask me about this program again."
 msgstr "Mich über dieses Programm nicht mehr fragen."
 
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
+
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize Bonobo"
+msgstr "Bonobo konnte nicht initialisiert werden"
+
+#: calendar/gui/alarm-notify/notify-main.c:176
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
+#: calendar/gui/alarm-notify/notify-main.c:185
 msgid "Could not create the alarm notify service factory"
 msgstr "Fabrik für Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Zusammenfassung enthält"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Beschreibung enthält"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentar enthält"
-
-# CHECK
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
-msgid "Unmatched"
-msgstr "Nicht einsortiert"
-
-#: calendar/gui/calendar-commands.c:358
+#: calendar/gui/calendar-commands.c:376
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -3820,52 +3823,53 @@ msgstr ""
 "nicht wiederherstellen."
 
 # CHECK
-#: calendar/gui/calendar-commands.c:364
+#: calendar/gui/calendar-commands.c:382
 msgid "Purge events older than"
 msgstr "Ereignisse säubern nach"
 
-#: calendar/gui/calendar-commands.c:369
+#: calendar/gui/calendar-commands.c:387
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "Tage"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:471 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1409 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
+#: calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:478
-#: calendar/gui/calendar-commands.c:480
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:498
-#: calendar/gui/calendar-commands.c:504 calendar/gui/calendar-commands.c:506
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:496
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:518
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:884
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Die Kalenderansicht konnte nicht erstellt werden. Bitte überprüfen Sie Ihre "
 "ORBit- und OAF-Einstellungen. "
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1557
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3885,10 +3889,10 @@ msgid "Public folder containing appointments and events"
 msgstr "Öffentlicher Ordner mit Kontaktinformationen"
 
 #: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:487
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Aufgaben"
@@ -3953,110 +3957,6 @@ msgstr "_Ganztags-Termin"
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Vertraulich"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Öffentlich"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "O"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr "Frei"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Beschäftigt"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr "Nicht begonnen"
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:247
-#: calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2304
-msgid "Completed"
-msgstr "Abgeschlossen"
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Die geographische Position muss in diesem Format eingegeben werden: \n"
-"\n"
-"45.436845,125.862501"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2079
-#: mail/folder-browser.c:1792 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1469 widgets/misc/e-dateedit.c:1584
-msgid "None"
-msgstr "Keine"
-
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr "Wiederkehrend"
-
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr "Zugewiesen"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
-msgstr "Ja"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
-msgstr "Nein"
-
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Tagesansicht"
@@ -4073,28 +3973,50 @@ msgstr "Wochenansicht"
 msgid "Month View"
 msgstr "Monatsansicht"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Benutzerdefinierte Ansicht"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Zusammenfassung enthält"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Beschreibung enthält"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentar enthält"
+
+# CHECK
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
+msgid "Unmatched"
+msgstr "Nicht einsortiert"
+
+#: calendar/gui/comp-editor-factory.c:462
 msgid "Error while opening the calendar"
 msgstr "Fehler beim Öffnen des Kalenders"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr "Methode beim Öffnen des Kalenders nicht unterstützt"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 msgid "Permission denied to open the calendar"
 msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:125
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Der Ordner in »%s« konnte nicht geöffnet werden"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr "Typ der anzuzeigenden Ansicht"
 
@@ -4162,7 +4084,8 @@ msgstr "weitere Male alle"
 msgid "hours"
 msgstr "Stunden"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "Minuten"
 
@@ -4176,11 +4099,11 @@ msgstr "Grundlegend"
 msgid "Date/Time:"
 msgstr "Datum/Zeit:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr "Eine Nachricht anzeigen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
@@ -4188,7 +4111,7 @@ msgstr "Einen Klang abspielen"
 msgid "Reminders"
 msgstr "Erinnerungen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr "Ein Programm ausführen"
 
@@ -4198,7 +4121,7 @@ msgstr "Eine E-Mail verschicken"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Zusammenfassung:"
@@ -4282,7 +4205,7 @@ msgstr "Tage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr "Freitag"
 
@@ -4296,7 +4219,7 @@ msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr "Montag"
 
@@ -4306,7 +4229,7 @@ msgstr "_So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -4320,7 +4243,7 @@ msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -4338,7 +4261,7 @@ msgstr "Aufgabenliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -4356,7 +4279,7 @@ msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -4366,12 +4289,12 @@ msgstr "W_oche beginnt:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr "Mittwoch"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr "Werkwoche"
 
@@ -4535,31 +4458,6 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validierungsfehler: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
-msgid " to "
-msgstr " bis "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
-msgid " (Completed "
-msgstr " (Abgeschlossen "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
-msgid "Completed "
-msgstr "Abgeschlossen "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
-msgid " (Due "
-msgstr " (Fällig am "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
-msgid "Due "
-msgstr "Fällig am "
-
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "Ungültiges Objekt konnte nicht aktualisiert werden"
@@ -4605,23 +4503,49 @@ msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1103 calendar/gui/e-day-view.c:3960
-#: calendar/gui/e-week-view.c:3898 composer/e-msg-composer.c:1184
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1383
-#: calendar/gui/dialogs/comp-editor.c:1407
-#: calendar/gui/dialogs/comp-editor.c:1433
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: calendar/gui/dialogs/comp-editor.c:1460
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version konnte nicht ermittelt werden!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validierungsfehler: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
+msgid " to "
+msgstr " bis "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
+msgid " (Completed "
+msgstr " (Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
+msgid "Completed "
+msgstr "Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
+msgid " (Due "
+msgstr " (Fällig am "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
+msgid "Due "
+msgstr "Fällig am "
+
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4732,31 +4656,31 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Planung"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
@@ -4792,9 +4716,9 @@ msgid "Classification"
 msgstr "Einstufung"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Vertraulich"
+#, fuzzy
+msgid "Co_nfidential"
+msgstr "Vertraulich"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4820,7 +4744,6 @@ msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Zeit einstufen als"
 
@@ -4837,74 +4760,34 @@ msgstr "_Endzeit:"
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr "Keine"
+
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewählten Organizer ist kein Konto mehr zugeordnet."
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr "Diese Person nimmt bereits an der Besprechung teil!"
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:630
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Anwesender"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Klicken Sie hier, um einen Teilnehmer hinzuzufügen"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Gemeinsamer Name"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegiert durch"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegiert an"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Sprache"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Mitglied"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "UAwg"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Status"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4915,7 +4798,7 @@ msgid "_Change Organizer"
 msgstr "Organisator _ändern"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "Andere einladen..."
 
@@ -5075,7 +4958,7 @@ msgstr ""
 "Möchten Sie Ihre Änderungen speichern?"
 
 # CHECK
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1580
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr "Änderungen _verwerfen"
 
@@ -5113,6 +4996,27 @@ msgstr "Das Fertiggestellt-Datum ist falsch"
 msgid "% _Complete"
 msgstr "% _abgeschlossen"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
+msgid "In Progress"
+msgstr "In Bearbeitung"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305
+msgid "Not Started"
+msgstr "Nicht begonnen"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Fortschritt"
@@ -5133,21 +5037,29 @@ msgstr "Status:"
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: calendar/gui/dialogs/task-editor.c:192
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: calendar/gui/dialogs/task-editor.c:206
-#: calendar/gui/dialogs/task-editor.c:269
-#: calendar/gui/dialogs/task-editor.c:406
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.c:480
+#: calendar/gui/dialogs/task-page.c:482
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
+#: calendar/gui/dialogs/task-page.c:542
+msgid "Due date is before start date!"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "_Vertraulich"
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5161,217 +5073,243 @@ msgstr "Anfangsdatum:"
 msgid "_Due Date:"
 msgstr "Fällig am:"
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr "1 Tag"
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr "1 Woche"
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr "1 Minute"
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr "1 Sekunde"
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr "Unbekannte auszuführende Aktion"
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s vor Terminbeginn"
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nach Terminbeginn"
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s zum Terminbeginn"
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s vor Terminende"
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nach Terminende"
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s zum Terminende"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
+msgid "Public"
+msgstr "Öffentlich"
+
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
+msgid "Confidential"
+msgstr "Vertraulich"
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2827
-#: calendar/gui/e-week-view.c:1983
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Frei"
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:393
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Beschäftigt"
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3700
-#: calendar/gui/e-week-view.c:3669 mail/folder-browser.c:1803
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: calendar/gui/e-calendar-table.c:981
+#: calendar/gui/e-calendar-table.c:989
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
-#: calendar/gui/e-calendar-table.c:982
-msgid "_Save as..."
-msgstr "_Speichern unter..."
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Save As..."
+msgstr "Speichern _unter..."
 
-#: calendar/gui/e-calendar-table.c:983 calendar/gui/e-day-view.c:3702
-#: calendar/gui/e-week-view.c:3644 calendar/gui/e-week-view.c:3671
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:35
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
+#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3707
-#: calendar/gui/e-week-view.c:3676 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-day-view.c:3708
-#: calendar/gui/e-week-view.c:3677 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
+#: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3673
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3648
-#: calendar/gui/e-week-view.c:3678 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
+#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Einfügen"
 
-#: calendar/gui/e-calendar-table.c:993
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: calendar/gui/e-calendar-table.c:994
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: calendar/gui/e-calendar-table.c:995
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 msgid "_Delete Selected Tasks"
 msgstr "Gewählte Aufgaben _löschen"
 
-#: calendar/gui/e-calendar-table.c:1300 calendar/gui/e-day-view.c:7983
-#: calendar/gui/e-week-view.c:4400
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: calendar/gui/e-calendar-table.c:1383
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
@@ -5385,8 +5323,8 @@ msgstr "% abgeschlossen"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -5395,12 +5333,13 @@ msgid "Completion Date"
 msgstr "Abschlussdatum"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr "Fällig am"
+#, fuzzy
+msgid "Description"
+msgstr "Beschreibung:"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
-msgstr "Enddatum"
+msgid "Due Date"
+msgstr "Fällig am"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
@@ -5410,244 +5349,301 @@ msgstr "Geographische Lage"
 msgid "Priority"
 msgstr "Priorität"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Status"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Aufgabensorte"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a, %d. %m %Y %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+msgid "color"
+msgstr "Farbe"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+#: calendar/gui/e-calendar-table.etspec.h:20
+#, fuzzy
+msgid "component"
+msgstr "Termin"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Das Datum muss in diesem Format eingegeben werden: \n"
-"\n"
-"%s"
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i Minuten-Unterteilungen"
+#: calendar/gui/e-cal-model.c:828
+msgid "Recurring"
+msgstr "Wiederkehrend"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1392
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
-msgid "%A %d %B"
-msgstr "%A, %d. %B"
+#: calendar/gui/e-cal-model.c:830
+msgid "Assigned"
+msgstr "Zugewiesen"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1425
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d. %b"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "Yes"
+msgstr "Ja"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:337
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "AM"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "No"
+msgstr "Nein"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:340
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "PM"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "N"
 
-#: calendar/gui/e-day-view.c:3657
-msgid "New _Appointment"
-msgstr "Neuer _Termin"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:550
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Die geographische Position muss in diesem Format eingegeben werden: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+msgid "New _Appointment..."
+msgstr "Neuer _Termin..."
 
-#: calendar/gui/e-day-view.c:3659 calendar/gui/e-week-view.c:3638
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: calendar/gui/e-day-view.c:3661 calendar/gui/e-week-view.c:3639
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-day-view.c:3663 calendar/gui/e-week-view.c:3640
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-day-view.c:3668 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Drucken..."
-
-#: calendar/gui/e-day-view.c:3680 calendar/gui/e-week-view.c:3654
+#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3682 calendar/gui/e-week-view.c:3655
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3659
-#: ui/evolution-calendar.xml.h:36
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr "Ver_fügbarkeitsinformationen veröffentlichen"
 
-#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3663
+#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Einstellungen..."
 
-#: calendar/gui/e-day-view.c:3701 calendar/gui/e-week-view.c:3670
-#: mail/folder-browser.c:1805 ui/evolution-mail-message.xml.h:114
-msgid "_Save As..."
-msgstr "Speichern _unter..."
-
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3682
+#: calendar/gui/e-cal-view.c:1139
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3683
+#: calendar/gui/e-cal-view.c:1140
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3688
+#: calendar/gui/e-cal-view.c:1145
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3689
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten löschen"
 
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3690
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten löschen"
 
-#: calendar/gui/e-itip-control.c:706
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a, %d. %m %Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Das Datum muss in diesem Format eingegeben werden: \n"
+"\n"
+"%s"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "AM"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "PM"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
+msgid "%A %d %B"
+msgstr "%A, %d. %B"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d. %b"
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i Minuten-Unterteilungen"
+
+#: calendar/gui/e-itip-control.c:676
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 msgid "Every day"
 msgstr "Täglich"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, c-format
 msgid "Every %d days"
 msgstr "Alle %d Tage"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 msgid "Every week"
 msgstr "Wöchentlich"
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, c-format
 msgid "Every %d weeks"
 msgstr "Alle %d Wochen"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 msgid "Every week on "
 msgstr "Wöchentlich am "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Alle %d Wochen am "
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 msgid " and "
 msgstr " und "
 
 # CHECK - muss mit erste(r), zweite(r) usw. übereinstimmen
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr "%s Tag des "
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s des "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 msgid "every month"
 msgstr "monatlich"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr "alle %d Monate"
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 msgid "Every year"
 msgstr "Jährlich"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr "Alle %d Jahre"
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr " insgesamt %d Mal"
 
 # CHECK
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ", endet am "
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr "<b>Beginnt:</b> "
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 msgid "<b>Ends:</b> "
 msgstr "<b>Endet:</b>"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Completed:</b> "
 msgstr "<b>Abgeschlossen:</b>"
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Due:</b> "
 msgstr "<b>Fällig:</b>"
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 msgid "iCalendar Information"
 msgstr "iCalendar-Informationen"
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1005
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5655,343 +5651,336 @@ msgstr ""
 "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
 "wählen Sie dann eine Aktion aus dem Menü unten aus."
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 msgid "Location:"
 msgstr "Standort: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1075 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:347
-#: mail/mail-display.c:928 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 msgid "Choose an action:"
 msgstr "Eine Aktion wählen:"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 msgid "Accept"
 msgstr "Annehmen"
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "UAwg"
+
+#: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1185 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> wünscht die Anwesenheit von %s bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> wünscht Ihre Anwesenheit bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1309
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wünscht zu einer vorhandenen Besprechung hinzuzufügen"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wünscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung widerrufen."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 msgid "Meeting Cancellation"
 msgstr "Besprechungswiderruf"
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverständliche Nachricht verschickt."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> fordert %s auf, eine Aufgabe auszuführen."
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> fordert Sie auf eine Aufgabe auszuführen."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzuzufügen."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1381
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wünscht letzte Aufgabeninformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> hat eine Aufgabe widerrufen."
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1402
 msgid "Task Cancellation"
 msgstr "Aufgabenwiderruf"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> hat Verfügbarkeitsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> fordert Ihre Verfügbarkeitsinformationen an."
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enthält keine gültige Kalendernachricht"
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalenderinformationen"
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ungültig und konnte nicht aktualisiert werden\n"
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 msgid "There was an error on the CORBA system\n"
 msgstr "Es trat ein Fehler im CORBA-System auf\n"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die nötige Berechtigung, um den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Anwesenheitsstatus konnte nicht aktualisiert werden, da der Eintrag nicht "
 "mehr existiert"
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Diese Antwort ist von keinem Teilnehmer.  Als Teilnehmer hinzufügen?"
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Anwesenheitsstatus konnte auf Grund eines ungültigen Status nicht "
 "aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die nötige Berechtigung, um den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 msgid "Select Calendar Folder"
 msgstr "Ordner für Kalender wählen"
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 msgid "Select Tasks Folder"
 msgstr "Ordner für Aufgaben wählen"
 
@@ -6032,163 +6021,124 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr "Vorsitzende"
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
-msgid "Required Participants"
-msgstr "Benötigte Teilnehmer"
-
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
-msgstr "Optionale Teilnehmer"
-
-#: calendar/gui/e-meeting-model.c:82
-msgid "Resources"
-msgstr "Ressourcen"
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
-msgid "Individual"
-msgstr "Individuell"
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
-msgid "Group"
-msgstr "Gruppe"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
-msgid "Resource"
-msgstr "Ressource"
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
-msgid "Room"
-msgstr "Raum"
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
-msgid "Chair"
-msgstr "Vorsitzender"
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
-msgid "Required Participant"
-msgstr "Benötigter Teilnehmer"
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
-msgid "Optional Participant"
-msgstr "Optionaler Teilnehmer"
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
-msgid "Non-Participant"
-msgstr "Nicht-Teilnehmer"
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
-msgid "Needs Action"
-msgstr "Erfordert Maßnahme"
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
-msgid "Delegated"
-msgstr "Delegiert"
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
-msgstr "In Bearbeitung"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
-msgid "%A, %B %d, %Y"
-msgstr "%a, %d. %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
-msgid "%a %m/%d/%Y"
-msgstr "%a, %d.%m.%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1593
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Außer Haus"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Keine Information"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "_Options"
 msgstr "Optionen"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _Only Working Hours"
 msgstr "Nur Arbeitszeit anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Weggezoomt anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update Free/Busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "AutoWahl"
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
+#: calendar/gui/e-meeting-time-sel.c:541
 msgid "_All People and Resources"
 msgstr "Alle Leute und Ressourcen"
 
-#: calendar/gui/e-meeting-time-sel.c:563
+#: calendar/gui/e-meeting-time-sel.c:550
 msgid "All _People and One Resource"
 msgstr "Alle Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:572
+#: calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required People"
 msgstr "Benötigte Leute"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "Required People and _One Resource"
 msgstr "Benötigte Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "Meeting _start time:"
 msgstr "Anfang der Besprechung:"
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2054
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%a, %d. %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2087
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a, %d.%m.%Y"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Anwesender"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Klicken Sie hier, um einen Teilnehmer hinzuzufügen"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Gemeinsamer Name"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegiert durch"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegiert an"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Sprache"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Mitglied"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
+msgstr "ungültige Zeit"
+
 #: calendar/gui/e-tasks.c:221
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
@@ -6207,8 +6157,7 @@ msgstr "Priorität:"
 msgid "Web Page:"
 msgstr "Website:"
 
-#: calendar/gui/e-tasks.c:702 calendar/gui/gnome-cal.c:2210
-#: calendar/gui/gnome-cal.c:2221
+#: calendar/gui/e-tasks.c:702
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben bei %s werden geöffnet"
@@ -6223,12 +6172,12 @@ msgstr "Die Aufgaben in »%s« konnten nicht geladen werden"
 msgid "The method required to load `%s' is not supported"
 msgstr "Die zum Laden von »%s« erfoderliche Methode wird nicht unterstützt"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1713
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Sie haben keine Berechtigung den Ordner in »%s« zu öffnen"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1932
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6249,67 +6198,101 @@ msgstr "Gewählte Objekte werden gelöscht..."
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: calendar/gui/e-week-view.c:3637
-msgid "New _Appointment..."
-msgstr "Neuer _Termin..."
-
-#: calendar/gui/gnome-cal.c:1685
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Der Ordner in »%s« konnte nicht geöffnet werden"
 
-#: calendar/gui/gnome-cal.c:1699
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Die zum Öffnen von »%s« erforderliche Methode wird nicht unterstützt"
 
-#: calendar/gui/gnome-cal.c:1760
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarme für %s werden hinzugefügt"
 
-#: calendar/gui/gnome-cal.c:1952
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Die Kalender-Hintegrundkomponente für\n"
+"Die Aufgaben-Hintegrundkomponente für\n"
 "%s\n"
 "ist abgestürzt. Sie müssen Evolution neu starten, um sie wieder verwenden zu "
 "können"
 
-#: calendar/gui/gnome-cal.c:1961
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Die Aufgaben-Hintegrundkomponente für\n"
+"Die Kalender-Hintegrundkomponente für\n"
 "%s\n"
 "ist abgestürzt. Sie müssen Evolution neu starten, um sie wieder verwenden zu "
 "können"
 
-#: calendar/gui/gnome-cal.c:2192
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender bei %s wird geöffnet"
 
-#: calendar/gui/gnome-cal.c:2232
+#: calendar/gui/gnome-cal.c:2197
 msgid "Opening default tasks folder"
 msgstr "Vorgabe-Aufgabenordner wird geöffnet"
 
-#: calendar/gui/gnome-cal.c:3156
+#: calendar/gui/gnome-cal.c:3094
 #, c-format
 msgid "Purging event %s"
 msgstr "Ereignis %s wird entfernt"
 
-#: calendar/gui/gnome-cal.c:3237
+#: calendar/gui/gnome-cal.c:3178
 msgid "Purging"
 msgstr "Entfernen"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
+"konfigurieren"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution-Komponente für Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution-Kalender-Terminplan-Nachrichtenbetrachter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution-Kalenderbetrachter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-Kalender/Aufgaben-Editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution-Aufgabenbetrachter"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6417,7 +6400,7 @@ msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
@@ -6450,82 +6433,81 @@ msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1882
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Gewählter Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1919
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Gewählte Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1927
 msgid "Selected month (%b %Y)"
 msgstr "Gewählter Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1934
 msgid "Selected year (%Y)"
 msgstr "Gewähltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2262
 msgid "Task"
 msgstr "Aufgabe"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2321
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2338
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2362
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2387
 msgid "Contacts: "
 msgstr "Kontakte: "
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2559
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2632
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
@@ -8305,7 +8287,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resynchronisieren mit dem Server"
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Ordner »%s« wird für den Offline-Modus vorbereitet"
@@ -8326,57 +8312,57 @@ msgstr "Weiterleitung zu »%s« konnte nicht erstellt werden: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Kindprozess »%s« konnte nicht erstellt werden: %s"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ungültiger Nachrichten-Datenstrom von %s empfangen: %s"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausführen des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner konnte nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner konnte nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr "Nachricht konnte nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
@@ -8398,7 +8384,35 @@ msgstr "Ungültige Argumente bei (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
 
-#: camel/camel-folder-search.c:347
+#: camel/camel-folder.c:585
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nicht unterstützte Operation: Nachricht anhängen: für %s"
+
+#: camel/camel-folder.c:1163
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nicht unterstützte Operation: Suche nach Ausdruck: für %s"
+
+#: camel/camel-folder.c:1203
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nicht unterstützte Operation: nach UIDs suchen: für %s"
+
+#: camel/camel-folder.c:1321
+msgid "Moving messages"
+msgstr "Nachrichten werden verschoben"
+
+#: camel/camel-folder.c:1321
+msgid "Copying messages"
+msgstr "Nachrichten werden kopiert"
+
+#: camel/camel-folder.c:1571
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "%d Nachricht(en) werden/wird abgerufen"
+
+#: camel/camel-folder-search.c:348
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8407,7 +8421,7 @@ msgstr ""
 "Suchausdruck konnte nicht verarbeitet werden: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:357
+#: camel/camel-folder-search.c:358
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8416,38 +8430,15 @@ msgstr ""
 "Fehler beim Ausführen eines Suchausdrucks: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:574 camel/camel-folder-search.c:602
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
 
-#: camel/camel-folder-search.c:654
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
 
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nicht unterstützte Operation: Nachricht anhängen: für %s"
-
-#: camel/camel-folder.c:1161
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nicht unterstützte Operation: Suche nach Ausdruck: für %s"
-
-#: camel/camel-folder.c:1201
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nicht unterstützte Operation: nach UIDs suchen: für %s"
-
-#: camel/camel-folder.c:1319
-msgid "Moving messages"
-msgstr "Nachrichten werden verschoben"
-
-#: camel/camel-folder.c:1319
-msgid "Copying messages"
-msgstr "Nachrichten werden kopiert"
-
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8478,7 +8469,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr "Storniert"
 
@@ -8539,26 +8530,6 @@ msgstr ""
 "Die Nachrichtensignatur konnte nicht verifiziert werden: Temporäre Datei "
 "konnte nicht erstellt werden: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Weiterleitung zu Sperrhilfsprogramm konnte nicht angelegt werden: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "»%s« konnte nicht gesperrt werden: Protokollfehler mit lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "»%s« konnte nicht gesperrt werden"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8581,6 +8552,26 @@ msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Weiterleitung zu Sperrhilfsprogramm konnte nicht angelegt werden: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "»%s« konnte nicht gesperrt werden: Protokollfehler mit lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "»%s« konnte nicht gesperrt werden"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8647,11 +8638,11 @@ msgstr "MIME-Teil konnte nicht entschlüsselt werden: Ungültige Struktur"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "MIME-Teil konnte nicht entschlüsselt werden: Fehler beim Verarbeiten"
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr "Dies ist ein digital signierter Nachrichtenteil"
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 msgid "parse error"
 msgstr "Fehler beim Verarbeiten"
 
@@ -8841,7 +8832,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1053
+#: camel/providers/imap/camel-imap-store.c:1207
 msgid "Bad authentication response from server."
 msgstr "Ungültige Legitimationsantwort vom Server."
 
@@ -8946,53 +8937,53 @@ msgstr "URL »%s« benötigt eine Pfadkomponente"
 msgid "Resolving: %s"
 msgstr "%s wird aufgelöst"
 
-#: camel/camel-service.c:768 camel/camel-service.c:891
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fehler beim Auflösen eines Namens: %s"
 
-#: camel/camel-service.c:789
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 "Finden eines Rechners fehlgeschlagen: Thread konnte nicht erstellt werden: %s"
 
-#: camel/camel-service.c:802
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
 
-#: camel/camel-service.c:805
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
 
-#: camel/camel-service.c:859
+#: camel/camel-service.c:860
 msgid "Resolving address"
 msgstr "Adresse wird aufgelöst"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:929
 msgid "Host lookup failed: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: Rechner nicht gefunden"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:932
 msgid "Host lookup failed: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: unbekannter Grund"
 
-#: camel/camel-session.c:74
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "E-Mail-Quelle: Virtueller Ordner"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
 msgstr "Zum Lesen von E-Mails in Form einer Abfrage über andere Ordner"
 
-#: camel/camel-session.c:348 camel/camel-session.c:398
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle für Protokoll »%s« verfügbar"
 
-#: camel/camel-session.c:521
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9167,7 +9158,7 @@ msgstr "Schlüsselverwendung untertützt das Signieren von Zertifikaten nicht"
 msgid "Error in application verification"
 msgstr "Fehler bei der Anwendungsüberprüfung"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9180,11 +9171,11 @@ msgstr ""
 "Fingerabdruck:       %s\n"
 "Signatur:                %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr "GUT"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr "SCHLECHT"
 
@@ -9208,7 +9199,7 @@ msgstr ""
 "Möchten Sie es dennoch akzeptieren?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9223,7 +9214,7 @@ msgstr ""
 "\n"
 "Möchten Sie akzeptieren?"
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9232,7 +9223,7 @@ msgstr ""
 "Zertifikatproblem: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9241,7 +9232,7 @@ msgstr ""
 "Fehlerhafte Zertifikatdomäne: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9250,7 +9241,7 @@ msgstr ""
 "Zertifikat nicht mehr gültig: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9259,7 +9250,7 @@ msgstr ""
 "Zertifikat-Rückrufliste nicht mehr gültig: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-url.c:289 mail/mail-tools.c:143
+#: camel/camel-url.c:290 mail/mail-tools.c:143
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL »%s« konnte nicht verarbeitet werden"
@@ -9302,12 +9293,12 @@ msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2645
+#: camel/providers/imap/camel-imap-store.c:2806
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2648
+#: camel/providers/imap/camel-imap-store.c:2809
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
@@ -9374,7 +9365,7 @@ msgstr "Nachricht konnte nicht abgerufen werden: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:350
+#: camel/providers/local/camel-mbox-folder.c:422
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9388,7 +9379,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:350
+#: camel/providers/local/camel-mbox-folder.c:422
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Keine solche Nachricht"
@@ -9453,88 +9444,104 @@ msgstr "Namensraum"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Filter auf neue Nachrichten in INBOX dieses Servers anwenden"
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "_Automatisch nach neuen E-Mails sehen alle"
+
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von E-Mails auf IMAP-Servern."
 
-#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Passwort"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschlüsselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-Server %s"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-Dienst für %s auf %s"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:589
+#: camel/providers/imap/camel-imap-store.c:821
+#: camel/providers/imapp/camel-imapp-store.c:233
 #: camel/providers/nntp/camel-nntp-store.c:128
 #: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imapp/camel-imapp-store.c:236
 #: camel/providers/nntp/camel-nntp-store.c:131
 #: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/providers/imap/camel-imap-store.c:650
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:655
+#: camel/providers/imap/camel-imap-store.c:686
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-store.c:651
+#: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS Erweiterung nicht unterstützt."
 
-#: camel/providers/imap/camel-imap-store.c:682
+#: camel/providers/imap/camel-imap-store.c:687
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "SSL »Verhandlungen« fehlgeschlagen"
 
-#: camel/providers/imap/camel-imap-store.c:1076
+#: camel/providers/imap/camel-imap-store.c:824
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
+
+#: camel/providers/imap/camel-imap-store.c:1237
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "IMAP-Server %s unterstützt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/imap/camel-imap-store.c:1086
+#: camel/providers/imap/camel-imap-store.c:1247
 #: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterstützung für Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1109
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sBitte geben Sie das IMAP-Passwort für %s@%s ein"
 
-#: camel/providers/imap/camel-imap-store.c:1123
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9545,42 +9552,70 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1499
-#: camel/providers/imap/camel-imap-store.c:1641
+#: camel/providers/imap/camel-imap-store.c:1660
+#: camel/providers/imap/camel-imap-store.c:1802
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1842
+#: camel/providers/imap/camel-imap-store.c:2003
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Der Ordnername »%s« ist ungültig, da er das Zeichen »%c« enthält"
 
-#: camel/providers/imap/camel-imap-store.c:1854
+#: camel/providers/imap/camel-imap-store.c:2015
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unbekannter Eltern-Ordner %s"
 
-#: camel/providers/imap/camel-imap-store.c:1890
+#: camel/providers/imap/camel-imap-store.c:2051
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Nachrichtenspeicherung"
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Verbindung mit POP-Server %s konnte nicht hergestellt werden"
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "Nachricht an Kontakt schicken"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:353
+#: camel/providers/local/camel-local-folder.c:379
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:357
-#: camel/providers/local/camel-local-folder.c:360
+#: camel/providers/local/camel-local-folder.c:383
+#: camel/providers/local/camel-local-folder.c:386
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Postfach: %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:364
+#: camel/providers/local/camel-local-folder.c:390
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9640,50 +9675,54 @@ msgstr ""
 "Kann außerdem zum Einlesen eines Baums mit Elm-, Pine- oder Mutt-Ordnern "
 "verwendet werden."
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Speicherwurzel »%s« ist kein reguläres Verzeichnis."
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Lokale Speicher haben keinen Eingangsordner"
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale E-Mail-Datei %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "»%s« konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ordner-Zusammenfassungsdatei »%s« konnte nicht gelöscht werden: %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ordner-Indexdatei »%s« konnte nicht gelöscht werden: %s"
@@ -9725,7 +9764,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9788,29 +9827,29 @@ msgstr "Suchen nach neuen Nachrichten"
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
 
-#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-mbox-folder.c:230
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ordnersperre auf %s konnte nicht erzeugt werden: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:217
+#: camel/providers/local/camel-mbox-folder.c:289
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Postfach konnte nicht geöffnet werden: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:349
 msgid "Mail append cancelled"
 msgstr "Anhängen der E-Mail abgebrochen"
 
-#: camel/providers/local/camel-mbox-folder.c:280
+#: camel/providers/local/camel-mbox-folder.c:352
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nachricht konnte nicht an mbox-Datei angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
-#: camel/providers/local/camel-mbox-folder.c:399
-#: camel/providers/local/camel-mbox-folder.c:407
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9819,15 +9858,15 @@ msgstr ""
 "Nachricht konnte nicht erhalten werden: %s aus Ordner %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Erstellen der Nachricht fehlgeschlagen: Fehlerhaftes Postfach?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9836,7 +9875,16 @@ msgstr ""
 "Datei »%s« konnte nicht geöffnet werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr ""
+"Verzeichnis %s konnte nicht angelegt werden:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9845,14 +9893,15 @@ msgstr ""
 "Datei »%s« konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "»%s« ist keine reguläre Datei."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9861,11 +9910,36 @@ msgstr ""
 "Ordner »%s« konnte nicht gelöscht werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner »%s« ist nicht leer. Nicht gelöscht."
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Ein Ordnersperre mit diesem Namen konnte nicht erzeugt werden"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
+
+#: camel/providers/local/camel-mbox-store.c:427
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "Der angegebene Ordnername ist nicht gültig: %s"
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -10027,6 +10101,67 @@ msgstr ""
 "Spool-Ordner %s konnte nicht synchronisiert werden: %s\n"
 "Ordner könnte beschädigt sein, Kopie in »%s« gespeichert"
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, fuzzy, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "%sBitte geben Sie das SMTP-Passwort für %s@%s ein"
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+#, fuzzy
+msgid "Failed to send username to server"
+msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Nachricht %s konnte nicht abgerufen werden: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Benutzer hat abgebrochen"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "Gruppe konnte nicht ermittelt werden: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, fuzzy, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+"Ausgabedatei konnte nicht angelegt werden: %s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+"Ausgabedatei konnte nicht angelegt werden: %s\n"
+" %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-News"
@@ -10059,37 +10194,37 @@ msgstr ""
 "Diese Option führt die Legitimation am NNTP-Server mit einem "
 "unverschlüsselten Passwort durch."
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ordner existiert nicht: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Gruppe konnte nicht ermittelt werden: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: neue Nachrichten werden abgefragt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Unbekannte Serverrückmeldung: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 msgid "Use cancel"
 msgstr "Abbrechen verwenden"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operation fehlgeschlagen: %s"
@@ -10098,13 +10233,6 @@ msgstr "Operation fehlgeschlagen: %s"
 msgid "Retrieving POP summary"
 msgstr "POP-Zusammenfassung wird abgerufen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-msgid "User cancelled"
-msgstr "Benutzer hat abgebrochen"
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -10114,34 +10242,22 @@ msgstr "POP-Zusammenfassung konnte nicht abgerufen werden: %s"
 msgid "Expunging deleted messages"
 msgstr "Gelöschte Nachrichten werden ausgeräumt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr "Keine Nachricht mit UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP-Nachricht %d wird abgerufen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Nachricht %s konnte nicht abgerufen werden: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Nachrichtenspeicherung"
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "E-Mail auf Server belassen"
@@ -10472,7 +10588,7 @@ msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht gültig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
@@ -10490,57 +10606,57 @@ msgstr ""
 msgid "SMTP Greeting"
 msgstr "SMTP-Begrüßung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:926
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Zeitüberschreitung bei HELO-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:950
 msgid "HELO response error"
 msgstr "Fehler bei HELO-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1037
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeitüberschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1058
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1119
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Ungültige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1144
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: E-Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1164
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr "Fehler bei MAIL-FROM-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1188
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: E-Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1210
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1249
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: E-Mail nicht verschickt."
@@ -10548,37 +10664,37 @@ msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: E-Mail nicht verschickt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 msgid "DATA response error"
 msgstr "Fehler bei DATA-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1333
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zeitüberschreitung beim Übermitteln von DATA: Nachrichtenabschluss: %s E-"
 "Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1353
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 msgid "DATA termination response error"
 msgstr "Fehler bei DATA-Terminierungsantwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1376
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1396
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "RSET response error"
 msgstr "Fehler bei RSET-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1419
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Zeitüberschreitung bei QUIT-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1439
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "QUIT response error"
 msgstr "Fehler bei QUIT-Antwort"
 
@@ -10597,20 +10713,19 @@ msgstr "%.0f MB"
 msgid "%.0fG"
 msgstr "%.0f GB"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:311 mail/mail-display.c:226
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:449
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Die gewählten Objekte aus der Anlagenliste entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:479
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Anlage hinzufügen..."
 
-#: composer/e-msg-composer-attachment-bar.c:480
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
@@ -10642,89 +10757,11 @@ msgstr "MIME-Typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr "Hey, Sie! Sie brauchen ein Konto, um E-Mails zu verschicken!"
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Antwort an:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Von:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "An:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Geben Sie die Empfänger der Nachricht ein"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Kopie an:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-"Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Blindkopie an:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Geben Sie die Adressen ein, die eine Kopie erhalten, die nicht in der "
-"Empfängerliste auftaucht."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Ablegen in:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Zielordner"
-
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Datei(en) beilegen"
-
-#: composer/e-msg-composer.c:555
+#: composer/e-msg-composer.c:562
 msgid "Could not create a PGP signature context"
 msgstr "Es konnte kein PGP-Signaturkontext angelegt werden"
 
-#: composer/e-msg-composer.c:834
+#: composer/e-msg-composer.c:841
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10733,30 +10770,30 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1197
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, überschreiben?"
 
-#: composer/e-msg-composer.c:1215
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:1238
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1276
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1284
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1291
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10765,7 +10802,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1298
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10774,7 +10811,7 @@ msgstr ""
 "Datei konnte nicht verkürzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1307
+#: composer/e-msg-composer.c:1325
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10783,7 +10820,7 @@ msgstr ""
 "Dateideskriptor %s konnte nicht kopiert werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10792,7 +10829,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1413
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10801,7 +10838,7 @@ msgstr ""
 "entdeckt.\n"
 "Möchten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1575
+#: composer/e-msg-composer.c:1594
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10812,28 +10849,28 @@ msgstr ""
 "\n"
 "Wollen Sie die Änderungen speichern?"
 
-#: composer/e-msg-composer.c:1584
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr "Warnung: Geänderte Nachricht"
 
-#: composer/e-msg-composer.c:1616
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:2040
+#: composer/e-msg-composer.c:2054
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2080 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: composer/e-msg-composer.c:2256 composer/e-msg-composer.c:2925
-#: composer/e-msg-composer.c:2926
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Eine Nachricht verfassen"
 
-#: composer/e-msg-composer.c:2957
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10841,7 +10878,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "Adresswähler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:2985
+#: composer/e-msg-composer.c:3030
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10853,7 +10890,7 @@ msgstr ""
 "Bitte stellen Sie sicher, dass die korrekte gtkhtml- und\n"
 "libgtkhtml-Version installiert ist.\n"
 
-#: composer/e-msg-composer.c:3052
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10861,7 +10898,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:4078
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10869,6 +10906,86 @@ msgstr ""
 "<b>(Der Editor enthält einen nicht-Text Nachrichtenrumpf, der nicht "
 "bearbeitet werden kann.)<b>"
 
+#: composer/e-msg-composer-hdrs.c:290
+#, fuzzy
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+"Sie müssen ein Konto einrichten,\n"
+"bevor Sie E-Mails verfassen können."
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Antwort an:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Von:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "An:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Geben Sie die Empfänger der Nachricht ein"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Kopie an:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+"Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Blindkopie an:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Geben Sie die Adressen ein, die eine Kopie erhalten, die nicht in der "
+"Empfängerliste auftaucht."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Ablegen in:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Zielordner"
+
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Datei(en) beilegen"
+
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Die Groupware-Suite Evolution"
@@ -11039,7 +11156,7 @@ msgstr ""
 "Es existiert bereits eine Datei mit diesem Namen.\n"
 "Überschreiben?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:199
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
@@ -11061,90 +11178,210 @@ msgstr "Kategorien synchronisieren"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y / %I.%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y / %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %d.%m.%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y / %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H.%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1415 widgets/misc/e-dateedit.c:1628
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1412 widgets/misc/e-dateedit.c:1625
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%I %p"
 
+#: executive-summary/component/component-factory.c:151
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Evolution-Zusammenfassungskomponente"
+
+#: executive-summary/component/e-summary.c:925
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Ordner konnte nicht umbenannt werden:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:939
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Fehler beim Laden von %s"
+
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:125
+#, fuzzy
+msgid "Select a service"
+msgstr "Eine Datei wählen"
+
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Eine E-Mail verschicken"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Change the view to %s"
+msgstr "Typ der anzuzeigenden Ansicht"
+
+#: executive-summary/component/e-summary-url.c:73
+#, fuzzy, c-format
+msgid "Run %s"
+msgstr "URL: %s"
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Schließen"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Diesen Ordner an einen anderen Ort verschieben"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "/%s neu konfigurieren"
+
+#: executive-summary/component/e-summary-url.c:553
+#, fuzzy
+msgid "page"
+msgstr "Seite"
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+msgid "Error"
+msgstr "Fehler"
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update now"
+msgstr "Aktualisieren"
+
+#: executive-summary/test-service/rdf-summary.c:795
+#, fuzzy
+msgid "Update every "
+msgstr "Verfügbarkeit _aktualisieren"
+
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr "Vor 1 Sekunde"
@@ -11260,84 +11497,6 @@ msgstr "Sie müssen einen Ordner angeben"
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Fehler im regulären Ausdruck »%s«:\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
-msgid "Important"
-msgstr "Wichtig"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-msgid "Work"
-msgstr "Arbeit"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-msgid "Personal"
-msgstr "Persönlich"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
-msgid "To Do"
-msgstr "Zu erledigen"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
-msgid "Later"
-msgstr "Später"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Der Filter muss benannt werden."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Regelname: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Namenlos"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Falls"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Aktionen ausführen"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "falls alle Kriterien zutreffen"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "falls irgendein Kriterium zutreffen"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "Eingang"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "Ausgang"
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Vergleichen mit"
@@ -11440,6 +11599,84 @@ msgstr "mit allen lokalen Ordnern"
 msgid "years"
 msgstr "Jahre"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Fehler im regulären Ausdruck »%s«:\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+msgid "Important"
+msgstr "Wichtig"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Arbeit"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Persönlich"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+msgid "To Do"
+msgstr "Zu erledigen"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1458
+msgid "Later"
+msgstr "Später"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Der Filter muss benannt werden."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Regelname: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Namenlos"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Falls"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Aktionen ausführen"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "falls alle Kriterien zutreffen"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "falls irgendein Kriterium zutreffen"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "Eingang"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "Ausgang"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11463,217 +11700,217 @@ msgid "Beep"
 msgstr "Beep"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "enthält"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Verschickt-Datum"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Gelöscht"
 
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr "Existieren nicht"
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "enthält nicht"
+msgid "Draft"
+msgstr "Entwurf"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "endet nicht auf"
+msgid "Exist"
+msgstr "Existieren"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "existiert nicht"
+msgid "Expression"
+msgstr "Ausdruck"
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "liefert nicht"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "klingt nicht wie"
+msgid "Follow Up"
+msgstr "Folgenachricht"
 
 #: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "beginnt nicht mit"
+msgid "Label"
+msgstr "Etikett"
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Existieren nicht"
+msgid "Mailing list"
+msgstr "Mailingliste"
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Entwurf"
+msgid "Message Body"
+msgstr "Nachrichtenrumpf"
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "endet auf"
+msgid "Message Header"
+msgstr "Nachrichtenkopf"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Existieren"
+msgid "Move to Folder"
+msgstr "In Ordner verschieben"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existiert"
+msgid "Pipe Message to Shell Command"
+msgstr "Nachricht an Befehl im Terminal weiterleiten"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Ausdruck"
+msgid "Play Sound"
+msgstr "Klang abspielen"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Folgenachricht"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Gelesen"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Empfänger"
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "ist"
+msgid "Regex Match"
+msgstr "Regex-Treffer"
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "ist nach"
+msgid "Replied to"
+msgstr "Beantwortet"
 
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "ist vor"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Bewertung"
 
 #: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "ist markiert"
+msgid "Sender"
+msgstr "Absender"
 
 #: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "ist größer als"
+msgid "Set Status"
+msgstr "Status setzen:"
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "ist kleiner als"
+msgid "Shell Command"
+msgstr "Terminal-Befehl"
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ist nicht"
+msgid "Size (kB)"
+msgstr "Größe (kB)"
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "ist nicht markiert"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1840
-msgid "Label"
-msgstr "Etikett"
+msgid "Source Account"
+msgstr "Herkunftskonto"
 
-#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr "Mailingliste"
+#: filter/libfilter-i18n.h:35
+msgid "Specific header"
+msgstr "Bestimmte Kopfzeile"
 
 #: filter/libfilter-i18n.h:37
-msgid "Message Body"
-msgstr "Nachrichtenrumpf"
+msgid "Stop Processing"
+msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:38
-msgid "Message Header"
-msgstr "Nachrichtenkopf"
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Betreff"
 
 #: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
-msgstr "In Ordner verschieben"
+msgid "Unset Status"
+msgstr "Status nicht setzen"
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
-msgstr "Nachricht an Befehl im Terminal weiterleiten"
+msgid "contains"
+msgstr "enthält"
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
-msgstr "Klang abspielen"
+msgid "does not contain"
+msgstr "enthält nicht"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Gelesen"
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
+msgstr "endet nicht auf"
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
-msgstr "Empfänger"
+msgid "does not exist"
+msgstr "existiert nicht"
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
-msgstr "Regex-Treffer"
+msgid "does not return"
+msgstr "liefert nicht"
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
-msgstr "Beantwortet"
+msgid "does not sound like"
+msgstr "klingt nicht wie"
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
-msgstr "liefert"
+msgid "does not start with"
+msgstr "beginnt nicht mit"
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
-msgstr "liefert größer als"
+msgid "ends with"
+msgstr "endet auf"
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
-msgstr "liefert kleiner als"
+msgid "exists"
+msgstr "existiert"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Bewertung"
+#: filter/libfilter-i18n.h:49
+msgid "is Flagged"
+msgstr "ist markiert"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
-msgid "Sender"
-msgstr "Absender"
+#: filter/libfilter-i18n.h:50
+msgid "is after"
+msgstr "ist nach"
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
-msgstr "Status setzen:"
+msgid "is before"
+msgstr "ist vor"
 
 #: filter/libfilter-i18n.h:52
-msgid "Shell Command"
-msgstr "Terminal-Befehl"
+msgid "is greater than"
+msgstr "ist größer als"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "Größe (kB)"
+msgid "is less than"
+msgstr "ist kleiner als"
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "klingt wie"
+msgid "is not Flagged"
+msgstr "ist nicht markiert"
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
-msgstr "Herkunftskonto"
+msgid "is not"
+msgstr "ist nicht"
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
-msgstr "Bestimmte Kopfzeile"
+msgid "is"
+msgstr "ist"
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "beginnt mit"
+msgid "returns greater than"
+msgstr "liefert größer als"
+
+#: filter/libfilter-i18n.h:58
+msgid "returns less than"
+msgstr "liefert kleiner als"
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
-msgstr "Verarbeitung abbrechen"
+msgid "returns"
+msgstr "liefert"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:933
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Betreff"
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
+msgstr "klingt wie"
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
-msgstr "Status nicht setzen"
+msgid "starts with"
+msgstr "beginnt mit"
 
-#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:916
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelname »%s« ist nicht eindeutig. Wählen Sie einen anderen."
@@ -11741,10 +11978,9 @@ msgid "Scanning %s"
 msgstr "%s wird abgetastet"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:362 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "E-Mail"
 
@@ -11835,7 +12071,7 @@ msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Müll"
 
@@ -11885,100 +12121,39 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Editoreinstellungen"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
-"der Anzeige von Nachrichten festlegen"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
-"Nachrichteneditor konfigurieren"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution E-Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Bedienelement zur Konfiguration von Evolution-E-Mail-Konten"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution-E-Mail-Komponente"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution-E-Mail-Editor"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Bedienelement zur Konfiguration des Evolution-E-Mail-Editors"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Evolution-E-Mail-Konfigurationsoberfläche"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution-E-Mail-Ordnerbetrachter"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr "Evoltion-E-Mail-Einstellungen-Bedienelement"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-Mail-Konten"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "E-Mail-Einstellungen"
-
-#: mail/component-factory.c:117
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Ordner, der E-Mails enthält"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Öffentliche E-Mail"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Öffentlicher Ordner, der E-Mails enthält"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtueller Müll"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtueller Müllordner"
 
-#: mail/component-factory.c:147
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners festlegen"
 
-#: mail/component-factory.c:823
+#: mail/component-factory.c:826
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11986,236 +12161,112 @@ msgstr ""
 "Einige Ihrer E-Mail-Einstellungen scheinen ungültig zu sein, bitte stellen "
 "Sie sicher, dass alles in Ordnung ist."
 
-#: mail/component-factory.c:1004
+#: mail/component-factory.c:1008
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Methode für den Transport von E-Mails eingestellt"
 
-#: mail/component-factory.c:1027
+#: mail/component-factory.c:1031
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Es sind noch nicht verschickte Nachrichten vorhanden. Wollen Sie Evolution "
 "dennoch beenden?"
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1071
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1071
 msgid "_Mail Message"
 msgstr "E-_Mail-Nachricht"
 
-#: mail/component-factory.c:1068
+#: mail/component-factory.c:1072
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: mail/component-factory.c:1076
+#: mail/component-factory.c:1080
 msgid "New Message Post"
 msgstr "Neue Ordner-Nachricht"
 
-#: mail/component-factory.c:1076
+#: mail/component-factory.c:1080
 msgid "_Post Message"
 msgstr "_Nachricht an Ordner"
 
-#: mail/component-factory.c:1077
+#: mail/component-factory.c:1081
 msgid "Post a new mail message"
 msgstr "Eine neue E-Mail-Nachricht an einen Ordner verfassen"
 
-#: mail/component-factory.c:1369
+#: mail/component-factory.c:1373
 msgid "Connecting..."
 msgstr "Verbindung wird hergestellt..."
 
-#: mail/component-factory.c:1380
+#: mail/component-factory.c:1384
 msgid "Cannot register storage with shell"
 msgstr "Speicher konnte nicht bei der Shell registriert werden"
 
-#: mail/folder-browser-ui.c:488
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Eigenschaften von »%s«"
-
-#: mail/folder-browser-ui.c:490
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: mail/folder-browser.c:329 mail/mail-display.c:393 mail/mail-display.c:917
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
-
-#: mail/folder-browser.c:804
-#, c-format
-msgid "%d new"
-msgstr "%d neu"
-
-#: mail/folder-browser.c:807 mail/folder-browser.c:815
-#: mail/folder-browser.c:818
-msgid ", "
-msgstr ", "
-
-#: mail/folder-browser.c:809
-#, c-format
-msgid "%d hidden"
-msgstr "%d verborgen"
-
-#: mail/folder-browser.c:811
-#, c-format
-msgid "%d visible"
-msgstr "%d sichtbar"
-
-#: mail/folder-browser.c:816
-#, c-format
-msgid "%d selected"
-msgstr "%d ausgewählt"
-
-#: mail/folder-browser.c:821
-#, c-format
-msgid "%d unsent"
-msgstr "%d nicht verschickt"
-
-#: mail/folder-browser.c:823
-#, c-format
-msgid "%d sent"
-msgstr "%d verschickt"
-
-#: mail/folder-browser.c:825
-#, c-format
-msgid "%d total"
-msgstr "%d insgesamt"
-
-#: mail/folder-browser.c:1204
-msgid "Create _Virtual Folder From Search..."
-msgstr "_Virtuellen Ordner aus Suche anlegen..."
-
-#: mail/folder-browser.c:1776
-msgid "VFolder on _Subject"
-msgstr "VOrdner über _Betreff"
-
-#: mail/folder-browser.c:1777
-msgid "VFolder on Se_nder"
-msgstr "VOrdner über Abse_nder"
-
-#: mail/folder-browser.c:1778
-msgid "VFolder on _Recipients"
-msgstr "VOrdner über _Empfänger"
-
-#: mail/folder-browser.c:1779
-msgid "VFolder on Mailing _List"
-msgstr "VOrdner über Mailing_liste"
-
-#: mail/folder-browser.c:1783
-msgid "Filter on Sub_ject"
-msgstr "Filter über _Betreff"
-
-#: mail/folder-browser.c:1784
-msgid "Filter on Sen_der"
-msgstr "Filter über _Absender"
-
-#: mail/folder-browser.c:1785
-msgid "Filter on Re_cipients"
-msgstr "Filter über _Empfänger"
-
-#: mail/folder-browser.c:1786 mail/folder-browser.c:2110
-msgid "Filter on _Mailing List"
-msgstr "Filter über _Mailingliste"
-
-#: mail/folder-browser.c:1804
-msgid "_Edit as New Message..."
-msgstr "Als neue Nachricht _bearbeiten..."
-
-#: mail/folder-browser.c:1806
-msgid "_Print"
-msgstr "_Drucken"
-
-#: mail/folder-browser.c:1810 ui/evolution-mail-message.xml.h:112
-msgid "_Reply to Sender"
-msgstr "Antwort an Ab_sender"
-
-#: mail/folder-browser.c:1811 ui/evolution-mail-message.xml.h:76
-msgid "Reply to _List"
-msgstr "_Liste antworten"
-
-#: mail/folder-browser.c:1812 ui/evolution-mail-message.xml.h:75
-msgid "Reply to _All"
-msgstr "_Allen antworten"
-
-#: mail/folder-browser.c:1813
-msgid "_Forward"
-msgstr "_Weiterleiten"
-
-#: mail/folder-browser.c:1817
-msgid "Follo_w Up..."
-msgstr "Follo_w Up..."
-
-#: mail/folder-browser.c:1818
-msgid "Fla_g Completed"
-msgstr "Als abgeschlossen _markieren"
-
-#: mail/folder-browser.c:1819
-msgid "Cl_ear Flag"
-msgstr "Markierung _löschen"
-
-#. separator here?
-#: mail/folder-browser.c:1823 ui/evolution-mail-message.xml.h:44
-msgid "Mar_k as Read"
-msgstr "Als gelesen mar_kieren"
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Ordner-Informationen werden entnommen"
 
-#: mail/folder-browser.c:1824
-msgid "Mark as _Unread"
-msgstr "Als _ungelesen markieren"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Editoreinstellungen"
 
-#: mail/folder-browser.c:1825
-msgid "Mark as _Important"
-msgstr "Als _wichtig markieren"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
+"der Anzeige von Nachrichten festlegen"
 
-#: mail/folder-browser.c:1826
-msgid "_Mark as Unimportant"
-msgstr "Als unwichtig _markieren"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
+"Nachrichteneditor konfigurieren"
 
-#: mail/folder-browser.c:1831
-msgid "U_ndelete"
-msgstr "Lösche_n rückgängig"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
 
-#: mail/folder-browser.c:1835
-msgid "Mo_ve to Folder..."
-msgstr "In Ordner _verschieben..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution E-Mail"
 
-#: mail/folder-browser.c:1836 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "In Ordner kopieren..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Bedienelement zur Konfiguration von Evolution-E-Mail-Konten"
 
-#: mail/folder-browser.c:1844
-msgid "Add Sender to Address_book"
-msgstr "Absender zum Adress_buch hinzufügen"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution-E-Mail-Komponente"
 
-#: mail/folder-browser.c:1848
-msgid "Appl_y Filters"
-msgstr "Filter _anwenden"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution-E-Mail-Editor"
 
-#: mail/folder-browser.c:1852
-msgid "Crea_te Rule From Message"
-msgstr "_Regel aus Nachricht anlegen"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Bedienelement zur Konfiguration des Evolution-E-Mail-Editors"
 
-#: mail/folder-browser.c:2111
-msgid "VFolder on M_ailing List"
-msgstr "VOrdner über M_ailingliste"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail configuration interface"
+msgstr "Evolution-E-Mail-Konfigurationsoberfläche"
 
-#: mail/folder-browser.c:2113
-#, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Filter über _Mailingliste (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution-E-Mail-Ordnerbetrachter"
 
-#: mail/folder-browser.c:2114
-#, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "VOrdner über M_ailingliste (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
+msgstr "Evoltion-E-Mail-Einstellungen-Bedienelement"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Vorgabe"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-Mail-Konten"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Ordner-Informationen werden entnommen"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "E-Mail-Einstellungen"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -12301,7 +12352,7 @@ msgstr "_Benutzername:"
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1886
 msgid "You may not create two accounts with the same name."
 msgstr "Sie können keine zwei Konten mit demselben Namen anlegen."
 
@@ -12332,16 +12383,16 @@ msgstr "[Vorgabe]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 msgid "Account name"
 msgstr "Kontoname"
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -12384,222 +12435,6 @@ msgstr ""
 "    »%s«\n"
 "Und wurden aktualisiert."
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "Diese Meldung nicht mehr anzeigen."
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Sie haben den E-Mail-Client nicht konfiguriert.\n"
-"Sie müssen dies tun, bevor Sie E-Mails verschicken,\n"
-"abrufen oder verfassen können.\n"
-"Möchten Sie ihn jetzt konfigurieren?"
-
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-"Sie müssen ein Konto einrichten,\n"
-"bevor Sie E-Mails verfassen können."
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Sie müssen eine Identität einrichten,\n"
-"bevor Sie E-Mails verfassen können."
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Sie müssen einen Mailtransport einrichten,\n"
-"bevor Sie E-Mails verfassen können."
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-"Sie verschicken eine HTML-formatierte Nachricht. Bitte stellen Sie sicher,\n"
-"dass die folgenden Empfänger HTML-Mails abrufen können und wollen:\n"
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "Dennoch verschicken?"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Diese Nachricht hat keinen Betreff.\n"
-"Wirklich verschicken?"
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-"Da die Kontaktliste, an die Sie diese Nachricht verschicken, konfiguriert "
-"ist, die Adressen der Liste zu verbergen, wird die Nachricht lediglich an "
-"Blindkopie-Empfängeradressen übermittlt."
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "Diese Nachricht enthält ausschließlich Blindkopie-Empfänger."
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-"Es ist möglich, dass der E-Mail-Server die Empfänger kenntlich macht, indem "
-"er eine Apparently-To-Kopfzeile hinzufügt.\n"
-"Dennoch verschicken?"
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu verschicken."
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Der Entwürfe-Ordner für dieses Konto konnte nicht geöffnet werden.\n"
-"Möchten Sie den voreingestellten Entwürfe-Ordner verwenden?"
-
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr "ein unbekannter Absender"
-
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %%s:"
-
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "Nachricht(en) verschieben in"
-
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "Nachricht(en) kopieren in"
-
-#: mail/mail-callbacks.c:2344
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten bearbeiten wollen?"
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Sie können nur im Entwürfe-Ordner\n"
-"abgespeicherte Nachrichten bearbeiten."
-
-#: mail/mail-callbacks.c:2393
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Sie können nur Nachrichten im\n"
-"Verschickt-Ordner neu verschicken."
-
-#: mail/mail-callbacks.c:2403
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr ""
-"Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
-
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr "Keine Nachricht markiert"
-
-#: mail/mail-callbacks.c:2465
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"In »%s« konnte nicht gespeichert werden:\n"
-"  %s"
-
-#: mail/mail-callbacks.c:2470
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"»%s« ist bereits vorhanden.\n"
-"Soll es überschrieben werden?"
-
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr "Nachricht speichern unter..."
-
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr "Nachrichten speichern unter..."
-
-#: mail/mail-callbacks.c:2686
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"Dieser Vorgang wird alle als gelöscht markierten Nachrichten dauerhaft "
-"entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nicht "
-"wiederherstellen können.\n"
-"\n"
-"Sollen die Nachrichten wirklich entfernt werden?"
-
-#: mail/mail-callbacks.c:2781
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Fehler beim Laden von Filterinformation:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr "Filter"
-
-#: mail/mail-callbacks.c:2830
-#, c-format
-msgid "Page %d of %d"
-msgstr "Seite %d von %d"
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr "Nachricht drucken"
-
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr "Drucken der Nachricht fehlgeschlagen"
-
-#: mail/mail-callbacks.c:3147
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr ""
-"Sind Sie sicher, dass Sie alle %d Nachrichten in getrennten Fenstern öffnen "
-"wollen?"
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12625,11 +12460,19 @@ msgstr "Skript-Signatur hinzufügen"
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Dienst wird überprüft"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Verbindung zu Server..."
+
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identität"
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:369
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12640,11 +12483,11 @@ msgstr ""
 "ausgefüllt werden, sofern Sie diese Informationen nicht in den E-Mails, die "
 "Sie verschicken, einschließen wollen."
 
-#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 msgid "Receiving Mail"
 msgstr "Abrufen von E-Mail"
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:377
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12653,15 +12496,15 @@ msgstr ""
 "an. Falls Sie nicht sich sicher sind, wenden Sie sich bitte an Ihren "
 "Systemadministrator oder Internet-Provider."
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 msgid "Sending Mail"
 msgstr "Verschicken von E-Mail"
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:389
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12670,11 +12513,11 @@ msgstr ""
 "verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich bitte "
 "an Ihren Systemadministrator oder Internet-Provider."
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Kontenverwaltung"
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:396
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12690,14 +12533,6 @@ msgstr ""
 "dieses Konto ein.\n"
 "Dieser Name wird nur zur Anzeige auf dem Bildschirm verwendet."
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Dienst wird überprüft"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Verbindung zu Server..."
-
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Prüfen, welche Typen unterstützt werden "
@@ -12823,6 +12658,10 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Vorgabe"
 
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Vorgabe"
+
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Vorgabe-Verhalten"
@@ -13274,218 +13113,25 @@ msgstr "Sichere Verbindung (_SSL) verwenden:"
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie die anderen Anwendungen _verwenden"
 
-#: mail/mail-config.glade.h:171
-msgid "color"
-msgstr "Farbe"
-
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "Beschreibung"
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr "S/MIME-Signaturkontext konnte nicht angelegt werden."
-
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
-msgstr "S/MIME-certsonly-Kontext konnte nicht angelegt werden."
-
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr "S/MIME-Verschlüsselungskontext konnte nicht angelegt werden."
-
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
-msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
-
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr "S/MIME-Entschlüsselungskontext konnte nicht angelegt werden."
-
-#: mail/mail-display.c:196
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Es existiert bereits eine Datei mit Namen »%s«.\n"
-"Soll diese überschrieben werden?"
-
-#: mail/mail-display.c:335
-msgid "Save Attachment"
-msgstr "Anlage speichern"
-
-#: mail/mail-display.c:408
-#, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "Die temporäre Datei »%s« konnte nicht angelegt werden: %s"
-
-#: mail/mail-display.c:476
-msgid "Save Attachment..."
-msgstr "Anlage speichern..."
-
-#: mail/mail-display.c:477
-msgid "View Inline"
-msgstr "An Ort und Stelle anzeigen"
-
-#: mail/mail-display.c:478
-#, c-format
-msgid "Open in %s..."
-msgstr "Öffnen in %s..."
-
-#: mail/mail-display.c:538
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "An Ort und Stelle anzeigen (mit %s)"
-
-#: mail/mail-display.c:542
-msgid "Hide"
-msgstr "Verbergen"
-
-#: mail/mail-display.c:562
-msgid "External Viewer"
-msgstr "Externer Betrachter"
-
-#: mail/mail-display.c:1348
-msgid "Downloading images"
-msgstr "Bilder werden heruntergeladen"
-
-#: mail/mail-display.c:1525
-msgid "Loading message content"
-msgstr "Laden des Nachrichteninhalts"
-
-#: mail/mail-display.c:1867
-msgid "Overdue:"
-msgstr "Überfallig:"
-
-#: mail/mail-display.c:1871
-msgid "by %B %d, %Y, %l:%M %P"
-msgstr "am %d. %B %Y, %H:%M"
-
-#: mail/mail-display.c:2235
-msgid "Open Link in Browser"
-msgstr "Link in Browser öffnen"
-
-#: mail/mail-display.c:2236
-msgid "Copy Link Location"
-msgstr "Linkziel kopieren"
-
-#: mail/mail-display.c:2238
-msgid "Save Link as (FIXME)"
-msgstr "Link speichern unter (FIXME)"
-
-#: mail/mail-display.c:2240
-msgid "Save Image as..."
-msgstr "Bild speichern unter..."
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
 
-#: mail/mail-format.c:664
-#, c-format
-msgid "%s attachment"
-msgstr "%s-Anlage"
-
-#: mail/mail-format.c:706 mail/mail-format.c:1343 mail/mail-format.c:1414
-#: mail/mail-format.c:1534 mail/mail-format.c:1658 mail/mail-format.c:1683
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-"Die MIME-Nachricht konnte nicht verarbeitet werden und wird daher als "
-"Quellxt angezeigt."
-
-#: mail/mail-format.c:784 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/mail-format.c:870
-msgid "Bad Address"
-msgstr "Ungültige Adresse"
-
-#: mail/mail-format.c:911 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Von"
-
-#: mail/mail-format.c:915
-msgid "Reply-To"
-msgstr "Antwort an"
-
-#: mail/mail-format.c:920 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "An"
-
-#: mail/mail-format.c:925
-msgid "Cc"
-msgstr "Kopie"
-
-#: mail/mail-format.c:930
-msgid "Bcc"
-msgstr "Blindkopie"
-
-#: mail/mail-format.c:1457
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Diese Nachricht ist digital signiert. Klicken Sie auf das Schlosssymbol, um "
-"weitere Informationen zu erhalten."
-
-#: mail/mail-format.c:1485
-msgid "Could not create a PGP verfication context"
-msgstr "Es konnte kein PGP-Überprüfungskontext angelegt werden"
-
-#: mail/mail-format.c:1493
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-"Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
-"nachgewiesen."
-
-#: mail/mail-format.c:1500
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Diese Nachricht ist digital unterzeichnet, aber konnte nicht als authentisch "
-"nachgewiesen werden."
-
-#: mail/mail-format.c:1764
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Zeiger auf FTP-Site (%s)"
-
-#: mail/mail-format.c:1775
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
-
-#: mail/mail-format.c:1778
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Zeiger auf lokale Datei (%s)"
-
-#: mail/mail-format.c:1805
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Zeiger auf Daten im Netz (%s)"
-
-#: mail/mail-format.c:1811
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
-
-#: mail/mail-format.c:1813
-msgid "Malformed external-body part."
-msgstr "Ungültiger external-body-Teil."
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokale Ordner/%s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:711
 msgid "Reconfiguring folder"
 msgstr "Ordner wird umkonfiguriert"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:792
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13494,37 +13140,37 @@ msgstr ""
 "Metainformationen zum Ordner konnten nicht gespeichert werden; Sie\n"
 "können ihn wahrscheinlich nicht mehr öffnen: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:848
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Metainformationen zum Ordner können nicht in %s gespeichert werden: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:900
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ordner-Metadaten %s können nicht gelöscht werden: %s"
 
-#: mail/mail-local.c:1323
+#: mail/mail-local.c:1363
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner »%s« in »%s«-Format um"
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1388
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr "Datei %s konnte nicht geladen werden"
 
-#: mail/mail-local.c:1448
+#: mail/mail-local.c:1488
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s neu konfigurieren"
 
-#: mail/mail-local.c:1512
+#: mail/mail-local.c:1552
 msgid "You cannot change the format of a non-local folder."
 msgstr "Sie können das Format eines nichtlokalen Ordners nicht ändern."
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:259
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13534,7 +13180,7 @@ msgstr ""
 "  %s:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:262
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13543,118 +13189,131 @@ msgstr ""
 "Fehler bei folgendem Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:913
 msgid "Working"
 msgstr "In Arbeit"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:87
 msgid "Filtering Folder"
 msgstr "Ordner wird gefiltert"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#: mail/mail-ops.c:550 mail/mail-ops.c:579
-msgid "However, the message was successfully sent."
-msgstr "Dennoch wurde die Nachricht erfolgreich verschickt."
+#: mail/mail-ops.c:557
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "E-Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
+
+#: mail/mail-ops.c:578
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: mail/mail-ops.c:587
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "E-Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr "»%s« wird verschickt"
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden abgetastet"
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr "Ordner wird aktualisiert"
 
-#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1666
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d Nachricht(en) werden/wird abgerufen"
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d Nachricht(en) werden/wird gespeichert"
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13663,7 +13322,7 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13672,11 +13331,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13685,106 +13344,74 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird neu aufgebaut"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Unbenannte Nachricht)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Unbenannte Nachricht"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Leere Nachricht"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "In Nachricht suchen"
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr "Groß-/Kleinschreibung beachten"
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "Vorwärts suchen"
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr "Suchen:"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Passt auf:"
-
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr "Stornieren..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pfad: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:259
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:308
 msgid "Send & Receive Mail"
 msgstr "E-Mails abrufen und verschicken"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 msgid "Cancel _All"
 msgstr "_Alles abbrechen"
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:390
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:229
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:262
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:264
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:287
 msgid "_Remember this password"
 msgstr "An dieses Passwort e_rinnern"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:288
 msgid "_Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort e_rinnern"
 
@@ -13833,21 +13460,17 @@ msgstr "Weitergeleitete Nachricht - %s"
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-tools.c:459 mail/mail-tools.c:466
-msgid "Forwarded Message"
-msgstr "Weitergeleitete Nachricht"
-
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "VOrdner wird eingerichtet: %s"
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:209
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "VOrdner werden aktualisiert für URI: %s"
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:467
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13860,101 +13483,96 @@ msgstr ""
 "   »%s«\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:776
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:834
 msgid "vFolders"
 msgstr "vOrdner"
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:873
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Es wurde versucht, einen vOrdner »%s« zu editieren, der nicht existiert."
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:965
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Kein Betreff)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - Nachricht"
-
-#: mail/message-list.c:741
+#: mail/message-list.c:900
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:742
+#: mail/message-list.c:901
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:743
+#: mail/message-list.c:902
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:903
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:904
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:908
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:909
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:754
+#: mail/message-list.c:913
 msgid "Higher"
 msgstr "Höher"
 
-#: mail/message-list.c:755
+#: mail/message-list.c:914
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1231
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1238
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1247
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1259
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1267
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %H.%M"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1269
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3062
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datum"
+
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Fällig am "
@@ -13971,6 +13589,10 @@ msgstr "Markiert"
 msgid "Follow Up Flag"
 msgstr "Folgenachricht-Markierung"
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Von"
+
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Ursprünglicher Speicherort"
@@ -13983,6 +13605,10 @@ msgstr "Erhalten"
 msgid "Size"
 msgstr "Größe"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "An"
+
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Anrufen"
@@ -13999,7 +13625,7 @@ msgstr "Follow-Up"
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:37
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr "Weiterleiten"
 
@@ -14007,11 +13633,11 @@ msgstr "Weiterleiten"
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:74
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
 msgid "Reply to All"
 msgstr "Allen antworten"
 
@@ -14045,39 +13671,6 @@ msgstr "_Fällig am:"
 msgid "_Flag:"
 msgstr "_Markierung:"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "Ordner unter %s auf »%s« werden abgetastet"
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "Ordner der obersten Ebene auf »%s« werden abgetastet"
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Ordner »%s« wird abonniert"
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Abonnement auf Ordner »%s« wird abbestellt"
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Ordner"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "Es wurde kein Server gewählt"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Bitte wählen Sie einen Server."
-
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Abonnements verwalten"
@@ -14091,17 +13684,123 @@ msgid "S_erver:"
 msgstr "_Server:"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Scanning folders ..."
-msgstr "Ordner werden abgetastet..."
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Ordner mit der Evolution-Übersicht"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %e. %B %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Bitte warten..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Zusammenfassung drucken"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Drucken der Übersicht fehlgeschlagen"
+
+#: my-evolution/e-summary-calendar.c:384
+msgid "Appointments"
+msgstr "Termine"
+
+#: my-evolution/e-summary-calendar.c:392
+msgid "No appointments."
+msgstr "Keine Termine."
+
+#: my-evolution/e-summary-calendar.c:409
+msgid "%k:%M %d %B"
+msgstr "%k.%M %d. %B"
+
+#: my-evolution/e-summary-calendar.c:411
+#, fuzzy
+msgid "%l:%M%p %d %B"
+msgstr "%k.%M %d. %B"
+
+#: my-evolution/e-summary-calendar.c:429
+msgid "No description"
+msgstr "Keine Beschreibung"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "E-Mail-Zusammenfassung"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com: Wort des Tages"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Zitate des Tages"
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr "Neuer Nachrichtenkanal"
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr "_URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Fehler beim Herunterladen des RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Nachrichtenkanal"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Alle"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Angezeigt"
+
+#: my-evolution/e-summary-tasks.c:349
+msgid "No tasks"
+msgstr "Keine Aufgaben"
+
+#: my-evolution/e-summary-tasks.c:387
+#, fuzzy
+msgid "blue"
+msgstr "Ambler"
+
+#: my-evolution/e-summary-tasks.c:387
+msgid "(No Description)"
+msgstr "(keine Beschreibung)"
+
+#: my-evolution/e-summary-weather.c:72
+msgid "My Weather"
+msgstr "Mein Wetter"
+
+#: my-evolution/e-summary-weather.c:261
+msgid "There was an error downloading data for"
+msgstr "Ein Fehler ist aufgetreten beim Herunterladen der Daten für"
+
+#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Wetter"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:582
+msgid "KBOS"
+msgstr "KBOS"
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Hier können Sie das Erscheinungsbild von Evolution konfigurieren"
@@ -23907,110 +23606,6 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zürich"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Ordner mit der Evolution-Übersicht"
-
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr "Termine"
-
-#: my-evolution/e-summary-calendar.c:389
-msgid "No appointments."
-msgstr "Keine Termine."
-
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr "%k.%M %d. %B"
-
-#: my-evolution/e-summary-calendar.c:408
-msgid "%l:%M%P %d %B"
-msgstr "%k.%M %d. %B"
-
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr "Keine Beschreibung"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "E-Mail-Zusammenfassung"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com: Wort des Tages"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Zitate des Tages"
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr "Neuer Nachrichtenkanal"
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "_URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Fehler beim Herunterladen des RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Nachrichtenkanal"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Alle"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Angezeigt"
-
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr "Keine Aufgaben"
-
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr "(keine Beschreibung)"
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Mein Wetter"
-
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr "Ein Fehler ist aufgetreten beim Herunterladen der Daten für"
-
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Wetter"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr "KBOS"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %e. %B %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Bitte warten..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Zusammenfassung drucken"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Drucken der Übersicht fehlgeschlagen"
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -25269,21 +24864,27 @@ msgstr "_Ein Tag"
 msgid "_Show full path for folders"
 msgstr "_Vollen Pfad für Ordner anzeigen"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Hier können Sie spezielle Ordner und Offline-Ordner konfigurieren"
+#: notes/component-factory.c:27
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Neu"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution-Shell"
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Einen neuen Ordner anlegen"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Bedienelement zur Konfiguration von Evolution-Ordner"
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Die Ximian-Evolution-Shell konnte nicht initialisiert werden: %s"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Ordnereinstellungen"
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Bonobo konnte nicht initialisiert werden"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25379,6 +24980,49 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Das Team:"
 
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Komponente %s konnte nicht aktiviert werden:\n"
+"Der Fehler im Aktivierungssystem lautet:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Lokaler Speicher konnte nicht eingestellt werden -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Die Evolution-Komponente, die Ordner des Typs »%s« betreut, brach\n"
+"unerwartet ab. Sie müssen Evolution beenden und neu starten, um\n"
+"wieder auf diese Daten zugreifen zu können."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Ungültige Argumente"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Registrierung bei OAF konnte nicht stattfinden"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Konfigurationsdatenbank nicht gefunden"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Allgemeiner Fehler"
+
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Extra Ordner zur Vervollständigung"
@@ -25624,23 +25268,27 @@ msgid "Automatic"
 msgstr "Automatisch"
 
 #: shell/e-shell-importer.c:643
-msgid "Filename:"
+#, fuzzy
+msgid "_Filename:"
 msgstr "Dateiname:"
 
 #: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/e-shell-importer.c:657
-msgid "File type:"
+#: shell/e-shell-importer.c:658
+#, fuzzy
+msgid "File _type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:682
-msgid "Import data and settings from older programs"
+#: shell/e-shell-importer.c:684
+#, fuzzy
+msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus älteren Programmen importieren"
 
-#: shell/e-shell-importer.c:686
-msgid "Import a single file"
+#: shell/e-shell-importer.c:687
+#, fuzzy
+msgid "Import a _single file"
 msgstr "Eine einzelne Datei importieren"
 
 #: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
@@ -25668,8 +25316,9 @@ msgstr "Ordner wählen"
 msgid "Select a destination folder for importing this data"
 msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
 
-#: shell/e-shell-importer.c:1192 shell/importer/intelligent.c:191
-msgid "Import"
+#: shell/e-shell-importer.c:1193
+#, fuzzy
+msgid "_Import"
 msgstr "Importieren"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25729,11 +25378,19 @@ msgstr "Gemeinschaftsordner konnte nicht geöffnet werden: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Der angegebene Gemeinschaftsordner konnte nicht gefunden werden."
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Neu"
+#: shell/e-shell-startup-wizard.c:771
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:782
+#, fuzzy
+msgid "Quit Assistant"
+msgstr "Assistent"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25755,6 +25412,37 @@ msgstr "Ordnername darf das Raute-Zeichen »#« nicht enthalten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' und '..' sind reservierte Ordnernamen."
 
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Kein Ordner angezeigt)"
+
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(keine)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um "
+"offline zu arbeiten."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution geht gerade offline."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um "
+"online zu arbeiten."
+
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -25806,79 +25494,13 @@ msgstr "_Offline arbeiten"
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Kein Ordner angezeigt)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(keine)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um "
-"offline zu arbeiten."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution geht gerade offline."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um "
-"online zu arbeiten."
-
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Komponente %s konnte nicht aktiviert werden:\n"
-"Der Fehler im Aktivierungssystem lautet:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Lokaler Speicher konnte nicht eingestellt werden -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Die Evolution-Komponente, die Ordner des Typs »%s« betreut, brach\n"
-"unerwartet ab. Sie müssen Evolution beenden und neu starten, um\n"
-"wieder auf diese Daten zugreifen zu können."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Ungültige Argumente"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Registrierung bei OAF konnte nicht stattfinden"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Konfigurationsdatenbank nicht gefunden"
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Fehler beim Speichern von Verknüpfungen."
 
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Allgemeiner Fehler"
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Verknüpfungen"
 
 #: shell/e-shortcuts-view.c:80
 msgid "Create New Shortcut Group"
@@ -25994,18 +25616,6 @@ msgstr "_Entfernen"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Fehler beim Speichern von Verknüpfungen."
-
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Verknüpfungen"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kontrollkästchen"
-
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Kein Fehler"
@@ -26062,6 +25672,14 @@ msgstr "Ein Ordnersperre mit diesem Namen konnte nicht erzeugt werden"
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Diese Aktion kann im Offline-Modus nicht ausgeführt werden"
 
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Kontrollkästchen"
+
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Ordner"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -26076,43 +25694,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Unbekannter Fehler."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Der Fehler im Komponentensystem ist:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Der Fehler vom Aktivierungssystem ist:\n"
-"%s"
-
 #: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr "CORBA-Fehler"
@@ -26173,6 +25754,43 @@ msgstr "Keine Platz mehr frei"
 msgid "Old owner has died"
 msgstr "Alter Besitzer ist gestorben"
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Unbekannter Fehler."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Der Fehler im Komponentensystem ist:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Der Fehler vom Aktivierungssystem ist:\n"
+"%s"
+
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Testtyp"
@@ -26280,6 +25898,22 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu speichern."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Hier können Sie spezielle Ordner und Offline-Ordner konfigurieren"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution-Shell"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Bedienelement zur Konfiguration von Evolution-Ordner"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Ordnereinstellungen"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -26320,6 +25954,10 @@ msgstr ""
 msgid "Importers"
 msgstr "Importeure"
 
+#: shell/importer/intelligent.c:191
+msgid "Import"
+msgstr "Importieren"
+
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Nicht importieren"
@@ -26514,7 +26152,7 @@ msgstr "Kontakt(e) in einen anderen Ordner verschieben..."
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einfügen"
 
@@ -26522,8 +26160,8 @@ msgstr "Inhalt der Zwischenablage einfügen"
 msgid "Previews the contacts to be printed"
 msgstr "Eine Vorschau auf die zu druckenden Kontakte anzeigen"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:69
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
@@ -26568,17 +26206,21 @@ msgstr "Laden abbrechen"
 msgid "View the current contact"
 msgstr "Den aktuellen Kontakt anzeigen"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "A_ktionen"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "In Ordner kopieren..."
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "Kontakt _weiterleiten..."
 
@@ -26646,54 +26288,59 @@ msgstr "Zu einem bestimmten Datum gehen"
 msgid "Go to today"
 msgstr "Zum heutigen Tag gehen"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "Monat"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr "Eine Vorschau auf den zu druckenden Kalender anzeigen"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Verfügbarkeitsinformationen für diesen Kalender veröffentlichen"
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr "_Säubern"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "Alte Termine und Treffen säubern"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Show as list"
+msgstr "Details anzeigen"
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr "Einen Tag anzeigen"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr "Einen Monat anzeigen"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr "Eine Woche anzeigen"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Die Werkwoche anzeigen"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr "Woche"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Schließen"
@@ -26702,7 +26349,7 @@ msgstr "Schließen"
 msgid "Close this item"
 msgstr "Diesen Eintrag schließen"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Diesen Eintrag löschen"
 
@@ -26715,47 +26362,58 @@ msgstr "Hauptwerkzeugleiste"
 msgid "Preview the printed item"
 msgstr "Eine Vorschau auf das zu druckende Objekt anzeigen"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Speichern"
-
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
-msgstr "Speichern unter..."
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Speichern _unter..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save and _Close"
+msgstr "Speichern und schließen"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
 msgstr "Den Eintrag speichern und das Dialogfenster schließen"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr "Diesen Eintrag auf Platte speichern"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Datei"
 
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Speichern"
+
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage kopieren"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
@@ -26776,51 +26434,39 @@ msgstr "_Alle auswählen"
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr "Umschlag drucken..."
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Speichern _unter..."
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
 msgstr "Den Kontakt speichern und das Dialogfenster schließen"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
 msgstr "_Nachricht an Kontakt schicken..."
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Speichern"
-
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
 msgstr "Diese Liste löschen"
 
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
-msgstr "Löschen..."
-
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
 msgstr "Die Liste speichern und das Dialogfenster schließen"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."
 msgstr "Liste an andere schicken..."
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
 msgid "Send _message to list..."
 msgstr "_Nachricht an Liste schicken..."
 
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Löschen..."
+
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Besprechung a_bsagen"
@@ -26895,7 +26541,8 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
 #: ui/evolution-mail-global.xml.h:11
-msgid "Post New Message"
+#, fuzzy
+msgid "Post Ne_w Message"
 msgstr "Nachricht an Ordner verfassen"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26930,14 +26577,19 @@ msgstr "_Vorschaufläche"
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Die markierte(n) Nachricht(en) in die Zwischenablage kopieren"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Die markierte(n) Nachricht(en) in die Zwischenablage verschieben"
 
+#: ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "E_xpunge"
+msgstr "_Säubern"
+
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "_Gewählte Nachrichten verbergen"
@@ -26964,7 +26616,7 @@ msgstr "Alle als _gelesen markieren"
 msgid "Mark all visible messages as read"
 msgstr "Alle sichtbaren Nachrichten als gelesen markieren"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
 msgid "Paste message(s) from the clipboard"
 msgstr "Die in der Zwischenablage befindliche(n) Nachricht(en) einfügen"
 
@@ -27009,26 +26661,37 @@ msgstr "Die markierten Nachrichten zeitweilig verbergen"
 msgid "Threaded Message list"
 msgstr "Nachrichtenliste in Threads ordnen"
 
-#: ui/evolution-mail-list.xml.h:26
-msgid "_Expunge"
-msgstr "_Säubern"
-
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Ordner"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Auswahl _umkehren"
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Ei_genschaften..."
 
-#: ui/evolution-mail-list.xml.h:31
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "Nachrichtenliste nach _Threads ordnen"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Dieses Fenster schließen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "Schließen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Ansicht"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Absender zum Adressbuch _hinzufügen"
@@ -27061,396 +26724,398 @@ msgstr "Eine Antwort an die Mailingliste der markierten Nachricht verfassen"
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Eine Antwort an den Absender der markierten Nachricht verfassen"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Die markierten Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr "_Virtuellen Ordner aus Nachricht erzeugen"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Eine Regel anlegen, um Nachrichten von diesem Absender zu filtern"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Empfänger zu filtern"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Mailingliste zu filtern"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr "Eine Regel anlegen, um Nachrichten mit diesem Betreff zu filtern"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr "Einen virtuellen Ordner für diese Empfänger anlegen"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr "Einen virtuellen Ordner für diese Mailingliste anlegen"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr "Einen virtuellen Ordner für diesen Absender anlegen"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr "Einen virtuellen Ordner für diesen Betreff anlegen"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Die Textgröße heruntersetzen"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Die nächste wichtige Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Die nächste Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Die nächste ungelesene Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Den nächsten ungelesenen Thread anzeigen"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Die letzte wichtige Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Die letzte ungelesene Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 msgid "F_orward"
 msgstr "_Weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "Filter über Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Filter über _Absender..."
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Filter über _Empfänger..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Filter über _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:37
 msgid "Flag selected message(s) for follow-up"
 msgstr "Die markierte(n) Nachricht(en) als Follow-Up markieren"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:38
 msgid "Follow _Up..."
 msgstr "_Folgenachricht..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:39
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-Mail erzwingen"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message in the body of a new message"
 msgstr "Die markierte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message quoted like a reply"
 msgstr "Die markierte Nachricht als Zitat wie in einer Antwort weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message to someone"
 msgstr "Die markierte Nachricht an jemanden weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die markierte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:45
 msgid "Increase the text size"
 msgstr "Die Textgröße heraufsetzen"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:46
 msgid "Load _Images"
 msgstr "_Bilder laden"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr "Als gelesen mar_kieren"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr "Als _wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as Unimp_ortant"
 msgstr "Als _unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as having been read"
 msgstr "Die markierte(n) Nachricht(en) als gelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as important"
 msgstr "Die markierte(n) Nachricht(en) als wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Die markierte(n) Nachricht(en) als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Die markierte(n) Nachricht(en) als unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Alle sichtbaren Nachrichten zum Löschen vorsehen"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:57
 msgid "Move selected message(s) to another folder"
 msgstr "Die markierte(n) Nachricht(en) in einen anderen Ordner verschieben"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr "Nächste _wichtige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "Nächster _Thread"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "Nächste _ungelesene Nachricht"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Open the selected message in a new window"
 msgstr "Die markierte Nachricht in einem neuen Fenster öffnen"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Die markierte Nachrichte im E-Mail-Editor öffnen, um sie nochmals zu "
 "verschicken"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 msgid "Original Si_ze"
 msgstr "Original_größe"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 msgid "P_revious Unread Message"
 msgstr "_Letzte ungelesene Nachricht"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Post a Reply"
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Post a Repl_y"
 msgstr "Eine Antwort verfassen"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:68
 msgid "Post a reply to a message in a Public folder"
 msgstr "Eine Antwort auf eine Nachricht in einem öffentlichen Ordner verfassen"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:69
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:70
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:71
 msgid "Previous"
 msgstr "Zurück"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:74
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
 msgid "Re_direct"
 msgstr "_Weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:76
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die markierte Nachricht an jemanden weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "_Allen antworten"
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr "_Liste antworten"
+
+#: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ui/evolution-mail-message.xml.h:78
-msgid "S_earch Message..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "S_earch in Message..."
 msgstr "Nachricht durch_suchen..."
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:83
 msgid "S_maller"
 msgstr "_Kleiner"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:84
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:85
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:86
 msgid "Set up the page settings for your current printer"
 msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker festlegen"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show Email _Source"
 msgstr "E-Mail-_Quelltext anzeigen"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show Full _Headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:89
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:90
 msgid "Show message in the normal style"
 msgstr "Nachricht im normalen Stil anzeigen"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:91
 msgid "Show message with all email headers"
 msgstr "Nachricht mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:93
 msgid "Text Si_ze"
 msgstr "Te_xtgröße"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr "Löschen der markierten Nachrichten rückgängig machen"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:95
 msgid "VFolder on Mailing _List..."
 msgstr "VOrdner über Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:96
 msgid "VFolder on Se_nder..."
 msgstr "VOrdner über _Absender..."
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:97
 msgid "VFolder on _Recipients..."
 msgstr "VOrdner über _Empfänger..."
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:98
 msgid "VFolder on _Subject..."
 msgstr "VOrdner über _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Beigelegt"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht _erzeugen"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Forward Message"
 msgstr "Nachricht _weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Inline"
 msgstr "An _Ort und Stelle"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Larger"
 msgstr "_Größer"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Normal Display"
 msgstr "_Normal anzeigen"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Open Message"
 msgstr "Nachricht ö_ffnen"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr "Antwort an Ab_sender"
+
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Resend..."
 msgstr "E_rneut verschicken..."
 
-#: ui/evolution-mail-message.xml.h:115 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Werkzeuge"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Undelete"
 msgstr "Löschen rückgängig"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Dieses Fenster schließen"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "Schließen"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Ansicht"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Beilegen"
@@ -27459,7 +27124,7 @@ msgstr "Beilegen"
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Die aktuelle Datei schließen"
 
@@ -27476,7 +27141,7 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 "Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "_Format"
 
@@ -27508,6 +27173,11 @@ msgstr "Mit S/MIME verschlüsseln"
 msgid "S/MIME Sign"
 msgstr "Mit S/MIME signieren"
 
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Speichern"
+
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Speichern _unter"
@@ -27521,7 +27191,7 @@ msgid "Save in folder..."
 msgstr "In Ordner speichern..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Die aktuelle Datei speichern"
 
@@ -27538,7 +27208,7 @@ msgid "Send"
 msgstr "Abschicken"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Diese E-Mail im HTML-Format verschicken"
 
@@ -27603,7 +27273,7 @@ msgid "_From Field"
 msgstr "_Von-Feld"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Einfügen"
 
@@ -27619,11 +27289,11 @@ msgstr "Antwort-an-Feld"
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Die aktuelle Datei speichern und das Fenster schließen"
 
@@ -27962,27 +27632,33 @@ msgid "_Work Week View"
 msgstr "_Werkwochenansicht"
 
 #: views/mail/galview.xml.h:1
-msgid "As Sent Folder"
+#, fuzzy
+msgid "As _Sent Folder"
 msgstr "Als Verschickt-Ordner"
 
 #: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr "Nach Folgenachricht-Markierung"
+#, fuzzy
+msgid "By S_tatus"
+msgstr "Nach Status"
 
 #: views/mail/galview.xml.h:3
-msgid "By Sender"
+#, fuzzy
+msgid "By Se_nder"
 msgstr "Nach Absender"
 
 #: views/mail/galview.xml.h:4
-msgid "By Status"
-msgstr "Nach Status"
+#, fuzzy
+msgid "By Su_bject"
+msgstr "Nach Betreff"
 
 #: views/mail/galview.xml.h:5
-msgid "By Subject"
-msgstr "Nach Betreff"
+#, fuzzy
+msgid "By _Follow Up Flag"
+msgstr "Nach Folgenachricht-Markierung"
 
 #: views/mail/galview.xml.h:6
-msgid "Messages"
+#, fuzzy
+msgid "_Messages"
 msgstr "Nachrichten"
 
 #: views/tasks/galview.xml.h:1
@@ -28039,12 +27715,12 @@ msgstr "Ansichten definieren..."
 
 #. 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:427
+#: widgets/misc/e-calendar-item.c:456
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
+#: widgets/misc/e-calendar-item.c:1174
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -28170,22 +27846,6 @@ msgstr "Gespeicherte Suchen _bearbeiten..."
 msgid "_Advanced..."
 msgstr "_Komplex..."
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr "Information"
-
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr "Fehler"
-
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr "Frage"
-
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr "Meldung"
-
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Suchen"
@@ -28231,5 +27891,546 @@ msgstr "Evolution-Kalender-Backend für lokale Dateien"
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolution-Adressbuch-Backend für lokale Dateien"
 
+#~ msgid "That person is already attending the meeting!"
+#~ msgstr "Diese Person nimmt bereits an der Besprechung teil!"
+
+#~ msgid "_Save as..."
+#~ msgstr "_Speichern unter..."
+
+#~ msgid "End Date"
+#~ msgstr "Enddatum"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Neuer _Termin"
+
+#~ msgid "Print..."
+#~ msgstr "Drucken..."
+
+#~ msgid "Chair Persons"
+#~ msgstr "Vorsitzende"
+
+#~ msgid "Required Participants"
+#~ msgstr "Benötigte Teilnehmer"
+
+#~ msgid "Optional Participants"
+#~ msgstr "Optionale Teilnehmer"
+
+#~ msgid "Resources"
+#~ msgstr "Ressourcen"
+
+#~ msgid "Individual"
+#~ msgstr "Individuell"
+
+#~ msgid "Group"
+#~ msgstr "Gruppe"
+
+#~ msgid "Resource"
+#~ msgstr "Ressource"
+
+#~ msgid "Room"
+#~ msgstr "Raum"
+
+#~ msgid "Chair"
+#~ msgstr "Vorsitzender"
+
+#~ msgid "Required Participant"
+#~ msgstr "Benötigter Teilnehmer"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Optionaler Teilnehmer"
+
+#~ msgid "Non-Participant"
+#~ msgstr "Nicht-Teilnehmer"
+
+#~ msgid "Needs Action"
+#~ msgstr "Erfordert Maßnahme"
+
+#~ msgid "Delegated"
+#~ msgstr "Delegiert"
+
+#~ msgid "In Process"
+#~ msgstr "In Bearbeitung"
+
+#~ msgid "Hey you, dunce. You need an account to send mail doncha know."
+#~ msgstr "Hey, Sie! Sie brauchen ein Konto, um E-Mails zu verschicken!"
+
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Eigenschaften von »%s«"
+
+#~ msgid "Properties"
+#~ msgstr "Eigenschaften"
+
+#~ msgid "Could not create temporary directory: %s"
+#~ msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
+
+#~ msgid "%d new"
+#~ msgstr "%d neu"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "%d hidden"
+#~ msgstr "%d verborgen"
+
+#~ msgid "%d visible"
+#~ msgstr "%d sichtbar"
+
+#~ msgid "%d selected"
+#~ msgstr "%d ausgewählt"
+
+#~ msgid "%d unsent"
+#~ msgstr "%d nicht verschickt"
+
+#~ msgid "%d sent"
+#~ msgstr "%d verschickt"
+
+#~ msgid "%d total"
+#~ msgstr "%d insgesamt"
+
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "_Virtuellen Ordner aus Suche anlegen..."
+
+#~ msgid "VFolder on _Subject"
+#~ msgstr "VOrdner über _Betreff"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "VOrdner über Abse_nder"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "VOrdner über _Empfänger"
+
+#~ msgid "VFolder on Mailing _List"
+#~ msgstr "VOrdner über Mailing_liste"
+
+#~ msgid "Filter on Sub_ject"
+#~ msgstr "Filter über _Betreff"
+
+#~ msgid "Filter on Sen_der"
+#~ msgstr "Filter über _Absender"
+
+#~ msgid "Filter on Re_cipients"
+#~ msgstr "Filter über _Empfänger"
+
+#~ msgid "Filter on _Mailing List"
+#~ msgstr "Filter über _Mailingliste"
+
+#~ msgid "_Edit as New Message..."
+#~ msgstr "Als neue Nachricht _bearbeiten..."
+
+#~ msgid "_Print"
+#~ msgstr "_Drucken"
+
+#~ msgid "_Forward"
+#~ msgstr "_Weiterleiten"
+
+#~ msgid "Follo_w Up..."
+#~ msgstr "Follo_w Up..."
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "Als abgeschlossen _markieren"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Markierung _löschen"
+
+#~ msgid "Mark as _Unread"
+#~ msgstr "Als _ungelesen markieren"
+
+#~ msgid "Mark as _Important"
+#~ msgstr "Als _wichtig markieren"
+
+#~ msgid "_Mark as Unimportant"
+#~ msgstr "Als unwichtig _markieren"
+
+#~ msgid "U_ndelete"
+#~ msgstr "Lösche_n rückgängig"
+
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "In Ordner _verschieben..."
+
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Absender zum Adress_buch hinzufügen"
+
+#~ msgid "Appl_y Filters"
+#~ msgstr "Filter _anwenden"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "_Regel aus Nachricht anlegen"
+
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "VOrdner über M_ailingliste"
+
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Filter über _Mailingliste (%s)"
+
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "VOrdner über M_ailingliste (%s)"
+
+#~ msgid "Don't show this message again."
+#~ msgstr "Diese Meldung nicht mehr anzeigen."
+
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "Sie haben den E-Mail-Client nicht konfiguriert.\n"
+#~ "Sie müssen dies tun, bevor Sie E-Mails verschicken,\n"
+#~ "abrufen oder verfassen können.\n"
+#~ "Möchten Sie ihn jetzt konfigurieren?"
+
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Sie müssen eine Identität einrichten,\n"
+#~ "bevor Sie E-Mails verfassen können."
+
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Sie müssen einen Mailtransport einrichten,\n"
+#~ "bevor Sie E-Mails verfassen können."
+
+#~ msgid ""
+#~ "You are sending an HTML-formatted message. Please make sure that\n"
+#~ "the following recipients are willing and able to receive HTML mail:\n"
+#~ msgstr ""
+#~ "Sie verschicken eine HTML-formatierte Nachricht. Bitte stellen Sie "
+#~ "sicher,\n"
+#~ "dass die folgenden Empfänger HTML-Mails abrufen können und wollen:\n"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Dennoch verschicken?"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Diese Nachricht hat keinen Betreff.\n"
+#~ "Wirklich verschicken?"
+
+#~ msgid ""
+#~ "Since the contact list you are sending to is configured to hide the "
+#~ "list's addresses, this message will contain only Bcc recipients."
+#~ msgstr ""
+#~ "Da die Kontaktliste, an die Sie diese Nachricht verschicken, konfiguriert "
+#~ "ist, die Adressen der Liste zu verbergen, wird die Nachricht lediglich an "
+#~ "Blindkopie-Empfängeradressen übermittlt."
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "Diese Nachricht enthält ausschließlich Blindkopie-Empfänger."
+
+#~ msgid ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "Es ist möglich, dass der E-Mail-Server die Empfänger kenntlich macht, "
+#~ "indem er eine Apparently-To-Kopfzeile hinzufügt.\n"
+#~ "Dennoch verschicken?"
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu verschicken."
+
+#~ msgid ""
+#~ "Unable to open the drafts folder for this account.\n"
+#~ "Would you like to use the default drafts folder?"
+#~ msgstr ""
+#~ "Der Entwürfe-Ordner für dieses Konto konnte nicht geöffnet werden.\n"
+#~ "Möchten Sie den voreingestellten Entwürfe-Ordner verwenden?"
+
+#~ msgid "an unknown sender"
+#~ msgstr "ein unbekannter Absender"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+#~ msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %%s:"
+
+#~ msgid "Move message(s) to"
+#~ msgstr "Nachricht(en) verschieben in"
+
+#~ msgid "Copy message(s) to"
+#~ msgstr "Nachricht(en) kopieren in"
+
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten bearbeiten wollen?"
+
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Sie können nur im Entwürfe-Ordner\n"
+#~ "abgespeicherte Nachrichten bearbeiten."
+
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Sie können nur Nachrichten im\n"
+#~ "Verschickt-Ordner neu verschicken."
+
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr ""
+#~ "Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
+
+#~ msgid "No Message Selected"
+#~ msgstr "Keine Nachricht markiert"
+
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "In »%s« konnte nicht gespeichert werden:\n"
+#~ "  %s"
+
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "»%s« ist bereits vorhanden.\n"
+#~ "Soll es überschrieben werden?"
+
+#~ msgid "Save Message As..."
+#~ msgstr "Nachricht speichern unter..."
+
+#~ msgid "Save Messages As..."
+#~ msgstr "Nachrichten speichern unter..."
+
+#~ msgid ""
+#~ "This operation will permanently erase all messages marked as\n"
+#~ "deleted. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "Dieser Vorgang wird alle als gelöscht markierten Nachrichten dauerhaft "
+#~ "entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nicht "
+#~ "wiederherstellen können.\n"
+#~ "\n"
+#~ "Sollen die Nachrichten wirklich entfernt werden?"
+
+#~ msgid ""
+#~ "Error loading filter information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fehler beim Laden von Filterinformation:\n"
+#~ "%s"
+
+#~ msgid "Filters"
+#~ msgstr "Filter"
+
+#~ msgid "Page %d of %d"
+#~ msgstr "Seite %d von %d"
+
+#~ msgid "Print Message"
+#~ msgstr "Nachricht drucken"
+
+#~ msgid "Printing of message failed"
+#~ msgstr "Drucken der Nachricht fehlgeschlagen"
+
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr ""
+#~ "Sind Sie sicher, dass Sie alle %d Nachrichten in getrennten Fenstern "
+#~ "öffnen wollen?"
+
+#~ msgid "Could not create a S/MIME signature context."
+#~ msgstr "S/MIME-Signaturkontext konnte nicht angelegt werden."
+
+#~ msgid "Could not create a S/MIME certsonly context."
+#~ msgstr "S/MIME-certsonly-Kontext konnte nicht angelegt werden."
+
+#~ msgid "Could not create a S/MIME encryption context."
+#~ msgstr "S/MIME-Verschlüsselungskontext konnte nicht angelegt werden."
+
+#~ msgid "Could not create a S/MIME envelope context."
+#~ msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
+
+#~ msgid "Could not create a S/MIME decode context."
+#~ msgstr "S/MIME-Entschlüsselungskontext konnte nicht angelegt werden."
+
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Es existiert bereits eine Datei mit Namen »%s«.\n"
+#~ "Soll diese überschrieben werden?"
+
+#~ msgid "Save Attachment"
+#~ msgstr "Anlage speichern"
+
+#~ msgid "Could not create temporary file '%s': %s"
+#~ msgstr "Die temporäre Datei »%s« konnte nicht angelegt werden: %s"
+
+#~ msgid "Save Attachment..."
+#~ msgstr "Anlage speichern..."
+
+#~ msgid "View Inline"
+#~ msgstr "An Ort und Stelle anzeigen"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Öffnen in %s..."
+
+#~ msgid "View Inline (via %s)"
+#~ msgstr "An Ort und Stelle anzeigen (mit %s)"
+
+#~ msgid "Hide"
+#~ msgstr "Verbergen"
+
+#~ msgid "External Viewer"
+#~ msgstr "Externer Betrachter"
+
+#~ msgid "Downloading images"
+#~ msgstr "Bilder werden heruntergeladen"
+
+#~ msgid "Loading message content"
+#~ msgstr "Laden des Nachrichteninhalts"
+
+#~ msgid "Overdue:"
+#~ msgstr "Überfallig:"
+
+#~ msgid "by %B %d, %Y, %l:%M %P"
+#~ msgstr "am %d. %B %Y, %H:%M"
+
+#~ msgid "Open Link in Browser"
+#~ msgstr "Link in Browser öffnen"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "Linkziel kopieren"
+
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Link speichern unter (FIXME)"
+
+#~ msgid "Save Image as..."
+#~ msgstr "Bild speichern unter..."
+
+#~ msgid "%s attachment"
+#~ msgstr "%s-Anlage"
+
+#~ msgid "Could not parse MIME message. Displaying as source."
+#~ msgstr ""
+#~ "Die MIME-Nachricht konnte nicht verarbeitet werden und wird daher als "
+#~ "Quellxt angezeigt."
+
+#~ msgid "Bad Address"
+#~ msgstr "Ungültige Adresse"
+
+#~ msgid "Reply-To"
+#~ msgstr "Antwort an"
+
+#~ msgid "Cc"
+#~ msgstr "Kopie"
+
+#~ msgid "Bcc"
+#~ msgstr "Blindkopie"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Diese Nachricht ist digital signiert. Klicken Sie auf das Schlosssymbol, "
+#~ "um weitere Informationen zu erhalten."
+
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "Es konnte kein PGP-Überprüfungskontext angelegt werden"
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr ""
+#~ "Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
+#~ "nachgewiesen."
+
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr ""
+#~ "Diese Nachricht ist digital unterzeichnet, aber konnte nicht als "
+#~ "authentisch nachgewiesen werden."
+
+#~ msgid "Pointer to FTP site (%s)"
+#~ msgstr "Zeiger auf FTP-Site (%s)"
+
+#~ msgid "Pointer to local file (%s) valid at site \"%s\""
+#~ msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
+
+#~ msgid "Pointer to local file (%s)"
+#~ msgstr "Zeiger auf lokale Datei (%s)"
+
+#~ msgid "Pointer to remote data (%s)"
+#~ msgstr "Zeiger auf Daten im Netz (%s)"
+
+#~ msgid "Pointer to unknown external data (\"%s\" type)"
+#~ msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
+
+#~ msgid "Malformed external-body part."
+#~ msgstr "Ungültiger external-body-Teil."
+
+#~ msgid "However, the message was successfully sent."
+#~ msgstr "Dennoch wurde die Nachricht erfolgreich verschickt."
+
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Unbenannte Nachricht)"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Unbenannte Nachricht"
+
+#~ msgid "Empty Message"
+#~ msgstr "Leere Nachricht"
+
+#~ msgid "Find in Message"
+#~ msgstr "In Nachricht suchen"
+
+#~ msgid "Case Sensitive"
+#~ msgstr "Groß-/Kleinschreibung beachten"
+
+#~ msgid "Search Forward"
+#~ msgstr "Vorwärts suchen"
+
+#~ msgid "Find:"
+#~ msgstr "Suchen:"
+
+#~ msgid "Matches:"
+#~ msgstr "Passt auf:"
+
+#~ msgid "Forwarded Message"
+#~ msgstr "Weitergeleitete Nachricht"
+
+#~ msgid "(No subject)"
+#~ msgstr "(Kein Betreff)"
+
+#~ msgid "%s - Message"
+#~ msgstr "%s - Nachricht"
+
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "Ordner unter %s auf »%s« werden abgetastet"
+
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "Ordner der obersten Ebene auf »%s« werden abgetastet"
+
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "Ordner »%s« wird abonniert"
+
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "Abonnement auf Ordner »%s« wird abbestellt"
+
+#~ msgid "No server has been selected"
+#~ msgstr "Es wurde kein Server gewählt"
+
+#~ msgid "Please select a server."
+#~ msgstr "Bitte wählen Sie einen Server."
+
+#~ msgid "Scanning folders ..."
+#~ msgstr "Ordner werden abgetastet..."
+
+#~ msgid "Save As..."
+#~ msgstr "Speichern unter..."
+
+#~ msgid "Information"
+#~ msgstr "Information"
+
+#~ msgid "Question"
+#~ msgstr "Frage"
+
+#~ msgid "Message"
+#~ msgstr "Meldung"
+
 #~ msgid "URL:"
 #~ msgstr "URL:"
diff --git a/po/el.po b/po/el.po
index df8d69cd9e..1d7bf7a664 100644
--- a/po/el.po
+++ b/po/el.po
@@ -26,7 +26,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.el\n"
-"POT-Creation-Date: 2003-06-23 12:07+0200\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2003-06-25 18:26-0200\n"
 "Last-Translator: Nikos Charonitakis <charosn@her.forthnet.gr>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
@@ -34,64 +34,191 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Εφαρμογή εισαγωγής LDIF του Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP Data Interchange Format (.ldif)"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Εφαρμογή εισαγωγής VCard του Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Εφαρμογή εισαγωγής VCard του Evolution"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
-
-#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Αρχειοθέτηση Ως"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Πλήρες Όνομα"
+
 #: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Όνομα"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Διεύθυνση:"
+
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Ετικέτα διεύθυνσης"
+
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Τηλέφωνο"
+
 #: addressbook/backend/ebook/e-card.c:1347
+#: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr "Πρωτεύον"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Ημερομηνία Γέννησης"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "Πρωτ."
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Οργανισμός"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Μονάδα Οργανισμού"
+
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Γραφείο"
+
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Τίτλος"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Ρόλος"
 
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Διευθυντής"
+
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Βοηθός"
 
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Ψευδώνυμο"
+
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Σύζυγος"
+
+#: addressbook/backend/ebook/e-card.c:1430
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniversary"
+msgstr "Επέτειος"
+
+#: addressbook/backend/ebook/e-card.c:1436
+msgid "Mailer"
+msgstr "Πρόγραμμα αλληλογραφίας"
+
+#: addressbook/backend/ebook/e-card.c:1443
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr "URI Ημερολογίου"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "Διαθέσιμο/απασχολημένο URL"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "Ημερολόγιο ICS"
+
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Σημείωση"
+
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Σχετικές επαφές"
+
+#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Κατηγορίες"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Λίστα κατηγορίας"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Επιθυμεί  HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Ορισμός αποδοχής HTML "
+
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
+msgid "List"
+msgstr "Λίστα"
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Εμφάνιση λίστας διευθύνσεων"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Τυχαίο"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Τελευταία χρήση"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Χρήση σκορ"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
+msgstr "Πρωτεύον"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr "Πρωτ."
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -126,12 +253,6 @@ msgid "Home"
 msgstr "Οικία"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Οργανισμός"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Οργ."
 
@@ -250,21 +371,9 @@ msgid "Dep"
 msgstr "Τμήμ."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Γραφείο"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Γραφ."
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Τίτλος"
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -275,12 +384,6 @@ msgid "Prof"
 msgstr "Επάγγ."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Διευθυντής"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Διευθ."
 
@@ -289,32 +392,9 @@ msgid "Ass"
 msgstr "Βοηθ."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Ψευδώνυμο"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Ψευδ."
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Σύζυγος"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Σημείωση"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr "URI Ημερολογίου"
-
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "URI Ημερ."
@@ -337,11 +417,6 @@ msgid "icsCalendar"
 msgstr "Ημερολόγιο ics"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr "Επέτειος"
-
-#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Επέτ."
 
@@ -349,12 +424,6 @@ msgstr "Επέτ."
 msgid "Birth Date"
 msgstr "Ημερομηνία Γέννησης"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Κατηγορίες"
-
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Οικογενειακό Όνομα"
@@ -369,106 +438,29 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-destination.c:709
 msgid "Unnamed List"
 msgstr "Λίστα Χωρίς Τίτλο"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Πλήρες Όνομα"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Διεύθυνση:"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Ετικέτα διεύθυνσης"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Τηλέφωνο"
-
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Ημερομηνία Γέννησης"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Μονάδα Οργανισμού"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Ρόλος"
-
-#: addressbook/backend/ebook/e-card.c:1436
-#: mail/mail-format.c:963
-msgid "Mailer"
-msgstr "Πρόγραμμα αλληλογραφίας"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Διαθέσιμο/απασχολημένο URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "Ημερολόγιο ICS"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Σχετικές επαφές"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Λίστα κατηγορίας"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Επιθυμεί  HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Ορισμός αποδοχής HTML "
-
-#: addressbook/backend/ebook/e-card.c:1506
-msgid "List"
-msgstr "Λίστα"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Εμφάνιση λίστας διευθύνσεων"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Τυχαίο"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Εφαρμογή εισαγωγής LDIF του Evolution."
 
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "ID"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Τελευταία χρήση"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Εφαρμογή εισαγωγής VCard του Evolution."
 
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Χρήση σκορ"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Εφαρμογή εισαγωγής VCard του Evolution"
 
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:171
-msgid "Could not initialize Bonobo"
-msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -525,154 +517,22 @@ msgid "EBook not loaded\n"
 msgstr "To ΕΒοοk δεν φορτώθηκε\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr "Δεν ήταν δυνατή η εκκίνηση του διακομιστή wombat"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr "Δεν ήταν δυνατή η εκκίνηση του wombat"
 
 #: addressbook/conduit/address-conduit.c:1407
 #: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
-msgstr "Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Ρυθμίστε εδώ την πρόσβαση στους διακομιστές καταλόγου  LDAP"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Εξυπηρετητές καταλόγου"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Ρύθμιση Βιβλίου Διευθύνσεων LDAP του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Εφαρμογή προβολής διευθύνσεων του Βιβλίου Διευθύνσεων"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Εφαρμογή προβολής κάρτας του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Στοιχείο βιβλίου διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Εφαρμογή προβολής φακέλου του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:620
-#: importers/netscape-importer.c:1874
-#: mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Επαφές"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Φάκελος που περιέχει πληροφορίες επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "Διακομιστής LDAP"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "Διακομιστής LDAP που περιέχει πληροφορίες επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Κοινόχρηστες επαφές"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Κοινόχρηστος φάκελος που περιέχει πληροφορίες επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "New Contact"
-msgstr "Νέα Επαφή"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "_Contact"
-msgstr "_Επαφή"
-
-#: addressbook/gui/component/addressbook-component.c:575
-msgid "Create a new contact"
-msgstr "Δημιουργία νέας επαφής"
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
-msgstr "Νέα Λίστα Επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "Contact _List"
-msgstr "_Λίστα Επαφών"
-
-#: addressbook/gui/component/addressbook-component.c:579
-msgid "Create a new contact list"
-msgstr "Δημιουργία νέας λίστας επαφών"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Δεν ήταν δυνατή η πιστοποίηση στον διακομιστή  LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Αδύνατη η δημιουργία ερωτήματος στο  Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "Η απάντηση του διακομιστή  δεν περιείχε έγκυρο σχήμα πληροφοριών"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Όνομα Λογαριασμού"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Όνομα Διακομιστή"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Το LDAP δεν ενεργοποιήθηκε σε αυτή την έκδοση του evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Λοιπές Επαφές"
+msgstr ""
+"Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
 
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
@@ -774,18 +634,24 @@ msgid ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 msgstr ""
-"Η χρονική διάρκεια για την εκτέλεση αυτού του ερωτήματος ξεπέρασε το όριο του διακομιστή ή το\n"
-"όριο που έχετε καθορίσει στο ευρετήριο διευθύνσεων.Κάνετε την αναζήτηση σας πιό συγκεκριμένη\n"
+"Η χρονική διάρκεια για την εκτέλεση αυτού του ερωτήματος ξεπέρασε το όριο "
+"του διακομιστή ή το\n"
+"όριο που έχετε καθορίσει στο ευρετήριο διευθύνσεων.Κάνετε την αναζήτηση σας "
+"πιό συγκεκριμένη\n"
 "ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
 "για αυτό το ευρετήριο διευθύνσεων. "
 
 #: addressbook/gui/component/addressbook.c:967
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Το backend για αυτό το ευρετήριο διευθύνσεων αδυνατεί να αναλύσει αυτό το ερώτημα."
+msgstr ""
+"Το backend για αυτό το ευρετήριο διευθύνσεων αδυνατεί να αναλύσει αυτό το "
+"ερώτημα."
 
 #: addressbook/gui/component/addressbook.c:970
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "Το backend για αυτό το ευρετήριο διευθύνσεων αρνήθηκε να αναλύσει αυτό το ερώτημα."
+msgstr ""
+"Το backend για αυτό το ευρετήριο διευθύνσεων αρνήθηκε να αναλύσει αυτό το "
+"ερώτημα."
 
 #: addressbook/gui/component/addressbook.c:974
 msgid "This query did not complete successfully."
@@ -801,6 +667,101 @@ msgstr "Κάθε Κατηγορία"
 msgid "The URI that the Folder Browser will display"
 msgstr "Το URI που θα εμφανίσει η Αναζήτηση Φακέλων"
 
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:628
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Επαφές"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Φάκελος που περιέχει πληροφορίες επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "Διακομιστής LDAP"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "Διακομιστής LDAP που περιέχει πληροφορίες επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Κοινόχρηστες επαφές"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Κοινόχρηστος φάκελος που περιέχει πληροφορίες επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "New Contact"
+msgstr "Νέα Επαφή"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "_Contact"
+msgstr "_Επαφή"
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "Create a new contact"
+msgstr "Δημιουργία νέας επαφής"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "New Contact List"
+msgstr "Νέα Λίστα Επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "Contact _List"
+msgstr "_Λίστα Επαφών"
+
+#: addressbook/gui/component/addressbook-component.c:587
+msgid "Create a new contact list"
+msgstr "Δημιουργία νέας λίστας επαφών"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Δεν ήταν δυνατή η πιστοποίηση στον διακομιστή  LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Αδύνατη η δημιουργία ερωτήματος στο  Root DSE"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Η απάντηση του διακομιστή  δεν περιείχε έγκυρο σχήμα πληροφοριών"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Όνομα Λογαριασμού"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Όνομα Διακομιστή"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "Το LDAP δεν ενεργοποιήθηκε σε αυτή την έκδοση του evolution"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Λοιπές Επαφές"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -829,33 +790,69 @@ msgstr "Δημιουργία νέας επαφής \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Προσθήκη διεύθυνσης στην υπάρχουσα επαφή \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:914
+#: addressbook/gui/component/e-address-popup.c:917
 msgid "Querying Addressbook..."
 msgstr "Υποβολή ερωτήματος στο Βιβλίο Διευθύνσεων..."
 
-#: addressbook/gui/component/e-address-popup.c:998
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-popup.c:1001
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr "Επεξεργασία Πληροφοριών Επαφής"
 
-#: addressbook/gui/component/e-address-popup.c:1028
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Προσθήκη στις Επαφές"
 
-#: addressbook/gui/component/e-address-popup.c:1053
+#: addressbook/gui/component/e-address-popup.c:1056
 msgid "Merge E-Mail Address"
 msgstr "Συγχώνευση Διεύθυνσης E-mail"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Disable Queries"
 msgstr "Απενεργοποίηση υποβολής ερωτημάτων"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr "Ενεργοποίηση υποβολής ερωτημάτων (Επικίνδυνο!)"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Ρυθμίστε εδώ την πρόσβαση στους διακομιστές καταλόγου  LDAP"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Εξυπηρετητές καταλόγου"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Ρύθμιση Βιβλίου Διευθύνσεων LDAP του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Εφαρμογή προβολής διευθύνσεων του Βιβλίου Διευθύνσεων"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Εφαρμογή προβολής κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Στοιχείο βιβλίου διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Εφαρμογή προβολής φακέλου του Βιβλίου Διευθύνσεων του Evolution"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -876,8 +873,7 @@ msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1
-#: mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -916,8 +912,7 @@ msgstr "Προσθήκη διακομιστή LDAP"
 msgid "Addressbook Sources"
 msgstr "Πηγές Βιβλίου Διευθύνσεων"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#: mail/mail-account-gui.c:62
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:62
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Πάντοτε"
@@ -931,12 +926,14 @@ msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
 "\n"
-"Please click the \"Finish\" button to save the settings you have entered here."
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
 msgstr ""
 "Συγχαρητήρια, ολοκληρώσατε την ρύθμιση του διακομιστή LDAP\n"
 "Τώρα είστε έτοιμοι να έχετε πρόσβαση στον κατάλογο.\n"
 "\n"
-"Πατήστε το πλήκτρο \"Τέλος\" για να αποθηκεύσετε τις ρυθμίσεις που έχετε εισάγει εδώ."
+"Πατήστε το πλήκτρο \"Τέλος\" για να αποθηκεύσετε τις ρυθμίσεις που έχετε "
+"εισάγει εδώ."
 
 #: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
@@ -956,11 +953,16 @@ msgstr "Διεύθυνση Email:"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Το Evolution θα χρησιμοποίησει αυτό το DN για την πιστοποίησή σας στον διακομιστή"
+msgstr ""
+"Το Evolution θα χρησιμοποίησει αυτό το DN για την πιστοποίησή σας στον "
+"διακομιστή"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Το Evolution θα χρησιμοποίηση αυτήν τη διεύθυνση για την πιστοποίησή σας στον διακομιστή"
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Το Evolution θα χρησιμοποίηση αυτήν τη διεύθυνση για την πιστοποίησή σας "
+"στον διακομιστή"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Finished"
@@ -975,21 +977,26 @@ msgstr "Γενικά"
 msgid "LDAP Configuration Assistant"
 msgstr "Βοηθός ρύθμισης LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
-#: mail/mail-account-gui.c:64
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:64
 #: mail/mail-config.glade.h:74
 msgid "Never"
 msgstr "Ποτέ"
 
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL (Secure Sockets Layer)\n"
-"and TLS (Transport Layer Security) protocols are used by some servers to cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses these protocols."
-msgstr ""
-"Τώρα θα πρέπει να καθορίσετε τον τρόπο με το οποίο θα συνδέεστε με τον διακομιστή LDAP. Τα πρωτόκολλα\n"
-"SSL (Secure Sockets Layer) και TLS (Transport Layer Security) χρησιμοποιούνται από κάποιους διακομιστές για\n"
-"να προστατεύουν κρυπτογραφικά την σύνδεση σας. Ρωτήστε τον διαχειριστή του συστήματος αν αυτός ο διακομιστής\n"
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(Secure Sockets Layer)\n"
+"and TLS (Transport Layer Security) protocols are used by some servers to "
+"cryptographically protect\n"
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
+msgstr ""
+"Τώρα θα πρέπει να καθορίσετε τον τρόπο με το οποίο θα συνδέεστε με τον "
+"διακομιστή LDAP. Τα πρωτόκολλα\n"
+"SSL (Secure Sockets Layer) και TLS (Transport Layer Security) "
+"χρησιμοποιούνται από κάποιους διακομιστές για\n"
+"να προστατεύουν κρυπτογραφικά την σύνδεση σας. Ρωτήστε τον διαχειριστή του "
+"συστήματος αν αυτός ο διακομιστής\n"
 "χρησιμοποιεί αυτά τα πρωτόκολλα."
 
 #: addressbook/gui/component/ldap-config.glade.h:32
@@ -1000,11 +1007,9 @@ msgstr "Ένα"
 msgid "S_earch scope: "
 msgstr "Βάθος ανα_ζήτησης:"
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983
-#: calendar/gui/e-day-view.c:1696
-#: calendar/gui/e-week-view.c:1256
+#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr "Γίνεται αναζήτηση"
 
@@ -1014,45 +1019,63 @@ msgstr "Επιλεγμένα:"
 
 #: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP server if\n"
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
-"Διαλέγοντας αυτή την επιλογή σημαίνει ότι το Evolution  θα συνδέεται στον διακομιστή LDAP\n"
+"Διαλέγοντας αυτή την επιλογή σημαίνει ότι το Evolution  θα συνδέεται στον "
+"διακομιστή LDAP\n"
 "μόνο αν ο διακομιστής υποστηρίζει SSL ή TLS."
 
 #: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection is already\n"
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
 "secure."
 msgstr ""
-"Η επιλογή αυτή σημαίνει ότι το Evolution θα προσπαθεί να χρησιμοποιεί μόνο SSL/TLS αν είστε σε\n"
-"μη ασφαλές περιβάλλον. Για παράδειγμα αν ο διακομιστής  LDAP στην δουλειά είναι πίσω από firewall\n"
-"τότε το Evolution  δεν χρειάζεται να χρησιμοποιήσει SSL/TLS  μιας και η σύνδεση σας είναι ήδη\n"
+"Η επιλογή αυτή σημαίνει ότι το Evolution θα προσπαθεί να χρησιμοποιεί μόνο "
+"SSL/TLS αν είστε σε\n"
+"μη ασφαλές περιβάλλον. Για παράδειγμα αν ο διακομιστής  LDAP στην δουλειά "
+"είναι πίσω από firewall\n"
+"τότε το Evolution  δεν χρειάζεται να χρησιμοποιήσει SSL/TLS  μιας και η "
+"σύνδεση σας είναι ήδη\n"
 " ασφαλής."
 
 #: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"Selecting this option means that your server does not support either SSL or TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable to security\n"
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
 "exploits. "
 msgstr ""
-"Η επιλογή αυτή σημαίνει ότι ο διακομιστής σας δεν υποστηρίζει SSL ή TLS. Αυτό σημαίνει \n"
-"ότι η σύνδεση σας θα είναι μη ασφαλής και θα είστε ευάλωτοι σε επιθέσεις και τρύπες \n"
+"Η επιλογή αυτή σημαίνει ότι ο διακομιστής σας δεν υποστηρίζει SSL ή TLS. "
+"Αυτό σημαίνει \n"
+"ότι η σύνδεση σας θα είναι μη ασφαλής και θα είστε ευάλωτοι σε επιθέσεις και "
+"τρύπες \n"
 "ασφαλείας."
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"Selecting this option will let you change Evolution's default settings for LDAP\n"
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
-"Η επιλογή αυτή σας επιτρέπει να αλλάξετε τις εξ ορισμού ρυθμίσεις του Evolution για\n"
+"Η επιλογή αυτή σας επιτρέπει να αλλάξετε τις εξ ορισμού ρυθμίσεις του "
+"Evolution για\n"
 "αναζητήσεις LDAP και την δημιουργία και επεξεργασία επαφών."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
-msgid "Specifying a display name is the last required step in configuring an LDAP server."
-msgstr "Ο καθορισμός ενός ονόματος εμφάνισης είναι το τελευταίο απαιτούμενο βήμα στην ρύθμιση ενός διακομιστή LDAP."
+msgid ""
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
+msgstr ""
+"Ο καθορισμός ενός ονόματος εμφάνισης είναι το τελευταίο απαιτούμενο βήμα "
+"στην ρύθμιση ενός διακομιστή LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
 msgid "Step 1: Server Information"
@@ -1080,89 +1103,129 @@ msgstr "Υποστηριζόμενες βάσεις αναζήτησης"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and your log in\n"
-"information. Please ask your system administrator if you are unsure of this information."
+"The first step in configuring an LDAP server is to provide its name, and "
+"your log in\n"
+"information. Please ask your system administrator if you are unsure of this "
+"information."
 msgstr ""
-"Το πρώτο βήμα για την ρύθμιση ενός διακομιστή LDAP είναι να καταχωρήσετε το όνομα του και τις\n"
-"πληροφορίες εισόδου σας. Ζητήστε από τον διαχειριστή τις απαραίτητες πληροφορίες αν δεν είστε σίγουροι."
+"Το πρώτο βήμα για την ρύθμιση ενός διακομιστή LDAP είναι να καταχωρήσετε το "
+"όνομα του και τις\n"
+"πληροφορίες εισόδου σας. Ζητήστε από τον διαχειριστή τις απαραίτητες "
+"πληροφορίες αν δεν είστε σίγουροι."
 
 #: addressbook/gui/component/ldap-config.glade.h:56
 msgid ""
-"The options on this page control how many entries should be included in your\n"
-"searches, and how long a search should take. Ask your system administrator if you\n"
+"The options on this page control how many entries should be included in "
+"your\n"
+"searches, and how long a search should take. Ask your system administrator "
+"if you\n"
 "need to change these options."
 msgstr ""
-"Οι επιλογές σε αυτήν την σελίδα ελέγχουν τον αριθμό των καταχωρήσεων που θα περιέχονται\n"
-"στις αναζητήσεις και την χρονική διάρκεια της αναζήτησης. Ρωτήστε τον διαχειριστή του συστήματος σας\n"
+"Οι επιλογές σε αυτήν την σελίδα ελέγχουν τον αριθμό των καταχωρήσεων που θα "
+"περιέχονται\n"
+"στις αναζητήσεις και την χρονική διάρκεια της αναζήτησης. Ρωτήστε τον "
+"διαχειριστή του συστήματος σας\n"
 "αν θέλετε να αλλάξετε αυτές τις επιλογές."
 
 #: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the directory tree."
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
 msgstr ""
-"Η βάση αναζήτησης είναι το διακεκριμένο όνομα  (DN) της καταχώρησης όπου θα ξεκινούν οι \n"
-"αναζητήσεις σας. Αν αφήσετε αυτό κενό, η αναζήτηση θα ξεκινά από τον ριζικό κατάλογο του δέντρου. "
+"Η βάση αναζήτησης είναι το διακεκριμένο όνομα  (DN) της καταχώρησης όπου θα "
+"ξεκινούν οι \n"
+"αναζητήσεις σας. Αν αφήσετε αυτό κενό, η αναζήτηση θα ξεκινά από τον ριζικό "
+"κατάλογο του δέντρου. "
 
 #: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
-"The search scope defines how deep you would like the search to extend down the \n"
-"directory tree. A search scope of \"sub\" will include all entries below your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath your base.\n"
-msgstr ""
-"Το βάθος αναζήτησης καθορίζει το βάθος της αναζήτησης στο δέντρο του καταλόγου \n"
-"Μια αναζήτηση με \"sub\" θα περιλαμβάνει όλες τις καταχωρήσεις κάτω από την βάση αναζήτησης σας.\n"
-"Μια αναζήτηση με \"ένα\"  θα περιλαμβάνει μόνο τις καταχωρήσεις που βρίσκονται μόνο ένα επίπεδο κάτω.\n"
+"The search scope defines how deep you would like the search to extend down "
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base.\n"
+msgstr ""
+"Το βάθος αναζήτησης καθορίζει το βάθος της αναζήτησης στο δέντρο του "
+"καταλόγου \n"
+"Μια αναζήτηση με \"sub\" θα περιλαμβάνει όλες τις καταχωρήσεις κάτω από την "
+"βάση αναζήτησης σας.\n"
+"Μια αναζήτηση με \"ένα\"  θα περιλαμβάνει μόνο τις καταχωρήσεις που "
+"βρίσκονται μόνο ένα επίπεδο κάτω.\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:65
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the server. Please contact your system administrator if you need help finding this information."
+"Adding a new LDAP server requires some specialized information about the "
+"server. Please contact your system administrator if you need help finding "
+"this information."
 msgstr ""
 "Ο βοηθός θα σας βοηθήσει να έχετε πρόσβαση στις υπηρεσίες καταλόγου\n"
 "με την χρήση διακομιστών LDAP (Lightweight Directory Access Protocol). \n"
 "\n"
-"Η προσθήκη ενός νέου διακομιστή LDAP απαιτεί κάποιες ειδικές πληροφορίεςγια τον διακομιστή. Επικοινωνήστε με τον διαχειριστή του συστήματος σας αν θέλετε βοήθεια για να βρείτε αυτές τις πληροφορίες."
+"Η προσθήκη ενός νέου διακομιστή LDAP απαιτεί κάποιες ειδικές πληροφορίεςγια "
+"τον διακομιστή. Επικοινωνήστε με τον διαχειριστή του συστήματος σας αν "
+"θέλετε βοήθεια για να βρείτε αυτές τις πληροφορίες."
 
 #: addressbook/gui/component/ldap-config.glade.h:69
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
-msgstr "Αυτό είναι το πλήρες όνομα του διακομιστή ldap. Για παράδειγμα , \"ldap.mycompany.com\"."
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+"Αυτό είναι το πλήρες όνομα του διακομιστή ldap. Για παράδειγμα , \"ldap."
+"mycompany.com\"."
 
 #: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be \n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
-"Αυτός είναι το μέγιστος αριθμός καταχωρήσεων για μεταφόρτωση. Ο ορισμός ενός μεγάλου αριθμού \n"
+"Αυτός είναι το μέγιστος αριθμός καταχωρήσεων για μεταφόρτωση. Ο ορισμός ενός "
+"μεγάλου αριθμού \n"
 "θα κάνει αργό το ευρετήριο διευθύνσεων σας."
 
 #: addressbook/gui/component/ldap-config.glade.h:72
-msgid "This is the method evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
-msgstr "Αυτή είναι η μέθοδος που θα χρησιμοποιεί το evolution για την πιστοποίηση σας.  Σημειώστε ότι η ρύθμιση σε \"Διεύθυνση Email\" απαιτεί ανώνυμη πρόσβαση στον διακομιστή ldap. "
+msgid ""
+"This is the method evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+"Αυτή είναι η μέθοδος που θα χρησιμοποιεί το evolution για την πιστοποίηση "
+"σας.  Σημειώστε ότι η ρύθμιση σε \"Διεύθυνση Email\" απαιτεί ανώνυμη "
+"πρόσβαση στον διακομιστή ldap. "
 
 #: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
-"This is the name for this server that will appear in your Evolution folder list.\n"
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
 "It is for display purposes only. "
 msgstr ""
-"Αυτό είναι το όνομα για τον διακομιστή και θα εμφανιστεί στη λίστα φακέλων του Evolution.\n"
+"Αυτό είναι το όνομα για τον διακομιστή και θα εμφανιστεί στη λίστα φακέλων "
+"του Evolution.\n"
 " Είναι μόνο για λόγους εμφάνισης."
 
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A \n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
-"Αυτή είναι η θύρα του διακομιστή LDAP στην οποία θα προσπαθεί να συνδεθεί το Evolution\n"
-"Μια λίστα καθορισμένων θυρών είναι διαθέσιμη. Ρωτήστε τον διαχειριστή του συστήματος σας\n"
+"Αυτή είναι η θύρα του διακομιστή LDAP στην οποία θα προσπαθεί να συνδεθεί το "
+"Evolution\n"
+"Μια λίστα καθορισμένων θυρών είναι διαθέσιμη. Ρωτήστε τον διαχειριστή του "
+"συστήματος σας\n"
 "για το ποιά θύρα θα χρησιμοποιήσετε."
 
 #: addressbook/gui/component/ldap-config.glade.h:78
 msgid "This option controls how long a search will be run."
-msgstr "Αυτή η επιλογή ελέγχει την χρονική διάρκεια της εκτέλεσης της αναζήτησης."
+msgstr ""
+"Αυτή η επιλογή ελέγχει την χρονική διάρκεια της εκτέλεσης της αναζήτησης."
 
 #: addressbook/gui/component/ldap-config.glade.h:79
 msgid "U_se SSL/TLS:"
@@ -1176,8 +1239,7 @@ msgstr "Χρήση διακεκριμένου ονόματος (DN)"
 msgid "Using email address"
 msgstr "Χρήση  διεύθυνσης ταχυδρομείου"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
-#: mail/mail-account-gui.c:63
+#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:63
 #: mail/mail-config.glade.h:128
 msgid "Whenever Possible"
 msgstr "Όταν είναι δυνατόν"
@@ -1190,18 +1252,13 @@ msgstr "_Όνομα εμφάνισης:"
 msgid "_Download limit:"
 msgstr "Όριο _μεταφόρτωσης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
-#: filter/filter.glade.h:14
-#: mail/mail-config.glade.h:143
-#: ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31
-#: ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25
-#: ui/evolution-mail-messagedisplay.xml.h:6
+#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11
-#: ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
@@ -1241,20 +1298,24 @@ msgstr "στήλη-γενικών"
 msgid "searching-tab"
 msgstr "στήλη-αναζήτησης"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων του Evolution."
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Επιλέξτε Επαφές από το Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Αφαίρεση Όλων"
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Εύρεση επαφής σε"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Αφαίρεση"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Αφαίρεση Όλων"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Προβολή Λίστας Επαφών"
@@ -1277,13 +1338,9 @@ msgstr "Επαφή Χωρίς Τίτλο"
 msgid "Source"
 msgstr "Πηγή"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Επιλέξτε Επαφές από το Βιβλίο Διευθύνσεων"
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Εύρεση επαφής σε"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων του Evolution."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1356,7 +1413,7 @@ msgid "D_epartment:"
 msgstr "Τ_μήμα:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:197
+#: calendar/gui/dialogs/task-editor.c:200
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
@@ -1374,10 +1431,12 @@ msgstr "Πλήρες Ό_νομα..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid ""
-"If this person publishes free/busy or other calendar information on the Internet, enter the address\n"
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
 "of that information here."
 msgstr ""
-"Αν το άτομο κοινοποιεί πληροφορίες για τη διαθεσιμότητά του ή άλλες πληροφορίες ημερολογίου στο Internet, \n"
+"Αν το άτομο κοινοποιεί πληροφορίες για τη διαθεσιμότητά του ή άλλες "
+"πληροφορίες ημερολογίου στο Internet, \n"
 "εισαγάγετε τη διεύθυνση προβολής αυτών των πληροφοριών εδώ."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
@@ -1421,15 +1480,12 @@ msgid "_Categories..."
 msgstr "_Κατηγορίες..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717
-#: calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3631
-#: mail/folder-browser.c:1790
-#: ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30
-#: ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
 #: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Διαγραφή"
@@ -1471,15 +1527,15 @@ msgid "_Web page address:"
 msgstr "_Διεύθυνση Ιστοσελίδας:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
+#: addressbook/gui/widgets/e-minicard.c:183
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 msgid "Editable"
 msgstr "Επεξεργάσιμο"
 
@@ -2507,17 +2563,17 @@ msgstr "Ζιμπάμπουε"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 msgid "Book"
 msgstr "Βιβλίο"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
+#: addressbook/gui/widgets/e-minicard-widget.c:93
 msgid "Card"
 msgstr "Κάρτα"
 
@@ -2565,7 +2621,7 @@ msgstr ""
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2375
+#: addressbook/gui/contact-editor/e-contact-editor.c:2376
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Δε βρέθηκε συστατικό για το πεδίο: `%s'"
@@ -2723,7 +2779,8 @@ msgstr "Λίστα _ονόματος:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
+msgstr ""
+"Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
@@ -2738,7 +2795,7 @@ msgstr "Είναι Νέα Λίστα"
 msgid "Contact List Editor"
 msgstr "Επεξεργαστής Λίστας Επαφών"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 msgid "Save List as VCard"
 msgstr "Αποθήκευση Λίστας ως Vcard"
 
@@ -2784,7 +2841,7 @@ msgstr ""
 "ήδη σε αυτόν τον φάκελο.  Θέλετε οπωσδήποτε να προστεθεί;"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
@@ -2803,10 +2860,10 @@ msgid "%d cards"
 msgstr "%d κάρτες"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 msgid "Query"
 msgstr "Ερώτημα"
 
@@ -2814,120 +2871,113 @@ msgstr "Ερώτημα"
 msgid "Error getting book view"
 msgstr "Σφάλμα λήψης όψης βιβλίου"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 msgid "Model"
 msgstr "Μοντέλο"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Σφάλμα τροποποίησης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr "Επιτυχία"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
-#: camel/providers/pop3/camel-pop3-store.c:533
-#: shell/e-shell.c:2077
-#: shell/e-storage.c:598
-#: shell/evolution-shell-component.c:1219
+#: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
 msgid "Unknown error"
 msgstr "Άγνωστο Σφάλμα"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Repository offline"
 msgstr "Αρχείο φύλαξης εκτός δικτύου"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
-#: shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1210
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Δεν επιτρέπεται η πρόσβαση"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card not found"
 msgstr "Η κάρτα δεν βρέθηκε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr "Το αναγνωριστικό κάρτας υπάρχει ήδη"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Protocol not supported"
 msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759
-#: calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:469
-#: calendar/gui/print.c:2309
-#: camel/camel-service.c:744
-#: camel/camel-service.c:783
-#: camel/camel-service.c:870
-#: camel/camel-service.c:911
-#: camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
+#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Failed"
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Authentication Required"
 msgstr "Απαιτείται πιστοποίηση"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr "TLS δεν είναι διαθέσιμο"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Addressbook does not exist"
 msgstr "Το ευρετήριο διευθύνσεων δεν υπάρχει"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 msgid "Other error"
 msgstr "Άλλο σφάλμα"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "_Discard"
 msgstr "Α_πόρριψη"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error adding list"
 msgstr "Σφάλμα προσθήκης λίστας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 msgid "Error adding card"
 msgstr "Σφάλμα προσθήκης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 msgid "Error modifying list"
 msgstr "Σφάλμα τροποποίησης λίστας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 msgid "Error removing list"
 msgstr "Σφάλμα κατάργησης λίστας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 msgid "Error removing card"
 msgstr "Σφάλμα αφαίρεσης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2936,144 +2986,131 @@ msgstr ""
 "Το άνοιγμα %d καρτών θα ανοίξει και %d νέα παράθυρα.\n"
 "Θέλετε πραγματικά να εμφανίσετε όλες αυτές τις κάρτες?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 msgid "Move card to"
 msgstr "Μετακίνηση κάρτας σε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 msgid "Copy card to"
 msgstr "Αντιγραφή κάρτας σε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 msgid "Move cards to"
 msgstr "Μετακίνηση καρτών σε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 msgid "Copy cards to"
 msgstr "Αντιγραφή καρτών σε"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 msgid "Multiple VCards"
 msgstr "Πολλαπλές Εκάρτες"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard για %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Τύπος"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:394
-#: importers/evolution-gnomecard-importer.c:228
-#: importers/pine-importer.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:398
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-#: addressbook/gui/widgets/e-addressbook-view.c:895
-#: addressbook/gui/widgets/e-addressbook-view.c:1879
+#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1883
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Αποθήκευση ως (VCard)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "New Contact..."
 msgstr "Νέα Επαφή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "New Contact List..."
 msgstr "Νέα Λίστα Επαφών..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Go to Folder..."
 msgstr "Μετάβαση στον Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Import..."
 msgstr "Εισαγωγή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Search for Contacts..."
 msgstr "Αναζήτηση  για επαφές"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Addressbook Sources..."
 msgstr "Πηγές βιβλίου διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Pilot Settings..."
 msgstr "Ρυθμίσεις Pilot ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Προώθηση Επαφής"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Send Message to Contact"
 msgstr "Αποστολή Μηνύματος στη Επαφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
-#: calendar/gui/print.c:2441
-#: ui/evolution-addressbook.xml.h:16
-#: ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:67
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Print Envelope"
 msgstr "Εκτύπωση Φακέλου"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 msgid "Copy to folder..."
 msgstr "Αντιγραφή στο Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 msgid "Move to folder..."
 msgstr "Μετακίνηση στο Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:6
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: ui/evolution-addressbook.xml.h:13
-#: ui/evolution-tasks.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:234
-#: ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
-#: ui/evolution-mail-message.xml.h:20
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915
-#: calendar/gui/e-day-view.c:3699
-#: calendar/gui/e-week-view.c:3596
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: calendar/gui/e-cal-view.c:1109
 msgid "Current View"
 msgstr "Τρέχουσα Προβολή"
 
@@ -3085,7 +3122,7 @@ msgstr "Τρέχουσα Προβολή"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:949
+#: addressbook/gui/widgets/e-addressbook-view.c:953
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,α,β,γ,δ,ε,ζ,η,θ,ι,κ,λ,μ,ν,ξ,ο,π,ρ,σ,τ,υ,φ,χ,ψ,ω"
 
@@ -3093,11 +3130,11 @@ msgstr ",123,α,β,γ,δ,ε,ζ,η,θ,ι,κ,λ,μ,ν,ξ,ο,π,ρ,σ,τ,υ,φ,χ,�
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:954
+#: addressbook/gui/widgets/e-addressbook-view.c:958
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,α,β,γ,δ,ε,ζ,η,θ,ι,κ,λ,μ,ν,ξ,ο,π,ρ,σ,τ,υ,φ,χ,ψ,ω"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1352
+#: addressbook/gui/widgets/e-addressbook-view.c:1356
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3106,7 +3143,8 @@ msgid ""
 msgstr ""
 "Το backend του ευρετηρίου διευθύνσεων για\n"
 "%s\n"
-"κόλλησε. Θα πρέπει να επανεκκινήσετε το Evolution για να το ξαναχρησιμοποιήσετε"
+"κόλλησε. Θα πρέπει να επανεκκινήσετε το Evolution για να το "
+"ξαναχρησιμοποιήσετε"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "* Click here to add a contact *"
@@ -3168,6 +3206,29 @@ msgstr "Άλλο Τηλέφωνο"
 msgid "Primary Phone"
 msgstr "Πρωτεύον Τηλέφωνο"
 
+#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "Πλάτος"
+
+#: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "Ύψος"
+
+#: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr "Έχει εστίαση"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Επιλεγμένα"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Έχει δρομέα"
+
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3181,21 +3242,6 @@ msgstr "και άλλη μία κάρτα."
 msgid "Save in addressbook"
 msgstr "Αποθήκευση στο Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:146
-msgid "Width"
-msgstr "Πλάτος"
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:153
-msgid "Height"
-msgstr "Ύψος"
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:161
-msgid "Has Focus"
-msgstr "Έχει εστίαση"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Πεδίο"
@@ -3212,10 +3258,6 @@ msgstr "Μοντέλο Κειμένου"
 msgid "Max field name length"
 msgstr "Μέγιστο μάκρος ονόματος πεδίου"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Πλάτος στήλης"
-
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3244,13 +3286,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Προσαρμογέας"
 
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Επιλεγμένα"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Έχει δρομέα"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr "Πλάτος στήλης"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3260,20 +3298,20 @@ msgstr "Προβολή Κάρτας"
 msgid "GTK Tree View"
 msgstr "Προβολή δένδρου GTK "
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Εκτύπωση φακέλου"
-
-#: addressbook/printing/e-contact-print.c:1139
+#: addressbook/printing/e-contact-print.c:1158
 msgid "Print cards"
 msgstr "Εκτύπωση καρτών"
 
-#: addressbook/printing/e-contact-print.c:1204
-#: addressbook/printing/e-contact-print.c:1226
+#: addressbook/printing/e-contact-print.c:1224
+#: addressbook/printing/e-contact-print.c:1250
 msgid "Print card"
 msgstr "Εκτύπωση κάρτας"
 
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Εκτύπωση φακέλου"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3362,8 +3400,7 @@ msgstr "Περιθώρια"
 msgid "Number of columns:"
 msgstr "Αριθμός στηλών:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-#: mail/mail-config.glade.h:79
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:79
 msgid "Options"
 msgstr "Επιλογές"
 
@@ -3444,194 +3481,216 @@ msgstr "Πλάτος:"
 msgid "_Font..."
 msgstr "_Γραμματοσειρά..."
 
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "με όλους τους τοπικούς και ενεργούς απομακρυσμένους φακέλους"
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "κάρτες"
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Εσωτερικό σφάλμα"
+
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Ραντεβού χωρίς τίτλο"
 
-#: calendar/cal-util/cal-recur.c:3985
-#: calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:477
 msgid "1st"
 msgstr "1η"
 
-#: calendar/cal-util/cal-recur.c:3986
-#: calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:477
 msgid "2nd"
 msgstr "2η"
 
-#: calendar/cal-util/cal-recur.c:3987
-#: calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:477
 msgid "3rd"
 msgstr "3η"
 
-#: calendar/cal-util/cal-recur.c:3988
-#: calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:477
 msgid "4th"
 msgstr "4η"
 
-#: calendar/cal-util/cal-recur.c:3989
-#: calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:477
 msgid "5th"
 msgstr "5η"
 
-#: calendar/cal-util/cal-recur.c:3990
-#: calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:478
 msgid "6th"
 msgstr "6η"
 
-#: calendar/cal-util/cal-recur.c:3991
-#: calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:478
 msgid "7th"
 msgstr "7η"
 
-#: calendar/cal-util/cal-recur.c:3992
-#: calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:478
 msgid "8th"
 msgstr "8η"
 
-#: calendar/cal-util/cal-recur.c:3993
-#: calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:478
 msgid "9th"
 msgstr "9η"
 
-#: calendar/cal-util/cal-recur.c:3994
-#: calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:478
 msgid "10th"
 msgstr "10η"
 
-#: calendar/cal-util/cal-recur.c:3995
-#: calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:479
 msgid "11th"
 msgstr "11η"
 
-#: calendar/cal-util/cal-recur.c:3996
-#: calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:479
 msgid "12th"
 msgstr "12η"
 
-#: calendar/cal-util/cal-recur.c:3997
-#: calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:479
 msgid "13th"
 msgstr "13η"
 
-#: calendar/cal-util/cal-recur.c:3998
-#: calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:479
 msgid "14th"
 msgstr "14η"
 
-#: calendar/cal-util/cal-recur.c:3999
-#: calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:479
 msgid "15th"
 msgstr "15η"
 
-#: calendar/cal-util/cal-recur.c:4000
-#: calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:480
 msgid "16th"
 msgstr "16η"
 
-#: calendar/cal-util/cal-recur.c:4001
-#: calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:480
 msgid "17th"
 msgstr "17η"
 
-#: calendar/cal-util/cal-recur.c:4002
-#: calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:480
 msgid "18th"
 msgstr "18η"
 
-#: calendar/cal-util/cal-recur.c:4003
-#: calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:480
 msgid "19th"
 msgstr "19η"
 
-#: calendar/cal-util/cal-recur.c:4004
-#: calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:480
 msgid "20th"
 msgstr "20η"
 
-#: calendar/cal-util/cal-recur.c:4005
-#: calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:481
 msgid "21st"
 msgstr "21η"
 
-#: calendar/cal-util/cal-recur.c:4006
-#: calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:481
 msgid "22nd"
 msgstr "22η"
 
-#: calendar/cal-util/cal-recur.c:4007
-#: calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:481
 msgid "23rd"
 msgstr "23η"
 
-#: calendar/cal-util/cal-recur.c:4008
-#: calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:481
 msgid "24th"
 msgstr "24η"
 
-#: calendar/cal-util/cal-recur.c:4009
-#: calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:481
 msgid "25th"
 msgstr "25η"
 
-#: calendar/cal-util/cal-recur.c:4010
-#: calendar/gui/print.c:484
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:482
 msgid "26th"
 msgstr "26η"
 
-#: calendar/cal-util/cal-recur.c:4011
-#: calendar/gui/print.c:484
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:482
 msgid "27th"
 msgstr "27η"
 
-#: calendar/cal-util/cal-recur.c:4012
-#: calendar/gui/print.c:484
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:482
 msgid "28th"
 msgstr "28η"
 
-#: calendar/cal-util/cal-recur.c:4013
-#: calendar/gui/print.c:484
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:482
 msgid "29th"
 msgstr "29η"
 
-#: calendar/cal-util/cal-recur.c:4014
-#: calendar/gui/print.c:484
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:482
 msgid "30th"
 msgstr "30η"
 
-#: calendar/cal-util/cal-recur.c:4015
-#: calendar/gui/print.c:485
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:483
 msgid "31st"
 msgstr "31η"
 
-#: calendar/cal-util/cal-util.c:550
-#: calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:393
-#: mail/message-list.c:753
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:912
 msgid "High"
 msgstr "Υψηλή"
 
-#: calendar/cal-util/cal-util.c:552
-#: calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:394
-#: mail/message-list.c:752
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
+#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Κανονική"
 
-#: calendar/cal-util/cal-util.c:554
-#: calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:395
-#: mail/message-list.c:751
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:910
 msgid "Low"
 msgstr "Χαμηλή"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:396
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr "Αόριστο"
 
@@ -3639,88 +3698,48 @@ msgstr "Αόριστο"
 msgid "Split Multi-Day Events:"
 msgstr "Διαχωρισμός Γεγονότων Multi-Day:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr "Σφάλμα κατά την επικοινωνία με τον εξυπηρετητή ημερολογίου"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 msgid "Could not read pilot's Calendar application block"
-msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
+msgstr ""
+"Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
 
 #: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Εξ ορισμού Προτεραιότητα"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
-msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Ημερολόγιο και Εργασίες"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Ρυθμίστε εδώ την Ζώνη ώρας, Ημερολόγιο και Λίστα Εργασιών σας."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Ημερολόγιο και Εργασίες του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Στοιχείο ημερολογίου και εργασιών του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Έλεγχος ρυθμίσεων του ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Εφαρμογή προβολής μυνημάτων ραντεβού του ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Εφαρμογή προβολής ημερολογίου Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Επεξεργαστής ημερολογίου/εργασιών του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Εφαρμογή προβολής εργασιών του Evolution "
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Υπηρεσία υπενθύμισης ειδοποίησης του ημερολογίου του Evolution"
+msgstr ""
+"Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Εκκίνηση:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Τέλος:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr "μη-έγκυρη ώρα"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 msgid "Evolution Alarm"
 msgstr "Συναγερμός Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr "Ειδοποίηση στις %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Κλείσιμο"
 
@@ -3736,17 +3755,25 @@ msgstr "Χρόνος της χρονική μετάθεσης (λεπτά)"
 msgid "_Edit appointment"
 msgstr "Επεξεργασία _ραντεβού"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr "Δεν υπάρχει διαθέσιμη περιγραφή."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867
-#: widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3758,10 +3785,11 @@ msgstr ""
 "αποστολή e-mail το Evolution θα εμφανίσει ένα παράθυρο\n"
 "διαλόγου με μια κανονική υπενθύμιση."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -3774,80 +3802,89 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την εκτέλεση του προγράμματος;"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 msgid "Do not ask me about this program again."
 msgstr "Να μην ξαναγίνει η ερώτηση για αυτό το πρόγραμμα."
 
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Υπηρεσία υπενθύμισης ειδοποίησης του ημερολογίου του Evolution"
+
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize Bonobo"
+msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:176
 msgid "Could not initialize gnome-vfs"
 msgstr "Δεν ήταν δυνατή η προετοιμασία του gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
+#: calendar/gui/alarm-notify/notify-main.c:185
 msgid "Could not create the alarm notify service factory"
 msgstr "Δεν ήταν δυνατή η δημιουργία του εργοστασίου της υπηρεσίας ειδοποίησης"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Η Περίληψη περιέχει"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Η περιγραφή περιέχει"
+#: calendar/gui/calendar-commands.c:376
+#, fuzzy
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Με αυτή την λειτουργία θα διαγράψετε μόνιμα όλες τις εργασίες που έχετε "
+"σημειώσει ως ολοκληρωμένες. Αν συνεχίσετε,\n"
+" δεν θα μπορέσετε να τα ανακτήσετε.\n"
+"\n"
+"Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Το σχόλιο περιέχει"
+#: calendar/gui/calendar-commands.c:382
+#, fuzzy
+msgid "Purge events older than"
+msgstr "επιστρέφει λιγότερο από"
 
-#: calendar/gui/cal-search-bar.c:358
-#: mail/mail-ops.c:1106
-msgid "Unmatched"
-msgstr "Αταίριαστο"
+#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "ημέρες"
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422
-#: calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1422
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
+#: calendar/gui/e-day-view-top-item.c:266
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%d %a %b"
 
-#: calendar/gui/calendar-commands.c:424
-#: calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:442
-#: calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455
-#: calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333
-#: calendar/gui/print.c:1511
+#: calendar/gui/calendar-commands.c:518
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:849
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr "Δεν ήταν δυνατό να δημιουργηθεί προβολή ημερολογίου. Παρακαλώ ελέγξτε την εγκατάσταση του ORBit and OAF"
+#: calendar/gui/calendar-commands.c:918
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Δεν ήταν δυνατό να δημιουργηθεί προβολή ημερολογίου. Παρακαλώ ελέγξτε την "
+"εγκατάσταση του ORBit and OAF"
 
-#: calendar/gui/calendar-component.c:70
-#: calendar/gui/gnome-cal.c:1353
-#: importers/netscape-importer.c:1873
-#: mail/importers/netscape-importer.c:1843
-#: my-evolution/my-evolution.glade.h:2
-#: shell/e-local-storage.c:177
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Ημερολόγιο"
@@ -3864,17 +3901,12 @@ msgstr "Κοινόχρηστο ημερολόγιο"
 msgid "Public folder containing appointments and events"
 msgstr "Δημόσιος φάκελος που περιέχει ραντεβού και γεγονότα"
 
-#: calendar/gui/calendar-component.c:80
-#: calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1791
-#: calendar/gui/tasks-control.c:503
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
-#: importers/netscape-importer.c:1875
-#: mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329
-#: my-evolution/e-summary-tasks.c:338
-#: shell/e-local-storage.c:183
-#: shell/e-shortcuts.c:1086
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Εργασίες"
 
@@ -3938,128 +3970,6 @@ msgstr "All _Day Ραντεβού"
 msgid "Create a new all-day appointment"
 msgstr "Δημιουργία ένος νέου all-day ραντεβού"
 
-#: calendar/gui/calendar-model.c:405
-#: calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:372
-msgid "Private"
-msgstr "Ιδιωτικό"
-
-#: calendar/gui/calendar-model.c:408
-#: calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:373
-msgid "Confidential"
-msgstr "Εμπιστευτικό"
-
-#: calendar/gui/calendar-model.c:411
-#: calendar/gui/e-calendar-table.c:371
-msgid "Public"
-msgstr "Δημόσιο"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "Β"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "Ν"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "Α"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "Δ"
-
-#: calendar/gui/calendar-model.c:590
-#: calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:445
-msgid "Free"
-msgstr "Διαθέσιμη"
-
-#: calendar/gui/calendar-model.c:592
-#: calendar/gui/e-calendar-table.c:446
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1204
-msgid "Busy"
-msgstr "Απασχολημένη"
-
-#: calendar/gui/calendar-model.c:750
-#: calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:466
-#: calendar/gui/print.c:2300
-msgid "Not Started"
-msgstr "Δεν έχει ξεκινήσει"
-
-#: calendar/gui/calendar-model.c:753
-#: calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:467
-#: calendar/gui/print.c:2303
-msgid "In Progress"
-msgstr "Σε εξέλιξη"
-
-#: calendar/gui/calendar-model.c:756
-#: calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:468
-#: calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317
-#: calendar/gui/print.c:2306
-msgid "Completed"
-msgstr "Ολοκληρώθηκε"
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Η γεωγραφική θέση πρέπει να έχει την παρακάτω μορφή: \n"
-"\n"
-"45.436845,125.862501"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: composer/e-msg-composer.c:2056
-#: mail/folder-browser.c:1752
-#: mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257
-#: widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458
-#: widgets/misc/e-dateedit.c:1573
-msgid "None"
-msgstr "Κανένα"
-
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr "Επανάληψη"
-
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr "Ανάθεση"
-
-#: calendar/gui/calendar-model.c:1719
-#: calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
-msgstr "Ναι"
-
-#: calendar/gui/calendar-model.c:1719
-#: calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
-msgstr "Όχι"
-
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Προβολή Ημέρας"
@@ -4076,48 +3986,69 @@ msgstr "Προβολή Εβδομάδας"
 msgid "Month View"
 msgstr "Προβολή Μήνα"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Προσαρμοσμένη Προβολή"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Η Περίληψη περιέχει"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Η περιγραφή περιέχει"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Το σχόλιο περιέχει"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
+msgid "Unmatched"
+msgstr "Αταίριαστο"
+
+#: calendar/gui/comp-editor-factory.c:462
 msgid "Error while opening the calendar"
 msgstr "Σφάλμα κατά το άνοιγμα του ημερολογίου"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr "Η μέθοδος δεν υποστηρίζεται κατά το άνοιγμα του ημερολογίου"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 msgid "Permission denied to open the calendar"
 msgstr "Δεν επιτρέπεται η πρόσβαση για το άνοιγμα του ημερολογίου"
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:125
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Αδύνατο το άνοιγμα φακέλου στο `%s'"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "Το URI που θα εμφανίσει το ημερολόγιο"
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr "Ο τύπος της προβολής για εμφάνιση"
 
-#: calendar/gui/dialogs/alarm-options.c:420
+#: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Επιλογές Ηχητικής Ειδοποίησης"
 
-#: calendar/gui/dialogs/alarm-options.c:429
+#: calendar/gui/dialogs/alarm-options.c:475
 msgid "Message Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Μηνύματος"
 
-#: calendar/gui/dialogs/alarm-options.c:438
+#: calendar/gui/dialogs/alarm-options.c:484
 msgid "Email Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Email"
 
-#: calendar/gui/dialogs/alarm-options.c:447
+#: calendar/gui/dialogs/alarm-options.c:493
 msgid "Program Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Προγράμματος"
 
-#: calendar/gui/dialogs/alarm-options.c:456
+#: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
 msgstr "Άγνωστες Επιλογές Ειδοποίησης"
 
@@ -4153,11 +4084,6 @@ msgstr "Αποστολή σε:"
 msgid "With these arguments:"
 msgstr "Με αυτές τις παραμέτρους:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: filter/filter.glade.h:17
-msgid "days"
-msgstr "ημέρες"
-
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr "διάλογος1"
@@ -4166,13 +4092,12 @@ msgstr "διάλογος1"
 msgid "extra times every"
 msgstr "επιπλέον φορές κάθε"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
 msgid "hours"
 msgstr "ώρες"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: filter/filter.glade.h:19
+#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "λεπτά"
 
@@ -4186,13 +4111,11 @@ msgstr "Βασικά"
 msgid "Date/Time:"
 msgstr "Ημερομηνία/Ώρα:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr "Εμφάνιση μηνύματος"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr "Εκτέλεση Ήχου"
 
@@ -4200,8 +4123,7 @@ msgstr "Εκτέλεση Ήχου"
 msgid "Reminders"
 msgstr "Υπενθυμίσεις"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr "Εκτέλεσε ένα πρόγραμμα"
 
@@ -4211,8 +4133,8 @@ msgstr "Αποστολή e-mail"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Περίληψη:"
 
@@ -4241,8 +4163,7 @@ msgstr "τέλος του ραντεβού"
 msgid "hour(s)"
 msgstr "ώρα(ες)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
-#: mail/mail-config.glade.h:173
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:173
 msgid "minute(s)"
 msgstr "λεπτό(ά)"
 
@@ -4270,8 +4191,7 @@ msgstr "30 λεπτά"
 msgid "60 minutes"
 msgstr "60 λεπτά"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#: mail/mail-config.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 msgid "Alerts"
 msgstr "Ειδοποιήσεις"
 
@@ -4297,7 +4217,7 @@ msgstr "Ημέρες"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr "Παρασκευή"
 
@@ -4311,7 +4231,7 @@ msgstr "Λεπτά"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr "Δευτέρα"
 
@@ -4321,7 +4241,7 @@ msgstr "_Κυρ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr "Σάββατο"
 
@@ -4335,7 +4255,7 @@ msgstr "Εμφάνιση _αριθμών εβδομάδων στον περιη�
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr "Κυριακή"
 
@@ -4353,7 +4273,7 @@ msgstr "Λίστα Εργασιών"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr "Πέμπτη"
 
@@ -4371,7 +4291,7 @@ msgstr "Μορφή ώρας:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr "Τρίτη"
 
@@ -4381,12 +4301,12 @@ msgstr "Ε_βδομάδα ξεκινάει:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr "Εργάσιμη Εβδομάδα"
 
@@ -4464,103 +4384,91 @@ msgid "before every appointment"
 msgstr "πριν από κάθε ραντεβού"
 
 #: calendar/gui/dialogs/cancel-comp.c:58
-msgid "The event being deleted is a meeting, would you like to send a cancellation notice?"
-msgstr "Το γεγονός που διαγράφηκε ήταν μια συνάντηση, θέλετε να στείλετε μια ειδοποίηση ακύρωσης?"
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
+"Το γεγονός που διαγράφηκε ήταν μια συνάντηση, θέλετε να στείλετε μια "
+"ειδοποίηση ακύρωσης?"
 
 #: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Είστε βέβαιοι για την ακύρωση και διαγραφή της συνάντησης;"
 
 #: calendar/gui/dialogs/cancel-comp.c:67
-msgid "The task being deleted is assigned, would you like to send a cancellation notice?"
-msgstr "Η εργασία που διαγράφηκε είχε ανατεθεί, θέλετε να στείλετε μια ειδοποίηση ακύρωσης?"
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+"Η εργασία που διαγράφηκε είχε ανατεθεί, θέλετε να στείλετε μια ειδοποίηση "
+"ακύρωσης?"
 
 #: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Είστε βέβαιοι για την ακύρωση και την διαγραφή της εργασίας;"
 
 #: calendar/gui/dialogs/cancel-comp.c:76
-msgid "The journal entry being deleted is published, would you like to send a cancellation notice?"
-msgstr "Η καταχώρηση που διαγράφηκε είχε δημοσιευθεί, θέλετε να στείλετε μια ειδοποίηση ακύρωσης?"
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+"Η καταχώρηση που διαγράφηκε είχε δημοσιευθεί, θέλετε να στείλετε μια "
+"ειδοποίηση ακύρωσης?"
 
 #: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Είστε βέβαιοι για την ακύρωση και την διαγραφή της καταχώρισης του ημερολογίου;"
+msgstr ""
+"Είστε βέβαιοι για την ακύρωση και την διαγραφή της καταχώρισης του "
+"ημερολογίου;"
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Το συμβάν έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Η εργασία έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Η καταχώριση του ημερολογίου έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  Έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να τερματιστεί ο επεξεργαστής;"
+msgstr ""
+"%s  Έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να τερματιστεί ο "
+"επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Δεν έχετε κάνει αλλαγές. Να τερματιστεί ο επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Το συμβάν έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Η εργασία έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Η καταχώριση του ημερολογίου έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Δεν έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να ανανεωθεί ο επεξεργαστής;"
+msgstr ""
+"%s  Δεν έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να ανανεωθεί ο "
+"επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Δεν έχετε κάνει αλλαγές. Να ανανεωθεί ο επεξεργαστής;"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Άγνωστο πιστοποίησης: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187
-#: calendar/gui/print.c:2218
-msgid " to "
-msgstr " με "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191
-#: calendar/gui/print.c:2222
-msgid " (Completed "
-msgstr "(Ολοκληρωμένο"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193
-#: calendar/gui/print.c:2224
-msgid "Completed "
-msgstr "Ολοκληρωμένο "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198
-#: calendar/gui/print.c:2229
-msgid " (Due "
-msgstr "(Λήξη"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200
-#: calendar/gui/print.c:2231
-msgid "Due "
-msgstr "Λήξη "
-
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "Δεν ήταν δυνατή μη έγκυρου αντικειμένου"
@@ -4578,46 +4486,77 @@ msgid "Could not update object"
 msgstr "Δεν ήταν δυνατή η ενημέρωση του αντικειμένου"
 
 #: calendar/gui/dialogs/comp-editor.c:793
+#: calendar/gui/dialogs/comp-editor.c:830
 msgid "Edit Appointment"
 msgstr "Επεξεργασία Ραντεβού"
 
 #: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:835
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ραντεβού - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:801
+#: calendar/gui/dialogs/comp-editor.c:838
 #, c-format
 msgid "Task - %s"
 msgstr "Εργασία - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:804
+#: calendar/gui/dialogs/comp-editor.c:841
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Ημερολογιακή καταχώριση - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:815
+#: calendar/gui/dialogs/comp-editor.c:851
 msgid "No summary"
 msgstr "Χωρίς περίληψη"
 
-#: calendar/gui/dialogs/comp-editor.c:1233
-#: calendar/gui/e-calendar-table.c:1039
-#: calendar/gui/e-day-view.c:3977
-#: calendar/gui/e-week-view.c:3840
-#: composer/e-msg-composer.c:1164
+#: calendar/gui/dialogs/comp-editor.c:1281
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Αποθήκευση ως..."
 
-#: calendar/gui/dialogs/comp-editor.c:1334
-#: calendar/gui/dialogs/comp-editor.c:1358
-#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "Οι αλλαγές που έγιναν σε αυτό το αντικείμενο μπορεί να απορριφθούν αν καταφθάσει μια ενημέρωση"
+msgstr ""
+"Οι αλλαγές που έγιναν σε αυτό το αντικείμενο μπορεί να απορριφθούν αν "
+"καταφθάσει μια ενημέρωση"
 
-#: calendar/gui/dialogs/comp-editor.c:1409
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr "Δεν ήταν δυνατό να αποκτηθεί η τρέχουσα έκδοση!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Άγνωστο πιστοποίησης: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
+msgid " to "
+msgstr " με "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
+msgid " (Completed "
+msgstr "(Ολοκληρωμένο"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
+msgid "Completed "
+msgstr "Ολοκληρωμένο "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
+msgid " (Due "
+msgstr "(Λήξη"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
+msgid "Due "
+msgstr "Λήξη "
+
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4643,7 +4582,8 @@ msgstr "Είστε βέβαιοι για την διαγραφή της κατα
 
 #: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου χωρίς τίτλο;"
+msgstr ""
+"Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου χωρίς τίτλο;"
 
 #: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
@@ -4686,7 +4626,8 @@ msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας
 
 #: calendar/gui/dialogs/delete-error.c:72
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr "Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
+msgstr ""
+"Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
 
 #: calendar/gui/dialogs/delete-error.c:75
 msgid "The item could not be deleted because permission was denied"
@@ -4703,12 +4644,16 @@ msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας
 #: calendar/gui/dialogs/delete-error.c:88
 #, fuzzy
 msgid "The journal entry could not be deleted because it was invalid"
-msgstr "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη έγκυρης κατάστασης\n"
+msgstr ""
+"Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
+"έγκυρης κατάστασης\n"
 
 #: calendar/gui/dialogs/delete-error.c:91
 #, fuzzy
 msgid "The item could not be deleted because it was invalid"
-msgstr "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη έγκυρης κατάστασης\n"
+msgstr ""
+"Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
+"έγκυρης κατάστασης\n"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
@@ -4722,34 +4667,31 @@ msgstr "Εξουσιοδότηση Σε:"
 msgid "Enter Delegate"
 msgstr "Εισαγωγή Αντιπροσώπου"
 
-#: calendar/gui/dialogs/event-editor.c:199
-#: calendar/gui/print.c:2255
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
 msgid "Appointment"
 msgstr "Ραντεβού"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Υπενθύμιση"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Επανεμφάνιση"
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Δρομολόγηση"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
-#: ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: calendar/gui/dialogs/event-page.c:603
-#: calendar/gui/dialogs/task-page.c:507
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
 msgid "Start date is wrong"
 msgstr "Η ημερομηνία έναρξης είναι λανθασμένη"
 
@@ -4785,9 +4727,9 @@ msgid "Classification"
 msgstr "Ταξινόμηση"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Εμπιστευτικό"
+#, fuzzy
+msgid "Co_nfidential"
+msgstr "Εμπιστευτικό"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4813,7 +4755,6 @@ msgid "Pu_blic"
 msgstr "Δη_μόσιο"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Εμφάνιση Ώρας Ως"
 
@@ -4830,75 +4771,34 @@ msgstr "_Χρόνος Λήξης:"
 msgid "_Start time:"
 msgstr "Χρόνος Έ_ναρξης:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr "Κανένα"
+
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Χρειάζεται ένας διοργανωτής."
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος."
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr "Αυτό το άτομο είναι ήδη σε συνάντηση!"
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:630
 msgid "_Delegate To..."
 msgstr "_Εξουσιοδότηση Σε..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Παρευρισκόμενος"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Κάντε κλικ εδώ για να προσθέσετε έναν παρευρισκόμενο"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Κοινό Όνομα"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Εξουσιοδοτημένος Από"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Εξουσιοδότηση Σε"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Γλώσσα"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Μέλος"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
-#: filter/libfilter-i18n.h:58
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Κατάσταση"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4909,7 +4809,7 @@ msgid "_Change Organizer"
 msgstr "_Αλλαγή Διοργανωτή"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Πρόσκληση Άλλων..."
 
@@ -4922,7 +4822,8 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -4941,7 +4842,9 @@ msgstr "Για Προχωρημένους"
 
 #: calendar/gui/dialogs/recurrence-page.c:535
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Αυτή η συνάντηση περιέχει επαναλήψεις που το Evolution δεν μπορεί να επεξεργαστεί."
+msgstr ""
+"Αυτή η συνάντηση περιέχει επαναλήψεις που το Evolution δεν μπορεί να "
+"επεξεργαστεί."
 
 #: calendar/gui/dialogs/recurrence-page.c:809
 #, fuzzy
@@ -5063,8 +4966,7 @@ msgstr ""
 "\n"
 "Θέλετε να αποθηκεύσετε τις αλλαγές τώρα;"
 
-#: calendar/gui/dialogs/save-comp.c:58
-#: composer/e-msg-composer.c:1557
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr "Α_πόρριψη αλλαγών"
 
@@ -5079,65 +4981,96 @@ msgstr "Η πληροφορίες της συνάντησης έχουν δημ�
 
 #: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
-msgstr "Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη έκδοση;"
+msgstr ""
+"Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη έκδοση;"
 
 #: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
-msgstr "Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
+msgstr ""
+"Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
 
 #: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
-msgstr "Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
+msgstr ""
+"Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 msgid "Completed date is wrong"
 msgstr "Η συμπληρωμένη ημερομηνία είναι λανθασμένη"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#, fuzzy, no-c-format
+msgid "% _Complete"
 msgstr "% Ολοκληρωμένο"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
-msgstr "Ολοκληρώθηκε την:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311
+msgid "Completed"
+msgstr "Ολοκληρώθηκε"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
+msgid "In Progress"
+msgstr "Σε εξέλιξη"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305
+msgid "Not Started"
+msgstr "Δεν έχει ξεκινήσει"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Πρόοδος"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Date Completed:"
+msgstr "Ολοκληρώθηκε την:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Προτεραιότητα"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Κατάσταση:"
 
-#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "_Διεύθυνση Ιστοσελίδας:"
+
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Βασικό"
 
-#: calendar/gui/dialogs/task-editor.c:204
-#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Εργασία"
 
-#: calendar/gui/dialogs/task-page.c:480
+#: calendar/gui/dialogs/task-page.c:482
 msgid "Due date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:43
+#: calendar/gui/dialogs/task-page.c:542
+msgid "Due date is before start date!"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "_Εμπιστευτικό"
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Περιγραφή:"
 
@@ -5149,246 +5082,259 @@ msgstr "Ημερομηνία Έ_ναρξης:"
 msgid "_Due Date:"
 msgstr "Ημερομηνία _Λήξης:"
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr "%d ημέρες"
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr "1 ημέρα"
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr "%d εβδομάδες"
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr "1 εβδομάδα"
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr "%d ώρες"
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr "1 ώρα"
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr "%d λεπτά"
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr "1 λεπτό"
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr "%d δευτερόλεπτα"
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr "1 δευτερόλεπτο"
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr "Αποστολή e-mail"
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr "Εκτέλεση άγνωστης ενέργειας"
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s πριν την αρχή του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s πριν την αρχή του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s στην αρχή του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s πριν το τέλος του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s μετά το τέλος του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s στο τέλος του ραντεβού"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr "%s στις %s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s για άγνωστο τύπο ενεργοποίησης"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
+msgid "Public"
+msgstr "Δημόσιο"
+
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
+msgid "Private"
+msgstr "Ιδιωτικό"
+
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
+msgid "Confidential"
+msgstr "Εμπιστευτικό"
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:418
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:717
-#: calendar/gui/e-day-view.c:2851
-#: calendar/gui/e-week-view.c:1933
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Διαθέσιμη"
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:393
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Απασχολημένη"
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 msgid "Deleting selected objects"
 msgstr "Διαγραφή επιλεγμένων αντικειμένων"
 
-#: calendar/gui/e-calendar-table.c:949
-#: calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-week-view.c:3613
-#: mail/folder-browser.c:1763
-#: shell/e-shortcuts-view.c:422
-#: ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
-#: calendar/gui/e-calendar-table.c:950
-msgid "_Save as..."
-msgstr "Αποθήκευ_ση ως..."
-
-#: calendar/gui/e-calendar-table.c:951
-#: calendar/gui/e-day-view.c:3723
-#: calendar/gui/e-week-view.c:3588
-#: calendar/gui/e-week-view.c:3615
-#: ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:20
-#: ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:989
+#, fuzzy
+msgid "Open _Web Page"
+msgstr "_Άνοιγμα Μηνύματος"
+
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Save As..."
+msgstr "Αποθήκευση _ως..."
+
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
+#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Εκτύπωση..."
 
-#: calendar/gui/e-calendar-table.c:955
-#: calendar/gui/e-day-view.c:3728
-#: calendar/gui/e-week-view.c:3620
-#: ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Αποκοπή"
 
-#: calendar/gui/e-calendar-table.c:956
-#: calendar/gui/e-day-view.c:3729
-#: calendar/gui/e-week-view.c:3621
-#: ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29
-#: ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
+#: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "Αντι_γραφή"
 
-#: calendar/gui/e-calendar-table.c:957
-#: calendar/gui/e-day-view.c:3694
-#: calendar/gui/e-day-view.c:3730
-#: calendar/gui/e-week-view.c:3592
-#: calendar/gui/e-week-view.c:3622
-#: ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32
-#: ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
+#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Επι_κόλληση"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Assign Task"
 msgstr "_Ανάθεση Εργασίας"
 
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Forward as iCalendar"
 msgstr "Προώ_θηση ως i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Mark as Complete"
 msgstr "_Σημείωση ως Ολοκληρωμένο"
 
-#: calendar/gui/e-calendar-table.c:964
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Σημείωση επιλεγμένων εργασιών ως ολοκληρωμένες"
 
-#: calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 msgid "_Delete Selected Tasks"
 msgstr "_Διαγραφή Επιλεγμένων Εργασιών"
 
-#: calendar/gui/e-calendar-table.c:1236
-#: calendar/gui/e-day-view.c:7701
-#: calendar/gui/e-week-view.c:4335
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr "Αναβάθμιση Αντικειμένων"
 
-#: calendar/gui/e-calendar-table.c:1319
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Κλικ εδώ για προσθήκη εργασίας"
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Ολοκληρωμένο"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Ειδοποιήσεις"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
-#: camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr "Ολοκληρώθηκε"
 
@@ -5397,11 +5343,12 @@ msgid "Completion Date"
 msgstr "Ημερομηνία Ολοκλήρωσης"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr "Ημερομηνία Λήξης"
+#, fuzzy
+msgid "Description"
+msgstr "Περιγραφή:"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
+msgid "Due Date"
 msgstr "Ημερομηνία Λήξης"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
@@ -5412,637 +5359,641 @@ msgstr "Γεωγραφική Θέση"
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Ημερομηνία Έναρξης"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56
-#: shell/e-shell.c:750
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Κατάσταση"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Περίληψη"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Ταξινόμηση Εργασιών"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118
-#: e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+msgid "color"
+msgstr " χρώμα"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121
-#: e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+#: calendar/gui/e-calendar-table.etspec.h:20
+#, fuzzy
+msgid "component"
+msgstr "Ραντεβού"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Η ημερομηνία πρέπει να έχει την παρακάτω μορφή: \n"
-"\n"
-"%s"
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Άγνωστο"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i τμήματα λεπτών"
+#: calendar/gui/e-cal-model.c:828
+msgid "Recurring"
+msgstr "Επανάληψη"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261
-#: calendar/gui/e-day-view.c:1405
-#: calendar/gui/e-week-view-main-item.c:316
-#: calendar/gui/print.c:1527
-msgid "%A %d %B"
-msgstr "%A %d %B"
+#: calendar/gui/e-cal-model.c:830
+msgid "Assigned"
+msgstr "Ανάθεση"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269
-#: calendar/gui/e-day-view.c:1438
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "Yes"
+msgstr "Ναι"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:620
-#: calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:811
-msgid "am"
-msgstr "πμ"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "No"
+msgstr "Όχι"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:623
-#: calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:813
-msgid "pm"
-msgstr "μμ"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "Β"
+
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "Ν"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr "Α"
 
-#: calendar/gui/e-day-view.c:3678
-msgid "New _Appointment"
-msgstr "Νέο _Ραντεβού"
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "Δ"
+
+#: calendar/gui/e-cal-model-tasks.c:550
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Η γεωγραφική θέση πρέπει να έχει την παρακάτω μορφή: \n"
+"\n"
+"45.436845,125.862501"
 
-#: calendar/gui/e-day-view.c:3680
-#: calendar/gui/e-week-view.c:3582
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+msgid "New _Appointment..."
+msgstr "Νέο _Ραντεβού..."
+
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
 msgid "New All Day _Event"
 msgstr "Νέο _Γεγονός Ολόκληρης της Ημέρας"
 
-#: calendar/gui/e-day-view.c:3682
-#: calendar/gui/e-week-view.c:3583
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
 msgid "New Meeting"
 msgstr "Νέα Συνάντηση"
 
-#: calendar/gui/e-day-view.c:3684
-#: calendar/gui/e-week-view.c:3584
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
 msgid "New Task"
 msgstr "Νέα Εργασία"
 
-#: calendar/gui/e-day-view.c:3689
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Εκτύπωση..."
-
-#: calendar/gui/e-day-view.c:3701
-#: calendar/gui/e-week-view.c:3598
+#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Μετάβαση στο _Σήμερα"
 
-#: calendar/gui/e-day-view.c:3703
-#: calendar/gui/e-week-view.c:3599
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
 msgid "_Go to Date..."
 msgstr "_Μετάβαση στην Ημερομηνία..."
 
-#: calendar/gui/e-day-view.c:3708
-#: calendar/gui/e-week-view.c:3603
-#: ui/evolution-calendar.xml.h:34
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr "Δημο_σίευση πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-day-view.c:3713
-#: calendar/gui/e-week-view.c:3607
+#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Ρυθμίσεις..."
 
-#: calendar/gui/e-day-view.c:3722
-#: calendar/gui/e-week-view.c:3614
-#: mail/folder-browser.c:1765
-#: ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr "Αποθήκευση _ως..."
-
-#: calendar/gui/e-day-view.c:3734
-#: calendar/gui/e-week-view.c:3626
+#: calendar/gui/e-cal-view.c:1139
 msgid "_Schedule Meeting..."
 msgstr "Προγραμματισμός _Συνάντησης..."
 
-#: calendar/gui/e-day-view.c:3735
-#: calendar/gui/e-week-view.c:3627
+#: calendar/gui/e-cal-view.c:1140
 msgid "_Forward as iCalendar..."
 msgstr "Προώ_θηση ως iCalendar"
 
-#: calendar/gui/e-day-view.c:3740
-#: calendar/gui/e-week-view.c:3632
+#: calendar/gui/e-cal-view.c:1145
 msgid "Make this Occurrence _Movable"
 msgstr "Να γίνει αυτή η Εμφάνιση _Μετακινήσιμη"
 
-#: calendar/gui/e-day-view.c:3741
-#: calendar/gui/e-week-view.c:3633
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
 msgid "Delete this _Occurrence"
 msgstr "Διαγραφή αυτής της _Εμφάνισης"
 
-#: calendar/gui/e-day-view.c:3742
-#: calendar/gui/e-week-view.c:3634
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
 msgid "Delete _All Occurrences"
 msgstr "Διαγραφή Ό_λων των Εμφανίσεων"
 
-#: calendar/gui/e-itip-control.c:706
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Η ημερομηνία πρέπει να έχει την παρακάτω μορφή: \n"
+"\n"
+"%s"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "πμ"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "μμ"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
+msgid "%A %d %B"
+msgstr "%A %d %B"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i τμήματα λεπτών"
+
+#: calendar/gui/e-itip-control.c:676
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "_Απλή επανεμφάνιση"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 #, fuzzy
 msgid "Every day"
 msgstr "Κάθε"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d ημέρες"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "Every week"
 msgstr "Κάθε"
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d εβδομάδες"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d εβδομάδες"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 msgid " and "
 msgstr " και"
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 #, fuzzy
 msgid "every month"
 msgstr "Ένας Μήνας"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 #, fuzzy
 msgid "Every year"
 msgstr "Κάθε"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr "<b>Ξεκινάει:</b> "
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 msgid "<b>Ends:</b> "
 msgstr "<b>Τελειώνει:</b> "
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Completed:</b> "
 msgstr "<b>Ολοκληρώθηκε:</b> "
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Due:</b> "
 msgstr "<b>Λήγει:</b> "
 
-#: calendar/gui/e-itip-control.c:900
-#: calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 msgid "iCalendar Information"
 msgstr "Πληροφορίες iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 msgid "iCalendar Error"
 msgstr "Σφάλμα iCalendar"
 
-#: calendar/gui/e-itip-control.c:984
-#: calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011
-#: calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 msgid "An unknown person"
 msgstr "Ένα άγνωστο άτομο"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
-msgid "<br> Please review the following information, and then select an action from the menu below."
-msgstr "<br> Παρακαλώ διαβάστε τις παρακάτω πληροφορίες, και επιλέξτε μετά μια ενέργεια από το παρακάτω μενού."
+#: calendar/gui/e-itip-control.c:1005
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Παρακαλώ διαβάστε τις παρακάτω πληροφορίες, και επιλέξτε μετά μια "
+"ενέργεια από το παρακάτω μενού."
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr "<i>Κανένα</i>"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 msgid "Location:"
 msgstr "Τοποθεσία: "
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: calendar/gui/e-itip-control.c:1080
-#: calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309
-#: calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1084
-#: calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Δοκιμαστική αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1088
-#: calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311
-#: calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:420
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
 #: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Άρνηση πρόσβασης"
 
-#: calendar/gui/e-itip-control.c:1092
-#: calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772
-#: camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228
-#: mail/folder-browser.c:345
-#: mail/mail-display.c:953
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Άγνωστο"
-
-#: calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201
-#: calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 msgid "Choose an action:"
 msgstr "Επιλέξτε μια ενέργεια:"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203
-#: calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229
-#: calendar/gui/e-itip-control.c:1242
-#: shell/e-shell.c:2067
-#: widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ΟΚ"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 msgid "Accept"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 msgid "Tentatively accept"
 msgstr "Δοκιμαστική αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 msgid "Decline"
 msgstr "Απόκρυψη"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr "Αποστολή πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr "Ανανέωση κατάστασης απάντησης"
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 msgid "Send Latest Information"
 msgstr "Αποστολή τελευταίων πληροφοριών"
 
-#: calendar/gui/e-itip-control.c:1241
-#: calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:387
-#: mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1182
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 msgid "Meeting Information"
 msgstr "Πληροφορίες Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> παρακαλεί την παρουσία του %s σε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> παρακαλεί την παρουσία σας σε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1309
 msgid "Meeting Proposal"
 msgstr "Πρόταση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 msgid "Meeting Update"
 msgstr "Ανανέωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> θα ήθελε να παραλάβει τις τελευταίες πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 msgid "Meeting Update Request"
 msgstr "Αίτη_ση Ανανέωσης Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> έχει απαντήσει σε μία πρόσκληση σε συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Reply"
 msgstr "Απάντηση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ακύρωσε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 msgid "Meeting Cancellation"
 msgstr "Ακύρωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1364
-#: calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "ο/η <b>%s</b> έστειλε ένα ακατανόητο μήνυμα."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 msgid "Bad Meeting Message"
 msgstr "Εσφαλμένο Μήνυμα Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες εργασιών."
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 msgid "Task Information"
 msgstr "Πληροφορίες Εργασιών"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ζητάει από τον %s να εκτελέσει μια εργασία."
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> σας έχει ζητήσει να εκτελέσετε μια εργασία"
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 msgid "Task Proposal"
 msgstr "Πρόταση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα εργασία."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1381
 msgid "Task Update"
 msgstr "Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> θα ήθελε την τελευταία πληροφορία εργασιών."
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 msgid "Task Update Request"
 msgstr "Αίτηση _Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> απάντησε σε μια ανάθεση εργασίας"
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 msgid "Task Reply"
 msgstr "Απάντηση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> έχει ακυρώσει μια εργασία."
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1402
 msgid "Task Cancellation"
 msgstr "Ακύρωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 msgid "Bad Task Message"
 msgstr " Μήνυμα κακής εργασίας"
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> έχει δημοσίευση πληροφορίες διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 msgid "Free/Busy Information"
 msgstr "Πληροφορίες Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "ο/η <b>%s</b> ζητά πληροφορίες διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 msgid "Free/Busy Request"
 msgstr "Αίτηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "ο/η <b>%s</b> απάντησε στην αίτηση διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 msgid "Free/Busy Reply"
 msgstr "Απάντηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 msgid "Bad Free/Busy Message"
 msgstr "Εσφαλμένο Μήνυμα Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 msgid "The message does not appear to be properly formed"
 msgstr "Αυτό το μήνυμα δεν φαίνεται να έχει συνταχθεί σωστά."
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 msgid "The message contains only unsupported requests."
 msgstr "Το μήνυμα περιέχει μόνο αιτήσεις που δεν υποστηρίζονται"
 
-#: calendar/gui/e-itip-control.c:1637
-#: calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Το επισυναπτόμενο αρχείο δεν περιέχει έγκυρο αρχείο ημερολογίου"
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 msgid "The attachment has no viewable calendar items"
-msgstr "Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
+msgstr ""
+"Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
 
-#: calendar/gui/e-itip-control.c:1909
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Το αντικείμενο δεν είναι έγκυρο και δεν μπορεί να ενημερωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1912
-#: calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 msgid "There was an error on the CORBA system\n"
 msgstr "Υπήρξε σφάλμα στο σύστημα CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1915
-#: calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 msgid "Object could not be found\n"
 msgstr "Δεν ήταν εύρεση του αντικειμένου\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 msgid "Update complete\n"
 msgstr "Η ανανέωση ολοκληρώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr "Δεν ήταν δυνατό να ανανεωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1953
-#: calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο δεν υπάρχει πλέον"
+msgstr ""
+"Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο "
+"δεν υπάρχει πλέον"
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
+msgstr ""
+"Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη έγκυρης κατάστασης\n"
+msgstr ""
+"Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
+"έγκυρης κατάστασης\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 msgid "Attendee status updated\n"
 msgstr "Η κατάσταση παρευρισκομένων ανανεώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 msgid "Attendee status could not be updated!\n"
 msgstr "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων\n"
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 msgid "Removal Complete"
 msgstr "Η Αφαίρεση Ολοκληρώθηκε"
 
-#: calendar/gui/e-itip-control.c:2085
-#: calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 msgid "Item sent!\n"
 msgstr "Το στοιχείο στάλθηκε!\n"
 
-#: calendar/gui/e-itip-control.c:2087
-#: calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr "Δεν ήταν δυνατή η αποστολή του στοιχείου!\n"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 msgid "Select Calendar Folder"
 msgstr "Επιλογή Φακέλου Ημερολογίου"
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 msgid "Select Tasks Folder"
 msgstr "Επιλογή Φακέλου Εργασιών"
 
@@ -6083,211 +6034,167 @@ msgstr "ημερομηνία τέλους"
 msgid "date-start"
 msgstr "ημερομηνία έναρξης"
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr "Άτομα Προεδρείου"
-
-#: calendar/gui/e-meeting-model.c:80
-#: calendar/gui/e-meeting-model.c:1636
-msgid "Required Participants"
-msgstr "Απαραίτητοι Συμμετέχοντες"
-
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
-msgstr "Προαιρετικοί Συμμετέχοντες"
-
-#: calendar/gui/e-meeting-model.c:82
-msgid "Resources"
-msgstr "Πόροι"
-
-#: calendar/gui/e-meeting-model.c:197
-#: calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530
-#: calendar/gui/e-meeting-model.c:752
-msgid "Individual"
-msgstr "Άτομο"
-
-#: calendar/gui/e-meeting-model.c:199
-#: calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
-msgid "Group"
-msgstr "Ομάδα"
-
-#: calendar/gui/e-meeting-model.c:201
-#: calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
-msgid "Resource"
-msgstr "Πόρος"
-
-#: calendar/gui/e-meeting-model.c:203
-#: calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
-msgid "Room"
-msgstr "Αίθουσα"
-
-#: calendar/gui/e-meeting-model.c:232
-#: calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
-msgid "Chair"
-msgstr "Προεδρείο"
-
-#: calendar/gui/e-meeting-model.c:234
-#: calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532
-#: calendar/gui/e-meeting-model.c:769
-msgid "Required Participant"
-msgstr "Απαραίτητος Συμμετέχων"
-
-#: calendar/gui/e-meeting-model.c:236
-#: calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
-msgid "Optional Participant"
-msgstr "Προαιρετικός Συμμετέχων"
-
-#: calendar/gui/e-meeting-model.c:238
-#: calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
-msgid "Non-Participant"
-msgstr "Μη-Συμμετέχων"
-
-#: calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540
-#: calendar/gui/e-meeting-model.c:797
-msgid "Needs Action"
-msgstr "Απαιτεί Ενέργεια"
-
-#: calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800
-#: calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Δοκιμαστικά"
 
-#: calendar/gui/e-meeting-model.c:292
-#: calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
-msgid "Delegated"
-msgstr "Εξουσιοδοτήθηκε"
-
-#: calendar/gui/e-meeting-model.c:296
-#: calendar/gui/e-meeting-model.c:319
-msgid "In Process"
-msgstr "Σε Εξέλιξη"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131
-#: e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283
-#: e-util/e-time-utils.c:371
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466
-#: e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286
-#: widgets/misc/e-dateedit.c:1582
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:407
-#: designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Εκτός Γραφείου"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Χωρίς Πληροφόρηση"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "_Options"
 msgstr "_Επιλογές"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _Only Working Hours"
 msgstr "Εμφάνιση _μόνο των ωρών Εργασίας"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Εμφάνιση _Σμίκρυνσης"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update Free/Busy"
 msgstr "Ανα_νέωση Διαθεσιμότητας"
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "_Αυτόματη επιλογή"
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
+#: calendar/gui/e-meeting-time-sel.c:541
 msgid "_All People and Resources"
 msgstr "Όλα _τα Άτομα και οι Πόροι"
 
-#: calendar/gui/e-meeting-time-sel.c:563
+#: calendar/gui/e-meeting-time-sel.c:550
 msgid "All _People and One Resource"
 msgstr "Όλα τα Άτομα και Ένας _Πόρος"
 
-#: calendar/gui/e-meeting-time-sel.c:572
+#: calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required People"
 msgstr "_Απαιτούμενα Άτομα"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "Required People and _One Resource"
 msgstr "Απαιτούμενα Άτομα και _Ένας Πόρος"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "Meeting _start time:"
 msgstr "Χρόνος έ_ναρξης συνάντησης:"
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Meeting _end time:"
 msgstr "Χρόνος _περάτωσης συνάντησης:"
 
-#: calendar/gui/e-tasks.c:360
-#: calendar/gui/gnome-cal.c:2006
-#: calendar/gui/gnome-cal.c:2017
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2054
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2087
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Παρευρισκόμενος"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Κάντε κλικ εδώ για να προσθέσετε έναν παρευρισκόμενο"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Κοινό Όνομα"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Εξουσιοδοτημένος Από"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Εξουσιοδότηση Σε"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Γλώσσα"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Μέλος"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
+msgstr "μη-έγκυρη ώρα"
+
+#: calendar/gui/e-tasks.c:221
+#, fuzzy
+msgid "Start Date:"
+msgstr "Ημερομηνία Έ_ναρξης:"
+
+#: calendar/gui/e-tasks.c:237
+#, fuzzy
+msgid "Due Date:"
+msgstr "Ημερομηνία _Λήξης:"
+
+#. write priority
+#: calendar/gui/e-tasks.c:265
+#, fuzzy
+msgid "Priority:"
+msgstr "_Προτεραιότητα"
+
+#. URL
+#: calendar/gui/e-tasks.c:321
+#, fuzzy
+msgid "Web Page:"
+msgstr "Σελίδα"
+
+#: calendar/gui/e-tasks.c:702
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Άνοιγμα ενεργειών στο %s"
 
-#: calendar/gui/e-tasks.c:389
-#: calendar/gui/tasks-control.c:200
+#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Αδύνατη η φόρτωση ενεργειών στο `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:746
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Η μέθοδος που απαιτείται για την φόρτωση του '%s' δεν υποστηρίζεται"
 
-#: calendar/gui/e-tasks.c:418
-#: calendar/gui/gnome-cal.c:1509
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ανοίξετε τον φάκελο στο`%s'"
 
-#: calendar/gui/e-tasks.c:486
-#: calendar/gui/gnome-cal.c:1728
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6296,68 +6203,112 @@ msgstr ""
 "Σφάλμα στο  %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:899
 msgid "Completing tasks..."
 msgstr "Ολοκλήρωση εργασιών..."
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:922
 msgid "Deleting selected objects..."
 msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1017
 msgid "Expunging"
 msgstr "Εξάλειψη"
 
-#: calendar/gui/e-week-view.c:3581
-msgid "New _Appointment..."
-msgstr "Νέο _Ραντεβού..."
-
-#: calendar/gui/gnome-cal.c:1481
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Αδύνατο το άνοιγμα φακέλου στο `%s'"
 
-#: calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Η μέθοδος που απαιτείται για την άνοιγμα του '%s' δεν υποστηρίζεται"
 
-#: calendar/gui/gnome-cal.c:1556
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Προσθήκη ειδοποιήσεων για %s"
 
-#: calendar/gui/gnome-cal.c:1748
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Το backend ημερολογίου για\n"
+"Το backend εργασίας για\n"
 "%s\n"
-"έχει κολλήσει. Θα πρέπει να επανεκκινήσετε το Evolution για να το χρησιμοποιήσετε ξανά"
+"έχει κολλήσει. Θα πρέπει να επανεκκινήσετε το Evolution για να το "
+"χρησιμοποιήσετε ξανά"
 
-#: calendar/gui/gnome-cal.c:1757
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Το backend εργασίας για\n"
+"Το backend ημερολογίου για\n"
 "%s\n"
-"έχει κολλήσει. Θα πρέπει να επανεκκινήσετε το Evolution για να το χρησιμοποιήσετε ξανά"
+"έχει κολλήσει. Θα πρέπει να επανεκκινήσετε το Evolution για να το "
+"χρησιμοποιήσετε ξανά"
 
-#: calendar/gui/gnome-cal.c:1988
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Άνοιγμα ημερολογίου στο %s"
 
-#: calendar/gui/gnome-cal.c:2028
+#: calendar/gui/gnome-cal.c:2197
 msgid "Opening default tasks folder"
 msgstr "Άνοιγμα φακέλου εξ ορισμού εργασιών"
 
+#: calendar/gui/gnome-cal.c:3094
+#, fuzzy, c-format
+msgid "Purging event %s"
+msgstr "Pinging %s"
+
+#: calendar/gui/gnome-cal.c:3178
+#, fuzzy
+msgid "Purging"
+msgstr "Τουρίν"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Ημερολόγιο και Εργασίες"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Ρυθμίστε εδώ την Ζώνη ώρας, Ημερολόγιο και Λίστα Εργασιών σας."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Ημερολόγιο και Εργασίες του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Στοιχείο ημερολογίου και εργασιών του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Έλεγχος ρυθμίσεων του ημερολογίου του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Εφαρμογή προβολής μυνημάτων ραντεβού του ημερολογίου του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Εφαρμογή προβολής ημερολογίου Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Επεξεργαστής ημερολογίου/εργασιών του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Εφαρμογή προβολής εργασιών του Evolution "
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Απρίλιος"
@@ -6414,8 +6365,7 @@ msgstr "Οκτώβριος"
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: calendar/gui/itip-utils.c:263
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
 #: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "Πρέπει να ορίσετε έναν διοργανωτή."
@@ -6424,23 +6374,19 @@ msgstr "Πρέπει να ορίσετε έναν διοργανωτή."
 msgid "At least one attendee is necessary"
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος"
 
-#: calendar/gui/itip-utils.c:386
-#: calendar/gui/itip-utils.c:495
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Πληροφορίες Γεγονότος"
 
-#: calendar/gui/itip-utils.c:388
-#: calendar/gui/itip-utils.c:497
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Πληροφορίες Εργασιών"
 
-#: calendar/gui/itip-utils.c:390
-#: calendar/gui/itip-utils.c:499
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Πληροφορίες Ημερολογίου"
 
-#: calendar/gui/itip-utils.c:392
-#: calendar/gui/itip-utils.c:517
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:517
 msgid "Free/Busy information"
 msgstr "Πληροφορία Διαθεσιμότητας"
 
@@ -6469,142 +6415,139 @@ msgstr "Πληροφορία Διαθεσιμότητας (%s έως %s)"
 msgid "iCalendar information"
 msgstr "Πληροφορίες iCalendar"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr "Πρέπει να είστε παρευρισκόμενος για αυτό το γεγονός."
 
-#: calendar/gui/print.c:549
+#: calendar/gui/print.c:547
 msgid "Su"
 msgstr "Κυ"
 
-#: calendar/gui/print.c:549
+#: calendar/gui/print.c:547
 msgid "Mo"
 msgstr "Δε"
 
-#: calendar/gui/print.c:549
+#: calendar/gui/print.c:547
 msgid "Tu"
 msgstr "Τρ"
 
-#: calendar/gui/print.c:549
+#: calendar/gui/print.c:547
 msgid "We"
 msgstr "Τε"
 
-#: calendar/gui/print.c:550
+#: calendar/gui/print.c:548
 msgid "Th"
 msgstr "Πε"
 
-#: calendar/gui/print.c:550
+#: calendar/gui/print.c:548
 msgid "Fr"
 msgstr "Πα"
 
-#: calendar/gui/print.c:550
+#: calendar/gui/print.c:548
 msgid "Sa"
 msgstr "Σα"
 
 #. Day
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1882
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Επιλεγμένη ημέρα (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1902
-#: calendar/gui/print.c:1906
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1903
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1907
-#: calendar/gui/print.c:1909
-#: calendar/gui/print.c:1910
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1914
+#: calendar/gui/print.c:1919
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Επιλεγμένη εβδομάδα (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1922
+#: calendar/gui/print.c:1927
 msgid "Selected month (%b %Y)"
 msgstr "Επιλεγμένος μήνας (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1934
 msgid "Selected year (%Y)"
 msgstr "Επιλεγμένο έτος (%Y)"
 
-#: calendar/gui/print.c:2257
+#: calendar/gui/print.c:2262
 msgid "Task"
 msgstr "Εργασία"
 
-#: calendar/gui/print.c:2316
+#: calendar/gui/print.c:2321
 #, c-format
 msgid "Status: %s"
 msgstr "_Κατάσταση: %s"
 
-#: calendar/gui/print.c:2333
+#: calendar/gui/print.c:2338
 #, c-format
 msgid "Priority: %s"
 msgstr "Προτεραιότητα: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "%i Ολοκληρωμένο"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2362
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2371
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Categories: %s"
 msgstr "Κατηγορίες: %s"
 
-#: calendar/gui/print.c:2382
+#: calendar/gui/print.c:2387
 msgid "Contacts: "
 msgstr "Επαφές: "
 
-#: calendar/gui/print.c:2520
-#: calendar/gui/print.c:2606
-#: calendar/gui/tasks-control.c:571
-#: mail/mail-callbacks.c:2947
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Προεπισκόπηση Εκτύπωσης"
 
-#: calendar/gui/print.c:2554
+#: calendar/gui/print.c:2559
 msgid "Print Item"
 msgstr "Εκτύπωση Στοιχείου"
 
-#: calendar/gui/print.c:2627
+#: calendar/gui/print.c:2632
 msgid "Print Setup"
 msgstr "Ρυθμίσεις Εκτύπωσης"
 
-#: calendar/gui/tasks-control.c:151
+#: calendar/gui/tasks-control.c:152
 msgid "The URI of the tasks folder to display"
 msgstr "Το URI του φακέλου ενεργειών προς εμφάνιση"
 
-#: calendar/gui/tasks-control.c:464
+#: calendar/gui/tasks-control.c:448
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Με αυτή την λειτουργία θα διαγράψετε μόνιμα όλες τις εργασίες που έχετε σημειώσει ως ολοκληρωμένες. Αν συνεχίσετε,\n"
+"Με αυτή την λειτουργία θα διαγράψετε μόνιμα όλες τις εργασίες που έχετε "
+"σημειώσει ως ολοκληρωμένες. Αν συνεχίσετε,\n"
 " δεν θα μπορέσετε να τα ανακτήσετε.\n"
 "\n"
 "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: calendar/gui/tasks-control.c:467
+#: calendar/gui/tasks-control.c:451
 msgid "Do not ask me again."
 msgstr "Να μην ξαναγίνει η ερώτηση."
 
-#: calendar/gui/tasks-control.c:600
+#: calendar/gui/tasks-control.c:593
 msgid "Print Tasks"
 msgstr "Εργασίες Εκτύπωσης"
 
@@ -6675,7 +6618,9 @@ msgstr "αναγκαστική αναμονή του χρόνου να είνα�
 
 #: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "αναγκαστικά η παράμετρος χρόνου 1 να είναι στοιχείο ημερομηνία/χρόνος ISO 8601"
+msgstr ""
+"αναγκαστικά η παράμετρος χρόνου 1 να είναι στοιχείο ημερομηνία/χρόνος ISO "
+"8601"
 
 #: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
@@ -6688,7 +6633,8 @@ msgstr "time-add-day αναμένει argument 1 to be a time_t"
 
 #: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
-msgstr "η προσθήκη χρόνου ημέρας αναμένεται να έχει ως παράμετρο 2 έναν ακέραιο"
+msgstr ""
+"η προσθήκη χρόνου ημέρας αναμένεται να έχει ως παράμετρο 2 έναν ακέραιο"
 
 #: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
@@ -6738,16 +6684,24 @@ msgid "contains? expects argument 2 to be a string"
 msgstr "περιέχει? αναμένει ότι η παράμετρος 2 είναι αλφαριθμητικό"
 
 #: calendar/pcs/query.c:734
-msgid "contains? expects argument 1 to be one of \"any\", \"summary\", \"description\""
-msgstr "περιέχει? αναμένει ότι η παράμετρος 1 είναι ένα από \"any\", \"summary\", \"description\""
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+"περιέχει? αναμένει ότι η παράμετρος 1 είναι ένα από \"any\", \"summary\", "
+"\"description\""
 
 #: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "έχει-κατηγορίες? αναμένει τουλάχιστον 1 παράμετρο"
 
 #: calendar/pcs/query.c:788
-msgid "has-categories? expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "έχει-κατηγορίες? αναμένει ότι όλες οι παράμετροι θα είναι αλφαριθμητικά ή μια και μόνο μια παράμετρος θα είναι  boolean false (#f)"
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+"έχει-κατηγορίες? αναμένει ότι όλες οι παράμετροι θα είναι αλφαριθμητικά ή "
+"μια και μόνο μια παράμετρος θα είναι  boolean false (#f)"
 
 #: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
@@ -8298,27 +8252,27 @@ msgstr "Ειρηνικός/Γουάλις"
 msgid "Pacific/Yap"
 msgstr "Ειρηνικός/ Γιάπ"
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:167
 msgid "Signing is not supported by this cipher"
 msgstr "Η υπογραφή δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:207
 msgid "Verifying is not supported by this cipher"
 msgstr "Η επαλήθευση δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:251
 msgid "Encryption is not supported by this cipher"
 msgstr "Η κρυπτογράφηση δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:293
 msgid "Decryption is not supported by this cipher"
 msgstr "Η αποκρυπτογράφηση δεν υποστηρίζεται από αυτό το cipher"
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:331
 msgid "You may not import keys with this cipher"
 msgstr "Δεν μπορεί να εισάγετε κλειδιά αυτό το cipher"
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:363
 msgid "You may not export keys with this cipher"
 msgstr "Δεν μπορεί να εξάγετε κλειδιά αυτό το cipher"
 
@@ -8357,85 +8311,83 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Ξανασυγχρονισμός με τον διακομιστή"
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Προετοιμασία φακέλου  '%s' για εργασία χωρίς σύνδεση"
 
 #: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
-msgstr "Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
+msgstr ""
+"Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
 
-#: camel/camel-filter-driver.c:667
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Δεν ήταν δυνατή η δημιουργία σωλήνωσης σε  '%s': %s"
 
-#: camel/camel-filter-driver.c:715
-#: camel/camel-filter-search.c:551
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
 #: camel/camel-process.c:92
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Δεν ήταν δυνατή η  δημιουργία θυγατρικης διεργασίας  '%s': %s"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Αδυναμία ανάγνωσης χαιρετισμού από %s: %s"
 
-#: camel/camel-filter-driver.c:923
-#: camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 msgid "Syncing folders"
 msgstr "Συγχρονισμός φακέλων"
 
-#: camel/camel-filter-driver.c:1021
-#: camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Σφάλμα στην ανάλυση φίλτρου: %s: %s"
 
-#: camel/camel-filter-driver.c:1030
-#: camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Σφάλμα στην εκτέλεση φίλτρου: %s: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 msgid "Unable to open spool folder"
 msgstr "Αδυναμία ανοίγματος φακέλου spool"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 msgid "Unable to process spool folder"
 msgstr "Αδυναμία ανάλυσης φακέλου spool"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Λήψη μηνύματος %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του μηνύματος"
 
-#: camel/camel-filter-driver.c:1126
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, c-format
 msgid "Failed on message %d"
 msgstr "Αποτυχία στο μήνυμα %d"
 
-#: camel/camel-filter-driver.c:1152
-#: camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 msgid "Syncing folder"
 msgstr "Συγχρονισμός φακέλου"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Λήψη μηνύματος %d από %d"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Αποτυχία στο μήνυμα %d από %d"
@@ -8452,13 +8404,41 @@ msgstr "Μη έγκυρες παράμετροι σε  (system-flag)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Μη έγκυρη παράμετρος σε (user-tag)"
 
-#: camel/camel-filter-search.c:657
-#: camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Σφάλμα στην εκτέλεση αναζήτησης φίλτρου: %s: %s"
 
-#: camel/camel-folder-search.c:346
+#: camel/camel-folder.c:585
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Μη υποστηριζόμενη λειτουργία : προθήκη μηνύματος: για  %s"
+
+#: camel/camel-folder.c:1163
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει έκφρασης: για %s"
+
+#: camel/camel-folder.c:1203
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+"Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει ταυτοτήτων χρήστη: για %s"
+
+#: camel/camel-folder.c:1321
+msgid "Moving messages"
+msgstr "Μετακίνηση μηνυμάτων"
+
+#: camel/camel-folder.c:1321
+msgid "Copying messages"
+msgstr "Αντιγραφή μηνυμάτων"
+
+#: camel/camel-folder.c:1571
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Παραλαμβάνονται %d μήνυμα(τα)"
+
+#: camel/camel-folder-search.c:348
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8467,7 +8447,7 @@ msgstr ""
 "Αδυναμία ανάλυσης έκφρασης αναζήτησης: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:356
+#: camel/camel-folder-search.c:358
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8476,39 +8456,15 @@ msgstr ""
 "Σφάλμα στην εκτέλεση έκφρασης αναζήτησης: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:573
-#: camel/camel-folder-search.c:601
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(ταίρισμα-όλων) απαιτεί ένα single bool result"
 
-#: camel/camel-folder-search.c:653
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Γίνεται επερώτηση σε άγνωστη επικεφαλίδα: %s"
 
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Μη υποστηριζόμενη λειτουργία : προθήκη μηνύματος: για  %s"
-
-#: camel/camel-folder.c:1161
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει έκφρασης: για %s"
-
-#: camel/camel-folder.c:1201
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει ταυτοτήτων χρήστη: για %s"
-
-#: camel/camel-folder.c:1319
-msgid "Moving messages"
-msgstr "Μετακίνηση μηνυμάτων"
-
-#: camel/camel-folder.c:1319
-msgid "Copying messages"
-msgstr "Αντιγραφή μηνυμάτων"
-
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8537,18 +8493,17 @@ msgstr ""
 "Χρειάζεστε μια φράση εισόδου για το ξεκλείδωμα του κλειδιού για\n"
 "χρήστη: \"%s\" "
 
-#: camel/camel-gpg-context.c:821
-#: camel/camel-gpg-context.c:1297
-#: camel/camel-gpg-context.c:1403
-#: camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529
-#: mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
+#: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr "Ακυρώθηκε."
 
 #: camel/camel-gpg-context.c:839
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Αποτυχία ξεκλειδώματος μυστικού κλειδιού: Δόθηκαν 3 εσφαλμένες φράσεις εισόδου."
+msgstr ""
+"Αποτυχία ξεκλειδώματος μυστικού κλειδιού: Δόθηκαν 3 εσφαλμένες φράσεις "
+"εισόδου."
 
 #: camel/camel-gpg-context.c:845
 #, c-format
@@ -8564,7 +8519,7 @@ msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Δεν ήταν δυνατή η κρυπτογράφηση: δεν έχουν οριστεί έγκυροι παραλήπτες"
 
 #: camel/camel-gpg-context.c:1172
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
 "\n"
@@ -8579,52 +8534,27 @@ msgstr ""
 msgid "Failed to GPG %s: %s\n"
 msgstr "Αποτυχία GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1288
-#: camel/camel-gpg-context.c:1573
+#: camel/camel-gpg-context.c:1288 camel/camel-gpg-context.c:1573
 #: camel/camel-gpg-context.c:1624
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Αποτυχία εκτέλεσης gpg: %s"
 
-#: camel/camel-gpg-context.c:1318
-#: camel/camel-gpg-context.c:1395
-#: camel/camel-gpg-context.c:1464
-#: camel/camel-gpg-context.c:1494
-#: camel/camel-gpg-context.c:1520
-#: camel/camel-gpg-context.c:1550
-#: camel/camel-gpg-context.c:1595
-#: camel/camel-gpg-context.c:1646
+#: camel/camel-gpg-context.c:1318 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1464 camel/camel-gpg-context.c:1494
+#: camel/camel-gpg-context.c:1520 camel/camel-gpg-context.c:1550
+#: camel/camel-gpg-context.c:1595 camel/camel-gpg-context.c:1646
 msgid "Failed to execute gpg."
 msgstr "Αποτυχία εκτέλεσης gpg"
 
 #: camel/camel-gpg-context.c:1380
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: δεν ήταν δυνατή η δημιουργία προσωρινού αρχείου: %s"
-
-#: camel/camel-lock-client.c:111
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Αδύνατη η κατασκευή σωλήνωσης με βοήθημα κλειδωμάτων: %s"
-
-#: camel/camel-lock-client.c:124
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Αδύνατη η δικράνωση βοηθήματος κλειδωμάτων: %s"
-
-#: camel/camel-lock-client.c:202
-#: camel/camel-lock-client.c:225
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Δεν ήταν δυνατό να κλειδωθεί το %s: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
-
-#: camel/camel-lock-client.c:215
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Δεν ήταν δυνατό το κλείδωμα του %s"
+msgstr ""
+"Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: δεν ήταν δυνατή η "
+"δημιουργία προσωρινού αρχείου: %s"
 
-#: camel/camel-lock.c:92
-#: camel/camel-lock.c:113
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Δεν ήταν δυνατή η δημιουργία αρχείου κλειδώματος για %s: %s"
@@ -8632,7 +8562,8 @@ msgstr "Δεν ήταν δυνατή η δημιουργία αρχείου κλ
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
+msgstr ""
+"Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -8644,6 +8575,27 @@ msgstr "Αποτυχία κλειδώματος με χρήση fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Αποτυχία κλειδώματος με χρήση flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Αδύνατη η κατασκευή σωλήνωσης με βοήθημα κλειδωμάτων: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Αδύνατη η δικράνωση βοηθήματος κλειδωμάτων: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+"Δεν ήταν δυνατό να κλειδωθεί το %s: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Δεν ήταν δυνατό το κλείδωμα του %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8693,14 +8645,12 @@ msgstr "Σφάλμα κατά την ανάγνωση του αρχείου μη
 msgid "Error writing mail temp file: %s"
 msgstr "Σφάλμα κατά την εγγραφή του μηνύματος στο πρόχειρο αρχείο: %s"
 
-#: camel/camel-movemail.c:465
-#: camel/camel-movemail.c:532
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Σφάλμα κατά την αντιγραφή του μηνύματος στο πρόχειρο αρχείο: %s"
 
-#: camel/camel-multipart-encrypted.c:259
-#: camel/camel-multipart-encrypted.c:274
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Αποτυχία αποκρυπτογράφησης τμήματος MIME: σφάλμα πρωτοκόλλου"
 
@@ -8712,18 +8662,20 @@ msgstr "Αποτυχία αποκρυπτογράφησης τμήματος MIM
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Αποτυχία αποκρυπτογράφησης τμήματος MIME: σφάλμα ανάλυσης"
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr "Αυτό το σημείο του μηνύματος είναι ψηφιακά υπογεγραμμένο"
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 msgid "parse error"
 msgstr "σφάλμα ανάλυσης"
 
 #: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Δεν ήταν δυνατό να φορτωθεί το %s: Το φόρτωμα αρθρωμάτων δεν υποστηρίζεται σ' αυτό το σύστημα."
+msgstr ""
+"Δεν ήταν δυνατό να φορτωθεί το %s: Το φόρτωμα αρθρωμάτων δεν υποστηρίζεται "
+"σ' αυτό το σύστημα."
 
 #: camel/camel-provider.c:141
 #, c-format
@@ -8733,7 +8685,9 @@ msgstr "Δεν ήταν δυνατό να φορτωθεί το %s: %s"
 #: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "Δεν ήταν δυνατό να φορτωθεί το %s: Δεν βρέθηκε κώδικας αρχικοποίησης στο άρθρωμα."
+msgstr ""
+"Δεν ήταν δυνατό να φορτωθεί το %s: Δεν βρέθηκε κώδικας αρχικοποίησης στο "
+"άρθρωμα."
 
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
@@ -8743,8 +8697,7 @@ msgstr "Ανώνυμη"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ανώνυμη προσπέλαση"
 
-#: camel/camel-sasl-anonymous.c:110
-#: camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Η πιστοποίηση απέτυχε."
 
@@ -8780,16 +8733,24 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:37
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ασφαλή CRAM-MD5 κωδικό, αν το υποστηρίζει ο διακομιστής."
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ασφαλή CRAM-MD5 κωδικό, "
+"αν το υποστηρίζει ο διακομιστής."
 
-#: camel/camel-sasl-digest-md5.c:46
+#: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:48
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ασφαλή DIGEST-MD5 κωδικό, αν το υποστηρίζει ο διακομιστής."
+#: camel/camel-sasl-digest-md5.c:50
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με ασφαλή DIGEST-MD5 κωδικό, "
+"αν το υποστηρίζει ο διακομιστής."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -8801,7 +8762,8 @@ msgstr "Μη έγκυρο challenge διακομιστή\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Το challenge διακομιστή περιέχει μη έγκυρο κουπόνι \"Ποιότητας Προστασίας\"\n"
+msgstr ""
+"Το challenge διακομιστή περιέχει μη έγκυρο κουπόνι \"Ποιότητας Προστασίας\"\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -8809,7 +8771,8 @@ msgstr "Στην απάντηση του διακομιστή δεν υπάρχ�
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr "Στην απάντηση του διακομιστή δεν υπάρχουν όλα τα δεδομένα εξουσιοδότησης\n"
+msgstr ""
+"Στην απάντηση του διακομιστή δεν υπάρχουν όλα τα δεδομένα εξουσιοδότησης\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -8822,10 +8785,14 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:50
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με την πιστοποίηση Kerberos 4."
+msgstr ""
+"Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με την πιστοποίηση Kerberos "
+"4."
 
 #: camel/camel-sasl-gssapi.c:148
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:153
@@ -8833,19 +8800,27 @@ msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:156
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:160
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:165
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:169
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
@@ -8864,12 +8839,10 @@ msgstr ""
 msgid "The referenced credentials have expired."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:189
-#: camel/camel-sasl-gssapi.c:238
-#: camel/camel-sasl-gssapi.c:274
-#: camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1207
 msgid "Bad authentication response from server."
 msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστή"
 
@@ -8889,7 +8862,9 @@ msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με την πιστοποίηση Kerberos 4."
+msgstr ""
+"Με την επιλογή αυτή θα συνδεθεί στον διακομιστή με την πιστοποίηση Kerberos "
+"4."
 
 #: camel/camel-sasl-kerberos4.c:162
 #, c-format
@@ -8904,10 +8879,10 @@ msgstr ""
 msgid "Login"
 msgstr "Είσοδος"
 
-#: camel/camel-sasl-login.c:34
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr "Με την επιλογή αυτή θα γίνει σύνδεση στον διακομιστή με χρήση ενός κωδικού."
+msgstr ""
+"Με την επιλογή αυτή θα γίνει σύνδεση στον διακομιστή με χρήση ενός κωδικού."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -8918,30 +8893,36 @@ msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 #: camel/camel-sasl-ntlm.c:33
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "Με την επιλογή αυτή θα συνδεθεί σε έναν Windows-based με την χρήση NTLM / Secure Password Authentication."
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Με την επιλογή αυτή θα συνδεθεί σε έναν Windows-based με την χρήση NTLM / "
+"Secure Password Authentication."
 
 #: camel/camel-sasl-plain.c:32
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr "ΡΟΡ πριν από SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Με την επιλογή αυτή θα γίνει πρώτα η εξουσιοδότηση ΡΟΡ πριν από την προσπάθεια SMTP"
+msgstr ""
+"Με την επιλογή αυτή θα γίνει πρώτα η εξουσιοδότηση ΡΟΡ πριν από την "
+"προσπάθεια SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
 msgstr "Πηγή POP URI"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "ΡΟΡ πριν από SMTP εξουσιοδότηση με άγνωστη μεταφορά"
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "ΡΟΡ Πριν από SMTP εξουσιοδότηση με χρήση μη-pop πηγής"
 
@@ -8950,56 +8931,55 @@ msgstr "ΡΟΡ Πριν από SMTP εξουσιοδότηση με χρήση �
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Αποτυχία σύνταξης κανονικής έκφρασης: %s: %s"
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "Η ηλεκτρονική διεύθυνση '%s'χρειάζεται ένα συστατικό ονόματος χρήστη"
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:285
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' χρειάζεται ένα στοιχείο συστήματος"
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:293
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "Η ηλεκτρονική διεύθυνση '%s' χρειάζεται ένα συστατικό θέσης"
 
-#: camel/camel-service.c:748
+#: camel/camel-service.c:738
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ανάλυση: %s"
 
-#: camel/camel-service.c:781
-#: camel/camel-service.c:909
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Αποτυχία στην αναζήτηση ονόματος: %s"
 
-#: camel/camel-service.c:802
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:816
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: %s: εξυπηρετητής δεν βρέθηκε"
 
-#: camel/camel-service.c:819
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: %s: άγνωστος λόγος"
 
-#: camel/camel-service.c:874
+#: camel/camel-service.c:860
 msgid "Resolving address"
 msgstr "Ανάλυση διεύθυνσης"
 
-#: camel/camel-service.c:943
+#: camel/camel-service.c:929
 msgid "Host lookup failed: host not found"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: εξυπηρετητής δεν βρέθηκε"
 
-#: camel/camel-service.c:946
+#: camel/camel-service.c:932
 msgid "Host lookup failed: unknown reason"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: άγνωστος λόγος"
 
@@ -9011,13 +8991,12 @@ msgstr "Παροχέας ταχυδρομείου για τον Εικονικό
 msgid "For reading mail as a query of another set of folders"
 msgstr "Για την ανάγνωση μηνυμάτων ως ερώτηση για κάποιους άλλους φακέλους"
 
-#: camel/camel-session.c:355
-#: camel/camel-session.c:405
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Δεν υπάρχει διαθέσιμος παροχέας για το πρωτόκολλο `%s'"
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9045,10 +9024,8 @@ msgstr "Η υπογραφή πιστοποίησης για το \"%s\" δεν �
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Το πιστοποιητικό κρυπτογράφησης για το \"%s\" δεν υπάρχει."
 
-#: camel/camel-smime-context.c:417
-#: camel/camel-smime-context.c:428
-#: camel/camel-smime-context.c:534
-#: camel/camel-smime-context.c:544
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "Αποτυχία κατά την αναζήτηση του πιστοποιητικού \"%s\"."
@@ -9065,132 +9042,133 @@ msgstr "Αποτυχία κατά την αποκωδικοποίηση του �
 msgid "Failed to verify certificates."
 msgstr "Αποτυχία κατά την επαλήθευση των πιστοποιητικών."
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:212
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
+msgstr ""
+"Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
+msgstr ""
+"Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Αποτυχία κατά την λήψη πιστοποιητικού εκδότη"
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr "Αδυναμία λήψης Λίστας Ανάκτησης Πιστοποιητικών"
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr "Αδυναμία αποκρυπτογράφησης υπογραφής πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "Αδυναμία αποκρυπτογράφησης υπογραφής Λίστας Ανάκτησης Πιστοποιητικών"
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr "Αδυναμία αποκωδικοποίησης δημοσίου κλειδιού εκδότη"
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
 msgstr "Αποτυχία υπογραφής πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr "Αποτυχία υπογραφής  Λίστας Ανάκτησης Πιστοποιητικών"
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr "Το πιστοποιητικό δεν είναι ακόμα έγκυρο"
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr "Το πιστοποιητικό έχει λήξει"
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr "Η CRL δεν είναι ακόμα έγκυρη"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr "Η CRL έχει λήξει"
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr "Σφάλμα στο  CRL"
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr "Ανεπάρκεια μνήμης"
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr "Αυτο-υπογεγραμμένο , μηδενικού βάθους πιστοποιητικό "
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr "Αυτο-υπογεγραμμένο πιστοποιητικό στην αλυσίδα"
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr "Αδυναμία λήψης πιστοποιητικού εκδότη τοπικά"
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr "Αδυναμία επαλήθευσης υπογραφής leaf"
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr "Αλυσίδα πιστοποιητικού πολύ μακριά"
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr "Το πιστοποιητικό ανακλήθηκε"
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Μή έγκυρη Αρχή Πιστοποίησης (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr "Υπέρβαση μήκους διαδρομής"
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr "Μη έγκυρος σκοπός"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr "Μη έμπιστο πιστοποιητικό"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr "Απόρριψη πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr "Αναντιστοιχία Εκδότη/Θέματος"
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr "Αναντιστοιχία AKID/SKID"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr "Αναντιστοιχία  σειριακού AKID/εκδότη"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr "Η χρήση κλειδιού δεν υποστηρίζει υπογραφή πιστοποιητικού"
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr "Σφάλμα στην επαλήθευση εφαρμογής"
 
-#: camel/camel-tcp-stream-openssl.c:699
-#: camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9203,17 +9181,15 @@ msgstr ""
 "Αποτύπωμα:       %s\n"
 "Υπογραφή:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:705
-#: camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr "ΚΑΛΟ"
 
-#: camel/camel-tcp-stream-openssl.c:705
-#: camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr "ΚΑΚΟ"
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9233,7 +9209,7 @@ msgstr ""
 "Θέλετε να το δεχτείτε ούτως ή άλλως;"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9248,7 +9224,7 @@ msgstr ""
 "\n"
 "Θέλετε να το αποδεχθείτε;"
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9257,7 +9233,7 @@ msgstr ""
 "Πρόβλημα Πιστοποιητικού: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9266,7 +9242,7 @@ msgstr ""
 "Εσφαλμένος τομέας πιστοποιητικού: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9275,7 +9251,7 @@ msgstr ""
 "Το πιστοποιητικό έχει λήξει: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9284,24 +9260,22 @@ msgstr ""
 "Η λίστα ανάκτησης πιστοποιητικών έχει λήξει: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-url.c:290
-#: mail/mail-tools.c:143
+#: camel/camel-url.c:290 mail/mail-tools.c:143
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Αδυναμία ανάλυσης URL `%s'"
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Σφάλμα αποθήκευσης `%s': %s"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Κανένα τέτοιο μήνυμα %s στο %s"
 
-#: camel/camel-vee-folder.c:819
-#: camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Αδυναμία αντιγραφής ή μετακίνησης μηνυμάτων σε ένα εικονικό φάκελο"
 
@@ -9323,17 +9297,18 @@ msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλ
 #: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Δεν υπάρχει τέτοιος φάκελος"
+msgstr ""
+"Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Δεν υπάρχει τέτοιος φάκελος"
 
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2806
 msgid "Operation cancelled"
 msgstr "Η λειτουργία ακυρώθηκε"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2809
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Απροσδόκητη αποσύνδεση του διακομιστή: %s"
@@ -9372,38 +9347,38 @@ msgstr "Η απάντηση του διακομιστή ΙΜΑΡ δεν περι
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Απροσδόκητη απάντηση ΟΚ από τον διακομιστή IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Δεν ήταν δυνατή η φόρτωση της περίληψης του  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr "Ο φάκελος καταστράφηκε και ξαναδημιουργήθηκε στον διακομιστή."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr "Γίνεται σάρωση για αλλαγμένα μηνύματα"
 
-#: camel/providers/imap/camel-imap-folder.c:1883
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Αδυναμία ανάκτησης μηνύματος: %s "
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9412,24 +9387,24 @@ msgstr ""
 "Δεν μπορεί να γίνει η λήψη του μηνύματος: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Δεν υπάρχει τέτοιο μήνυμα"
 
-#: camel/providers/imap/camel-imap-folder.c:1943
-#: camel/providers/imap/camel-imap-folder.c:2539
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr "Το μήνυμα δεν είναι διαθέσιμο αύτη την στιγμή"
 
-#: camel/providers/imap/camel-imap-folder.c:2203
-#: camel/providers/imap/camel-imap-folder.c:2273
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr "Λήψη πληροφορίες περίληψης για νέα μηνύματα"
 
-#: camel/providers/imap/camel-imap-folder.c:2577
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr "Αδυναμία εύρεσης σώματος μηνύματος στην απάντηση FETCH."
 
@@ -9459,8 +9434,7 @@ msgstr "Έλεγχος για νέα μηνύματα"
 msgid "Check for new messages in all folders"
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους"
 
-#: camel/providers/imap/camel-imap-provider.c:48
-#: shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
 msgid "Folders"
 msgstr "Φάκελοι"
 
@@ -9478,88 +9452,108 @@ msgstr "Namespace"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Εφαρμογή φίλτρων στα νέα μηνύματα στα ΕΙΣΕΡΧΟΜΕΝΑ σ' αυτόν τον διακομιστή"
+msgstr ""
+"Εφαρμογή φίλτρων στα νέα μηνύματα στα ΕΙΣΕΡΧΟΜΕΝΑ σ' αυτόν τον διακομιστή"
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "_Αυτόματος έλεγχος για νέα μηνύματα"
+
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Για ανάγνωση και αποθήκευση μηνυμάτων σε διακομιστές IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:71
-#: mail/mail-config.glade.h:83
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Με την επιλογή αύτη θα γίνει σύνδεση στον διακομιστή IMAP με χρήση κωδικού απλού κειμένου."
+msgstr ""
+"Με την επιλογή αύτη θα γίνει σύνδεση στον διακομιστή IMAP με χρήση κωδικού "
+"απλού κειμένου."
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP server %s"
 msgstr "Διακομιστής IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Υπηρεσία IMAP για %s στο %s"
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/imap/camel-imap-store.c:589
+#: camel/providers/imap/camel-imap-store.c:821
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Η σύνδεση ακυρώθηκε"
 
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση στο %s (θύρα %d) : %s"
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
-#, fuzzy
+#: camel/providers/imap/camel-imap-store.c:655
+#: camel/providers/imap/camel-imap-store.c:686
+#, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "Η επέκταση SSL/TLS  δεν υποστηρίζεται"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:687
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "Αποτυχία διαπραγματεύσεων SSL"
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:824
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Δεν ήταν δυνατή η σύνδεση στο %s (θύρα %d) : %s"
+
+#: camel/providers/imap/camel-imap-store.c:1237
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
+msgstr ""
+"Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Μη υποστηριζόμενος τύπος πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sΠαρακαλώ εισάγετε τον κωδικό IMAP για %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr "Δεν έχετε εισάγει κωδικό πρόσβασης."
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9570,41 +9564,72 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1660
+#: camel/providers/imap/camel-imap-store.c:1802
 #, c-format
 msgid "No such folder %s"
 msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2003
 #, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr "Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον χαρακτήρα \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+"Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον "
+"χαρακτήρα \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2015
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Άγνωστος μητρικός φάκελος: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2051
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ο μητρικός φάκελος δεν επιτρέπεται να περιέχει υποφάκελους"
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Αποθήκη μηνυμάτων"
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s "
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "Αποστολή μηνύματος σε επαφή"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:379
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:383
+#: camel/providers/local/camel-local-folder.c:386
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:390
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9626,8 +9651,12 @@ msgid "Local delivery"
 msgstr "Τοπική παράδοση"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
-msgstr "Για την ανάκτηση (μετακίνηση) τοπικής αλληλογραφίας από μορφοποιημένα mbox spools σε φακέλους του Evolution."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
+msgstr ""
+"Για την ανάκτηση (μετακίνηση) τοπικής αλληλογραφίας από μορφοποιημένα mbox "
+"spools σε φακέλους του Evolution."
 
 #: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
@@ -9656,56 +9685,61 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 "Για ανάγνωση και αποθήκευση τοπικής αλληλογραφίας σε αρχεία mbox spool.\n"
-"Μπορεί ακόμα να χρησιμοποιηθούν για την ανάγνωση δέντρου φακέλων στυλ Elm, Pine, ή Mutt."
+"Μπορεί ακόμα να χρησιμοποιηθούν για την ανάγνωση δέντρου φακέλων στυλ Elm, "
+"Pine, ή Mutt."
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Η αποθήκη του root %s δεν είναι απόλυτη θέση"
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Η αποθήκη του root %s δεν είναι κανονικός κατάλογος"
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Οι τοπικές αποθήκες δεν έχουν εισερχόμενα"
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Τοπικό αρχείο μηνυμάτων %s"
 
-#: camel/providers/local/camel-local-store.c:308
-#: mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s στο %s: %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Δεν ήταν δυνατή η διαγραφή του αρχείου περίληψης του φακέλου `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
-msgstr "Δεν ήταν δυνατή η διαγραφή του αρχείου περιεχομένων του φακέλου `%s': %s"
+msgstr ""
+"Δεν ήταν δυνατή η διαγραφή του αρχείου περιεχομένων του φακέλου `%s': %s"
 
 #: camel/providers/local/camel-local-summary.c:398
 #, c-format
@@ -9716,17 +9750,17 @@ msgstr "Δεν ήταν δυνατή η αποθήκευση της περίλη
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Δεν ήταν δυνατή η προσθήκη του μηνύματος στην περίληψη : άγνωστη αιτία"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
 msgstr "Ακυρώθηκε η προθήκη μηνύματος Maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον φάκελο maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr "Μη έγκυρα περιεχόμενα στο μήνυμα"
 
@@ -9742,7 +9776,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9805,29 +9839,29 @@ msgstr "Έλεγχος για νέα μηνύματα"
 msgid "Storing folder"
 msgstr "Φάκελος αποθήκευσης"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Δεν ήταν δυνατό το κλείδωμα του φακέλου στο %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:289
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Δεν είναι δυνατό το άνοιγμα του mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:349
 msgid "Mail append cancelled"
 msgstr "Ακύρωση πρόσθεσης μηνυμάτων"
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:352
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Δεν είναι δυνατή η προσθήκη του μηνύματος στο αρχείο mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9836,15 +9870,15 @@ msgstr ""
 "Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Ο φάκελος φαίνεται να έχει ανεπανόρθωτη ζημιά."
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Αποτυχία δημιουργίας μηνύματος: Κατεστραμμένο  mailbox;"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9853,7 +9887,16 @@ msgstr ""
 "Δεν ήταν δυνατό το άνοιγμα του αρχείου`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr ""
+"Δεν ήταν δυνατή η δημιουργία του καταλόγου %s:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9862,14 +9905,15 @@ msgstr ""
 "Δεν ήταν δυνατή η δημιουργία του αρχείου`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' δεν είναι κανονικό αρχείο."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9878,11 +9922,36 @@ msgstr ""
 "Δεν ήταν δυνατή η διαγραφή του φακέλου `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ο φάκελος `%s' δεν είναι άδειος. Δεν έγινε η διαγραφή."
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Δεν ήταν δυνατή η δημιουργία φακέλου με αυτό το όνομα"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s στο %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:427
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "Το συγκεκριμένο όνομα φακέλου δεν είναι έγκυρο: %s"
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9891,7 +9960,8 @@ msgstr "Δεν ήταν δυνατό το άνοιγμα του φακέλου:
 #: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Μοιραίο σφάλμα ανάλυσης αλληλογραφίας κοντά στην τοποθεσία %ld στον φάκελο %s"
+msgstr ""
+"Μοιραίο σφάλμα ανάλυσης αλληλογραφίας κοντά στην τοποθεσία %ld στον φάκελο %s"
 
 #: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
@@ -9912,7 +9982,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Δεν είναι δυνατό το άνοιγμα του προσωρινού mailbox: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Δεν ήταν δυνατό το κλείσιμο του φακέλου πηγής %s: %s"
@@ -9929,38 +9999,38 @@ msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλ
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ασυμφωνία περίληψης και φακέλου, ακόμα και μετά από συγχρονισμό"
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Άγνωστο σφάλμα: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Αδυναμία αποθήκευσης φακέλου : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Σφάλμα κατά την εγγραφή του προσωρινού mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Η εγγραφή του προσωρινού mailbox απέτυχε: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
 msgstr "Η προσθήκη μηνύματος ΜΗ ακυρώθηκε"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον mh φάκελο: %s: %s"
@@ -10005,7 +10075,7 @@ msgid "Spool mail file %s"
 msgstr "Αρχειο αλληλογραφίας spool %s"
 
 #: camel/providers/local/camel-spool-store.c:209
-#, fuzzy
+#, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Δέντρο φακέλου spool %s"
 
@@ -10040,64 +10110,131 @@ msgstr ""
 "Αδυναμία συγχρονισμού φακέλου spool %s: %s\n"
 "Ο φάκελος μπορεί να είναι κατεστραμμένος, αποθηκεύθηκε αντίγραφο στο  `%s'"
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, fuzzy, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "%sΠαρακαλώ εισάγετε τον κωδικό πρόσβασης SMTP για %s@%s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+#, fuzzy
+msgid "Failed to send username to server"
+msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Αδυναμία λήψης  μηνύματος %s: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Ακυρώθηκε από τον χρήστη"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "Αδυναμία λήψης ομάδας: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, fuzzy, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+"Δεν είναι δυνατή η δημιουργία του αρχείου εξόδου: %s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+"Δεν είναι δυνατή η δημιουργία του αρχείου εξόδου: %s\n"
+" %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Ειδήσεις USENET"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Αυτός είναι ένας παροχέας για την ανάγνωση και δημοσίευση μηνυμάτων σε ομάδες ειδήσεων USENET"
+msgstr ""
+"Αυτός είναι ένας παροχέας για την ανάγνωση και δημοσίευση μηνυμάτων σε "
+"ομάδες ειδήσεων USENET"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Αδυναμία ανάγνωσης χαιρετισμού από %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Ο διακομιστής NNTP %s επέστρεψε κωδικό σφάλματος %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr "Ειδήσεις USENET μέσω %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:269
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "Με την επιλογή αυτή θα γίνει πιστοποίηση με τον διακομιστή NNTP με την χρήση κωδικού πρόσβασης σε μορφή απλού κειμένου."
+#: camel/providers/nntp/camel-nntp-store.c:267
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Με την επιλογή αυτή θα γίνει πιστοποίηση με τον διακομιστή NNTP με την χρήση "
+"κωδικού πρόσβασης σε μορφή απλού κειμένου."
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, c-format
 msgid "No such folder: %s"
 msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Αδυναμία λήψης ομάδας: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Η εντολή NNTP απέτυχε: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Σάρωση για νέα μηνύματα"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Άγνωστη απάντηση διακομιστή: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 msgid "Use cancel"
 msgstr "Χρήση ακύρωσης"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Η λειτουργία απέτυχε: %s"
@@ -10106,15 +10243,8 @@ msgstr "Η λειτουργία απέτυχε: %s"
 msgid "Retrieving POP summary"
 msgstr "Παραλαβή περίληψης ΡΟΡ"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-msgid "User cancelled"
-msgstr "Ακυρώθηκε από τον χρήστη"
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
-#, fuzzy
+#, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Δεν είναι δυνατή η λήψη περίληψης POP:%s"
 
@@ -10122,34 +10252,22 @@ msgstr "Δεν είναι δυνατή η λήψη περίληψης POP:%s"
 msgid "Expunging deleted messages"
 msgstr "Εξάλειψη των διαγραμμένων μηνυμάτων"
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr "Κανένα μήνυμα με uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Παραλαβή μηνύματος ΡΟΡ %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Αδυναμία λήψης  μηνύματος %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 msgid "Unknown reason"
 msgstr "Άγνωστος λόγος"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Αποθήκη μηνυμάτων"
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Αντίγραφο στον διακομιστή"
@@ -10163,8 +10281,7 @@ msgstr "Διαγραφή μετά από %s ημέρα(ες)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-#: mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:82
 msgid "POP"
 msgstr "POP"
 
@@ -10173,12 +10290,23 @@ msgid "For connecting to and downloading mail from POP servers."
 msgstr "Για την σύνδεση και λήψη μηνυμάτων από διακομιστές POP."
 
 #: camel/providers/pop3/camel-pop3-provider.c:73
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "Με την επιλογή αύτη θα γίνει σύνδεση στον διακομιστή ΡΟΡ με την χρήση κωδικού πρόσβασης σε μορφή απλού κειμένου. Είναι η επιλογή που υποστηρίζουν οι πιο πολλοί διακομιστές POP."
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"Με την επιλογή αύτη θα γίνει σύνδεση στον διακομιστή ΡΟΡ με την χρήση "
+"κωδικού πρόσβασης σε μορφή απλού κειμένου. Είναι η επιλογή που υποστηρίζουν "
+"οι πιο πολλοί διακομιστές POP."
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
-msgstr "Με την επιλογή αυτή θα γίνει σύνδεση στον διακομιστή ΡΟΡ με την χρήση κρυπτογραφημένου κωδικού πρόσβασης. Αυτό μπορεί να μην λειτουργεί για όλους του χρήστες, ακόμα και αν οι διακομιστές υποστηρίζουν το αντίθετο."
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"Με την επιλογή αυτή θα γίνει σύνδεση στον διακομιστή ΡΟΡ με την χρήση "
+"κρυπτογραφημένου κωδικού πρόσβασης. Αυτό μπορεί να μην λειτουργεί για όλους "
+"του χρήστες, ακόμα και αν οι διακομιστές υποστηρίζουν το αντίθετο."
 
 #: camel/providers/pop3/camel-pop3-store.c:187
 #, c-format
@@ -10190,7 +10318,8 @@ msgstr "Δεν ήταν δυνατή η σύνδεση στον διακομισ
 #: camel/providers/pop3/camel-pop3-store.c:260
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s σε ασφαλή λειτουργία: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s σε ασφαλή λειτουργία: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
@@ -10200,7 +10329,9 @@ msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομ�
 #: camel/providers/pop3/camel-pop3-store.c:399
 #: camel/providers/pop3/camel-pop3-store.c:509
 #, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s .\n"
 "Δεν υποστηρίζεται ο μηχανισμός πιστοποίησης."
@@ -10246,8 +10377,12 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
-msgstr "Για την παράδοση μηνυμάτων με την προώθηση στο πρόγραμμα \"sendmail\" στο τοπικό σύστημα."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"Για την παράδοση μηνυμάτων με την προώθηση στο πρόγραμμα \"sendmail\" στο "
+"τοπικό σύστημα."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -10256,7 +10391,9 @@ msgstr "Αδυναμία ανάλυσης λίστας παραληπτών"
 #: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Δεν ήταν δυνατή η δημιουργία σωλήνωσης προς το sendmail: %s: το μήνυμα δεν στάλθηκε"
+msgstr ""
+"Δεν ήταν δυνατή η δημιουργία σωλήνωσης προς το sendmail: %s: το μήνυμα δεν "
+"στάλθηκε"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
@@ -10281,7 +10418,8 @@ msgstr "Δεν είναι δυνατό να εκτελεστεί το %s: το �
 #: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "το πρόγραμμα sendmail τερματίστηκε σε κατάσταση %d: το μήνυμα δεν στάλθηκε."
+msgstr ""
+"το πρόγραμμα sendmail τερματίστηκε σε κατάσταση %d: το μήνυμα δεν στάλθηκε."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
@@ -10291,149 +10429,157 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Παράδοση μηνυμάτων μέσω του προγράμματος sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37
-#: mail/mail-config.glade.h:99
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Για τη παράδοση μηνυμάτων με την σύνδεση σε απομακρυσμένο mailhub με χρήση SMTP.\n"
+msgstr ""
+"Για τη παράδοση μηνυμάτων με την σύνδεση σε απομακρυσμένο mailhub με χρήση "
+"SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Σφάλμα σύνταξης, δεν αναγνωρίζεται η εντολή"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Σφάλμα σύνταξης σε παραμέτρους"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Η εντολή δεν έχει ενσωματωθεί"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Η παράμετρος της εντολής δεν έχει ενσωματωθεί"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Κατάσταση συστήματος, ή το σύστημα βοήθειας έτοιμο"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Μήνυμα βοήθειας"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Η υπηρεσία είναι έτοιμη"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Η υπηρεσία κλείνει το κανάλι μετάδοσης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Η υπηρεσία δεν υπάρχει τερματίζεται το κανάλι μετάδοσης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Εντάξει η αιτηθείσα ενέργεια ταχυδρομείου, ολοκληρώθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "Όχι τοπικός χρήστης , θα γίνει προώθηση στο <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Η αιτηθείσα ενέργεια ταχυδρομείου δεν εκτελέστηκε: το mailbox δεν είναι διαθέσιμο"
+msgstr ""
+"Η αιτηθείσα ενέργεια ταχυδρομείου δεν εκτελέστηκε: το mailbox δεν είναι "
+"διαθέσιμο"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το mailbox δεν είναι διαθέσιμο"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Η αιτηθείσα ενέργεια εγκαταλείφθηκε: σφάλμα κατά την επεξεργασία"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "Όχι τοπικός χρήστης, παρακαλώ δοκιμάστε <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: ανεπαρκή αποθήκη συστήματος"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Η αιτηθείσα ενέργεια εγκαταλείφθηκε: υπέρβαση του κατανεμημένου χώρου αποθήκευσης"
+msgstr ""
+"Η αιτηθείσα ενέργεια εγκαταλείφθηκε: υπέρβαση του κατανεμημένου χώρου "
+"αποθήκευσης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το όνομα του mailbox δεν επιτρέπεται"
+msgstr ""
+"Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το όνομα του mailbox δεν επιτρέπεται"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Εκκίνηση εισαγωγής μηνυμάτων; τελειώνει με <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Η διεξαγωγή απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Απαιτείται η ανταλλαγή κωδικού πρόσβασης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Ο μηχανισμός πιστοποίησης είναι αδύναμος"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Απαιτείται Κρυπτογράφηση για τον μηχανισμό πιστοποίησης που ζητήθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Προσωρινή αποτυχία πιστοποίησης"
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Απαιτείται πιστοποίηση"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:298
 msgid "Welcome response error"
 msgstr "Σφάλμα απάντησης Welcome"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή SMTP %s  σε ασφαλή λειτουργία: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή SMTP %s  σε ασφαλή λειτουργία: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid "server does not appear to support SSL"
 msgstr "ο διακομιστής δεν φαίνεται να υποστηρίζει SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Αίτηση  STARTTLS εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:372
 msgid "STARTTLS response error"
 msgstr "Σφάλμα απάντησης STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
+msgstr ""
+"Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sΠαρακαλώ εισάγετε τον κωδικό πρόσβασης SMTP για %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10444,88 +10590,92 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "Διακομιστής SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Παράδοση μηνυμάτων μέσω %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
-msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος: η διεύθυνση αποστολέα δεν είναι έγκυρη."
+msgstr ""
+"Δεν είναι δυνατή η αποστολή του μηνύματος: η διεύθυνση αποστολέα δεν είναι "
+"έγκυρη."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
-#: mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr "Γίνεται αποστολή μηνύματος"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
-msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
+msgstr ""
+"Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος: ένας ή περισσότεροι μη έγκυροι παραλήπτες"
+msgstr ""
+"Δεν είναι δυνατή η αποστολή του μηνύματος: ένας ή περισσότεροι μη έγκυροι "
+"παραλήπτες"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr "Χαιρετισμός SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Αίτηση HELO εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 msgid "HELO response error"
 msgstr "Σφάλμα απάντησης HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "Πιστοποίηση SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "Σφάλμα κατά την δημιουργία του αντικειμένου πιστοποίησης SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Αίτηση Πιστοποίησης εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "Η αίτηση Πιστοποίησης απέτυχε."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστής.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Αίτηση MAIL FROM εκτός χρόνου: %s: το μήνυμα δεν στάλθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr "Σφάλμα απάντησης MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Αίτηση RCPT TO εκτός χρόνου: %s:το μήνυμα δεν στάλθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Αίτηση DATA εκτός χρόνου: %s:το μήνυμα δεν στάλθηκε"
@@ -10533,68 +10683,68 @@ msgstr "Αίτηση DATA εκτός χρόνου: %s:το μήνυμα δεν �
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 msgid "DATA response error"
 msgstr "Σφάλμα απάντησης DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "Εκτός χρόνου η αποστολή DATA: τερματισμός μηνύματος:  %s: το μήνυμα δεν στάλθηκε"
+msgstr ""
+"Εκτός χρόνου η αποστολή DATA: τερματισμός μηνύματος:  %s: το μήνυμα δεν "
+"στάλθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 msgid "DATA termination response error"
 msgstr "Εσφαλμένη απάντηση τερματισμού DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Αίτηση RSET εκτός χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "RSET response error"
 msgstr "Σφάλμα απάντησης RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Αίτηση QUIT έκτος χρόνου: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "QUIT response error"
 msgstr "Σφάλμα απάντησης QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370
-#: mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "συννημένο"
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Αφαίρεση επιλεγμένων αντικειμένων από τον κατάλογο συννημένων"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Προσθήκη συννημένου..."
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Επισύναψη αρχείου στο μήνυμα"
 
@@ -10627,84 +10777,11 @@ msgstr "Τύπος MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Πρόταση για αυτόματη προβολή της επισύναψης"
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Κλικ εδώ για το βιβλίου διευθύνσεων"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Απάντηση Σε:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Από:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Θέμα:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Προς:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Εισάγετε τους παραλήπτες του μηνύματος"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Κοινοποίηση:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Κρυφή κοινοποίηση:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
-msgstr "Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος χωρίς αυτές να εμφανιστούν στον κατάλογο παραληπτών του μηνύματος."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Αποστολή σε:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Προορισμός αποστολής"
-
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Επισύναψη αρχείου"
-
-#: composer/e-msg-composer.c:535
+#: composer/e-msg-composer.c:562
 msgid "Could not create a PGP signature context"
 msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων υπογραφής PGP"
 
-#: composer/e-msg-composer.c:814
+#: composer/e-msg-composer.c:841
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10713,30 +10790,30 @@ msgstr ""
 "Σφάλμα κατά την ανάγνωση του αρχείου %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1177
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr "Το αρχείο υπάρχει, να γίνει επικάλυψη;"
 
-#: composer/e-msg-composer.c:1195
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Σφάλμα κατά την αποθήκευση του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1218
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Σφάλμα κατά το φόρτωμα του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Σφάλμα κατά την προσπέλαση του αρχείου: %s"
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Αδύνατη η ανάκτηση του μηνύματος από τον επεξεργαστή"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10745,7 +10822,7 @@ msgstr ""
 "Αδύνατη η αναζήτηση στο αρχείο: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10754,7 +10831,7 @@ msgstr ""
 "Αδυναμία  truncate αρχείου: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1287
+#: composer/e-msg-composer.c:1325
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10763,7 +10840,7 @@ msgstr ""
 "Αδυναμία αντιγραφής περιγραφέα αρχείου: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1296
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10772,15 +10849,16 @@ msgstr ""
 "Σφάλμα κατά την αυτόματη αποθήκευση του μηνύματος: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
-"Το Ximian Evolution βρήκε αρχεία που δεν είχαν αποθηκευτεί από μια προηγούμενη συνεδρία.\n"
+"Το Ximian Evolution βρήκε αρχεία που δεν είχαν αποθηκευτεί από μια "
+"προηγούμενη συνεδρία.\n"
 "Θέλετε να γίνει προσπάθεια ανάκτηση τους;"
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1594
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10791,30 +10869,28 @@ msgstr ""
 "\n"
 "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr "Προειδοποίηση: Τροποποιημένο Μήνυμα"
 
-#: composer/e-msg-composer.c:1593
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Άνοιγμα αρχείου"
 
-#: composer/e-msg-composer.c:2017
+#: composer/e-msg-composer.c:2054
 msgid "Signature:"
 msgstr "Υπογραφή"
 
-#: composer/e-msg-composer.c:2057
-#: mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "Αυτόματη δημιουργία"
 
-#: composer/e-msg-composer.c:2233
-#: composer/e-msg-composer.c:2902
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: composer/e-msg-composer.c:2934
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10822,7 +10898,7 @@ msgstr ""
 "Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
 "Αδύνατη η ενεργοποίηση του συστατικού ελέγχου του επιλογέα διευθύνσεων."
 
-#: composer/e-msg-composer.c:2962
+#: composer/e-msg-composer.c:3030
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10834,7 +10910,7 @@ msgstr ""
 "Βεβαιωθείτε ότι έχετε εγκατεστημένη την σωστή έκδοση\n"
 "gtkhtml και libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3029
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10842,9 +10918,92 @@ msgstr ""
 "Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
 "Αδύνατη η ενεργοποίηση του συστατικού του επεξεργαστή HTML."
 
-#: composer/e-msg-composer.c:4045
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
-msgstr "<b>(Ο επεξεργαστής περιέχει ένα σώμα μηνύματος που δεν είναι κείμενο, στο οποίο δεν είναι δυνατή η επεξεργασία.)<b>"
+#: composer/e-msg-composer.c:4110
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Ο επεξεργαστής περιέχει ένα σώμα μηνύματος που δεν είναι κείμενο, στο "
+"οποίο δεν είναι δυνατή η επεξεργασία.)<b>"
+
+#: composer/e-msg-composer-hdrs.c:290
+#, fuzzy
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+"Πρέπει να ρυθμίσετε έναν λογαριασμό\n"
+"πριν από την συγγραφή μηνύματος"
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Κλικ εδώ για το βιβλίου διευθύνσεων"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Απάντηση Σε:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Από:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Θέμα:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Προς:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Εισάγετε τους παραλήπτες του μηνύματος"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Κοινοποίηση:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Κρυφή κοινοποίηση:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Εισάγετε τις διευθύνσεις όπου θα σταλεί αντίγραφο του μηνύματος χωρίς αυτές "
+"να εμφανιστούν στον κατάλογο παραληπτών του μηνύματος."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Αποστολή σε:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Προορισμός αποστολής"
+
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Επισύναψη αρχείου"
 
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
@@ -10923,7 +11082,8 @@ msgstr "<b>Ξεκινάει:</b> "
 
 #: designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person who sends\n"
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 
@@ -10967,8 +11127,10 @@ msgstr "Αποστέλλονται τα μηνύματα"
 
 #: designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:6
@@ -10997,7 +11159,9 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:12
-msgid "When you receive an email with a read receipt request, what should Evolution do?"
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
 msgstr ""
 
 #: e-util/e-dialog-utils.c:247
@@ -11009,7 +11173,6 @@ msgstr ""
 "Να γίνει επικάλυψη;"
 
 #: e-util/e-dialog-utils.c:249
-#: mail/mail-display.c:200
 msgid "Overwrite file?"
 msgstr "Επικάλυψη αρχείου;"
 
@@ -11019,7 +11182,8 @@ msgstr "Απομνημόνευση του κωδικού πρόσβασης"
 
 #: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
-msgstr "Απομνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
+msgstr ""
+"Απομνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
 
 #: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
@@ -11031,98 +11195,210 @@ msgstr "Κατηγορίες συγχρονισμού:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172
-#: e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177
-#: e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326
-#: e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330
-#: e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335
-#: e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404
-#: widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339
-#: e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1401
-#: widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%I %p"
 
+#: executive-summary/component/component-factory.c:151
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Στοιχείο περίληψης του Evolution."
+
+#: executive-summary/component/e-summary.c:925
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Δεν ήταν δυνατή η μετονομασία του φακέλου :\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:939
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Σφάλμα κατά το φόρτωμα του %s"
+
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:125
+#, fuzzy
+msgid "Select a service"
+msgstr "Επιλέξτε ένα αρχείο"
+
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Αποστολή e-mail"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Change the view to %s"
+msgstr "Ο τύπος της προβολής για εμφάνιση"
+
+#: executive-summary/component/e-summary-url.c:73
+#, fuzzy, c-format
+msgid "Run %s"
+msgstr "URL: %s"
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Κλείσιμο"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Μετακίνηση αυτού του φακέλου σε άλλη θέση"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Ρυθμίζεται ξανά ο /%s"
+
+#: executive-summary/component/e-summary-url.c:553
+#, fuzzy
+msgid "page"
+msgstr "Σελίδα"
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update now"
+msgstr "Ενημέρωση"
+
+#: executive-summary/test-service/rdf-summary.c:795
+#, fuzzy
+msgid "Update every "
+msgstr "Ανα_νέωση Διαθεσιμότητας"
+
 #: filter/filter-datespec.c:65
 #, fuzzy
 msgid "1 second ago"
@@ -11159,7 +11435,7 @@ msgid "1 day ago"
 msgstr "1 ημέρα"
 
 #: filter/filter-datespec.c:68
-#, fuzzy
+#, fuzzy, c-format
 msgid "%d days ago"
 msgstr "%d πριν"
 
@@ -11179,7 +11455,7 @@ msgid "1 month ago"
 msgstr "μήνας"
 
 #: filter/filter-datespec.c:70
-#, fuzzy
+#, fuzzy, c-format
 msgid "%d months ago"
 msgstr "%d πριν"
 
@@ -11189,7 +11465,7 @@ msgid "1 year ago"
 msgstr "1 έτος πριν"
 
 #: filter/filter-datespec.c:71
-#, fuzzy
+#, fuzzy, c-format
 msgid "%d years ago"
 msgstr "%d πριν"
 
@@ -11201,8 +11477,7 @@ msgstr "Πρέπει να επιλέξετε μια ημερομηνία."
 msgid "<click here to select a date>"
 msgstr "<κάντε κλικ εδώ για να επιλέξετε ημερομηνία>"
 
-#: filter/filter-datespec.c:278
-#: filter/filter-datespec.c:289
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "τώρα"
 
@@ -11215,8 +11490,7 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Επιλέξτε μια ώρα για να συγκρίνετε"
 
-#: filter/filter-editor.c:114
-#: filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Κανόνες Φίλτρων"
 
@@ -11242,103 +11516,11 @@ msgstr "Τότε"
 msgid "You must specify a folder."
 msgstr "Πρέπει να καθορίσετε ένα κατάλογο."
 
-#: filter/filter-folder.c:243
-#: filter/vfolder-rule.c:438
-#: mail/mail-account-gui.c:1510
-#: mail/mail-account-gui.c:1524
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:438
+#: mail/mail-account-gui.c:1510 mail/mail-account-gui.c:1524
 msgid "Select Folder"
 msgstr "Επιλογή Φακέλου"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Σφάλμα στην κανονική έκφραση '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121
-#: filter/libfilter-i18n.h:26
-#: mail/mail-config.c:65
-#: mail/mail-config.glade.h:62
-#: shell/e-config-upgrade.c:1404
-msgid "Important"
-msgstr "Σημαντικό"
-
-#. red
-#: filter/filter-label.c:122
-#: mail/mail-config.c:66
-#: mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1405
-msgid "Work"
-msgstr "Εργασία"
-
-#. orange
-#: filter/filter-label.c:123
-#: mail/mail-config.c:67
-#: mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1406
-msgid "Personal"
-msgstr "Προσωπικό"
-
-#. forest green
-#: filter/filter-label.c:124
-#: mail/mail-config.c:68
-#: mail/mail-config.glade.h:120
-#: shell/e-config-upgrade.c:1407
-msgid "To Do"
-msgstr "Πρός Τακτοποίηση"
-
-#. blue
-#: filter/filter-label.c:125
-#: mail/mail-config.c:69
-#: mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1408
-msgid "Later"
-msgstr "Αργότερα"
-
-#: filter/filter-part.c:531
-#: shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Δοκιμή"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Πρέπει να δώσετε όνομα σ' αυτό το φίλτρο."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "'Όνομα κανόνα: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Χωρίς τίτλο"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Αν"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Εκτέλεση ενεργειών"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "αν ικανοποιηθούν όλα τα κριτήρια"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "αν ικανοποιηθούν κάποια από τα κριτήρια"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "εισερχόμενα"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "εξερχόμενα"
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Σύγκριση με"
@@ -11383,8 +11565,7 @@ msgstr ""
 "Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
 "την τρέχουσα ώρα  όταν λειτουργεί το φίλτρο."
 
-#: filter/filter.glade.h:13
-#: filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Εικονικοί Φάκελοι"
 
@@ -11400,8 +11581,7 @@ msgstr "πριν"
 msgid "months"
 msgstr "μήνες"
 
-#: filter/filter.glade.h:21
-#: mail/mail-config.glade.h:174
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:174
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
@@ -11441,6 +11621,84 @@ msgstr "με όλους τους τοπικούς φακέλους"
 msgid "years"
 msgstr "χρόνια"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Σφάλμα στην κανονική έκφραση '%s':\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+msgid "Important"
+msgstr "Σημαντικό"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Εργασία"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Προσωπικό"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+msgid "To Do"
+msgstr "Πρός Τακτοποίηση"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1458
+msgid "Later"
+msgstr "Αργότερα"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Δοκιμή"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Πρέπει να δώσετε όνομα σ' αυτό το φίλτρο."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "'Όνομα κανόνα: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Χωρίς τίτλο"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Αν"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Εκτέλεση ενεργειών"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "αν ικανοποιηθούν όλα τα κριτήρια"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "αν ικανοποιηθούν κάποια από τα κριτήρια"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "εισερχόμενα"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "εξερχόμενα"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11463,226 +11721,217 @@ msgid "Beep"
 msgstr "Ήχος"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "περιέχει"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Αντιγραφή σε Φάκελο"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Ημερομηνία παραλαβής"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Ημερομηνία αποστολής"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Διαγραμμένα"
 
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr "Δεν Υπάρχει"
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "δεν περιέχει"
+msgid "Draft"
+msgstr "Πρόχειρα"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "δεν τελειώνει με"
+msgid "Exist"
+msgstr "Υπάρχει"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "δεν υπάρχει"
+msgid "Expression"
+msgstr "Έκφραση"
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "δεν επιστρέφει"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "δεν φαίνεται να είναι"
+msgid "Follow Up"
+msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "δεν ξεκινά με"
+msgid "Label"
+msgstr "Ετικέτα"
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Δεν Υπάρχει"
+msgid "Mailing list"
+msgstr "Λίστα Ταχυδρομείου"
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Πρόχειρα"
+msgid "Message Body"
+msgstr "Σώμα Μηνύματος"
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "τελείωνε με"
+msgid "Message Header"
+msgstr "Επικεφαλίδα Μηνύματος"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Υπάρχει"
+msgid "Move to Folder"
+msgstr "Μετακίνηση σε Φάκελο"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "υπάρχει"
+msgid "Pipe Message to Shell Command"
+msgstr "Σωλήνωση μηνύματος στην εντολή κελύφους"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Έκφραση"
+msgid "Play Sound"
+msgstr "Εκτέλεση Ήχου"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Αναγνωσμένα"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Παραλήπτες"
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "είναι"
+msgid "Regex Match"
+msgstr "Ταίριασμα κανον. έκφρ."
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "ήταν μετά"
+msgid "Replied to"
+msgstr "Απαντημένα στους"
 
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "ήταν πριν"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Σκορ"
 
 #: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "έχει σημαία"
+msgid "Sender"
+msgstr "Αποστολέας"
 
 #: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "είναι μεγαλύτερο από"
+msgid "Set Status"
+msgstr "Ορισμός Κατάστασης"
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "είναι μικρότερο από"
+msgid "Shell Command"
+msgstr "Εντολή κελύφους"
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "δεν είναι"
+msgid "Size (kB)"
+msgstr "Μέγεθος (kB)"
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "δεν έχει σημαία"
+msgid "Source Account"
+msgstr "Πηγαίος Λογαριασμός"
 
 #: filter/libfilter-i18n.h:35
-#: mail/folder-browser.c:1800
-msgid "Label"
-msgstr "Ετικέτα"
-
-#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr "Λίστα Ταχυδρομείου"
+msgid "Specific header"
+msgstr "Ακριβής επικεφαλίδα"
 
 #: filter/libfilter-i18n.h:37
-msgid "Message Body"
-msgstr "Σώμα Μηνύματος"
+msgid "Stop Processing"
+msgstr "Τερματισμός Επεξεργασίας"
 
-#: filter/libfilter-i18n.h:38
-msgid "Message Header"
-msgstr "Επικεφαλίδα Μηνύματος"
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Θέμα"
 
 #: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
-msgstr "Μετακίνηση σε Φάκελο"
+msgid "Unset Status"
+msgstr "Ορισμός Κατάστασης"
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
-msgstr "Σωλήνωση μηνύματος στην εντολή κελύφους"
+msgid "contains"
+msgstr "περιέχει"
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
-msgstr "Εκτέλεση Ήχου"
+msgid "does not contain"
+msgstr "δεν περιέχει"
 
 #: filter/libfilter-i18n.h:42
-#: mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Αναγνωσμένα"
+msgid "does not end with"
+msgstr "δεν τελειώνει με"
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
-msgstr "Παραλήπτες"
+msgid "does not exist"
+msgstr "δεν υπάρχει"
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
-msgstr "Ταίριασμα κανον. έκφρ."
+msgid "does not return"
+msgstr "δεν επιστρέφει"
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
-msgstr "Απαντημένα στους"
+msgid "does not sound like"
+msgstr "δεν φαίνεται να είναι"
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
-msgstr "επιστρέφει"
+msgid "does not start with"
+msgstr "δεν ξεκινά με"
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
-msgstr "επιστρέφει μεγαλύτερο από"
+msgid "ends with"
+msgstr "τελείωνε με"
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
-msgstr "επιστρέφει λιγότερο από"
+msgid "exists"
+msgstr "υπάρχει"
 
 #: filter/libfilter-i18n.h:49
-#: filter/score-rule.c:184
-#: filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Σκορ"
+msgid "is Flagged"
+msgstr "έχει σημαία"
 
 #: filter/libfilter-i18n.h:50
-#: mail/mail-callbacks.c:1820
-msgid "Sender"
-msgstr "Αποστολέας"
+msgid "is after"
+msgstr "ήταν μετά"
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
-msgstr "Ορισμός Κατάστασης"
+msgid "is before"
+msgstr "ήταν πριν"
 
 #: filter/libfilter-i18n.h:52
-msgid "Shell Command"
-msgstr "Εντολή κελύφους"
+msgid "is greater than"
+msgstr "είναι μεγαλύτερο από"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "Μέγεθος (kB)"
+msgid "is less than"
+msgstr "είναι μικρότερο από"
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "φαίνεται να είναι"
+msgid "is not Flagged"
+msgstr "δεν έχει σημαία"
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
-msgstr "Πηγαίος Λογαριασμός"
+msgid "is not"
+msgstr "δεν είναι"
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
-msgstr "Ακριβής επικεφαλίδα"
+msgid "is"
+msgstr "είναι"
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "ξεκινά με"
+msgid "returns greater than"
+msgstr "επιστρέφει μεγαλύτερο από"
+
+#: filter/libfilter-i18n.h:58
+msgid "returns less than"
+msgstr "επιστρέφει λιγότερο από"
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
-msgstr "Τερματισμός Επεξεργασίας"
+msgid "returns"
+msgstr "επιστρέφει"
 
 #: filter/libfilter-i18n.h:60
-#: mail/mail-format.c:934
-#: mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Θέμα"
+msgid "sounds like"
+msgstr "φαίνεται να είναι"
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
-msgstr "Ορισμός Κατάστασης"
+msgid "starts with"
+msgstr "ξεκινά με"
 
-#: filter/rule-context.c:664
-#: filter/rule-editor.c:241
-#: filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:916
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Το όνομα κανόνα '%s' δεν είναι μοναδικό, επιλέξτε ένα άλλο."
@@ -11719,63 +11968,44 @@ msgstr "Πρέπει να δηλώσετε τουλάχιστον έναν φά�
 msgid "VFolder source"
 msgstr "Πηγή εΦακέλων"
 
-#: importers/elm-importer.c:95
-#: mail/importers/elm-importer.c:105
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution εισάγει τα παλαιά σας Elm μηνύματα"
 
-#: importers/elm-importer.c:96
-#: importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
-#: mail/importers/elm-importer.c:106
-#: mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr "Γίνεται εισαγωγή..."
 
-#: importers/elm-importer.c:98
-#: importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
-#: mail/importers/elm-importer.c:108
-#: mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "Παρακαλώ περιμένετε"
 
-#: importers/elm-importer.c:169
-#: importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
-#: mail/importers/elm-importer.c:157
-#: mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Εισάγεται %s ως %s"
 
-#: importers/elm-importer.c:375
-#: importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
-#: mail/importers/elm-importer.c:392
-#: mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr "Γίνεται σάρωση του %s"
 
-#: importers/elm-importer.c:525
-#: importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637
-#: mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360
-#: mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Μηνύματα"
 
-#: importers/elm-importer.c:545
-#: mail/importers/elm-importer.c:547
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11783,8 +12013,7 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Elm\n"
 "Θέλετε να γίνει εισαγωγή στο Evolution;"
 
-#: importers/elm-importer.c:574
-#: mail/importers/elm-importer.c:568
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11796,14 +12025,12 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Elm\n"
 "Θέλετε να εισαχθούν στο Evolution;"
 
-#: importers/netscape-importer.c:70
-#: mail/importers/netscape-importer.c:75
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Φίλτρο προτεραιότητας \"%s\""
 
-#: importers/netscape-importer.c:653
-#: mail/importers/netscape-importer.c:663
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11823,13 +12050,14 @@ msgstr ""
 "έως 3 που μπορούν αν ανατεθούν σε email και να φιλτραριστούν\n"
 "αντίστοιχα.\n"
 "\n"
-"Σαν λύση έχει προστεθεί μια ομάδα φίλτρων που ονομάζεται \"Φίλτρο Προτεραιότητας\"\n"
+"Σαν λύση έχει προστεθεί μια ομάδα φίλτρων που ονομάζεται \"Φίλτρο "
+"Προτεραιότητας\"\n"
 "για να μετατρέπει τις προτεραιότητες του Netscape σε σκορ του Evolution\n"
-"ώστε τα φίλτρα να χρησιμοποιούν σκορ αντί για προτεραιότητες. Ελέγξτε τα εισηγμένα\n"
+"ώστε τα φίλτρα να χρησιμοποιούν σκορ αντί για προτεραιότητες. Ελέγξτε τα "
+"εισηγμένα\n"
 "φίλτρα για να δείτε αν όλα λειτουργούν όπως πρέπει."
 
-#: importers/netscape-importer.c:677
-#: mail/importers/netscape-importer.c:687
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11841,8 +12069,7 @@ msgstr ""
 "τα οποία δεν υποστηρίζονται από το Evolution.\n"
 "Αυτά τα φίλτρα δεν θα χρησιμοποιηθούν."
 
-#: importers/netscape-importer.c:694
-#: mail/importers/netscape-importer.c:704
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11851,49 +12078,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
-#: mail/importers/netscape-importer.c:1237
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Το Evolution εισάγει τα παλαιά σας δεδομένα Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872
-#: mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092
-#: shell/e-local-storage.c:184
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Απορρίμματα"
 
-#: importers/netscape-importer.c:2028
-#: mail/importers/netscape-importer.c:1995
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Ανάγνωση νέων μηνυμάτων"
 
-#: importers/netscape-importer.c:2038
-#: importers/pine-importer.c:570
-#: mail/importers/netscape-importer.c:2006
-#: mail/importers/pine-importer.c:520
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Σαρώνεται ο κατάλογος"
 
-#: importers/netscape-importer.c:2047
-#: mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:541
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:556
 msgid "Starting import"
 msgstr "Εκκίνηση εισαγωγής"
 
-#: importers/netscape-importer.c:2133
-#: mail/importers/netscape-importer.c:2090
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: importers/netscape-importer.c:2138
-#: mail/importers/netscape-importer.c:2095
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "Φίλτρα μηνυμάτων"
 
-#: importers/netscape-importer.c:2161
-#: mail/importers/netscape-importer.c:2119
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11901,13 +12118,11 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Netscape\n"
 "Θέλετε να εισαχθούν στο Evolution;"
 
-#: importers/pine-importer.c:100
-#: mail/importers/pine-importer.c:114
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Το Evolution εισάγει τα παλαιά σας δεδομένα Pine"
 
-#: importers/pine-importer.c:663
-#: mail/importers/pine-importer.c:599
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11915,351 +12130,161 @@ msgstr ""
 "Το Evolution βρήκε μηνύματα Pine\n"
 "Θέλετε να εισαχθούν στο Evolution;"
 
-#: importers/pine-importer.c:691
-#: mail/importers/pine-importer.c:618
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Προτιμήσεις Επεξεργαστή"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr "Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της ασφάλειας και της προβολής μηνυμάτων"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Επεξεργαστής Λογαριασμού Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Επεξεργαστής μηνυμάτων του Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Επεξεργαστής μηνυμάτων του Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Επεξεργαστής μηνυμάτων του Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "Διεπαφή ρυθμίσεων Μηνυμάτων"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Συστατικό για την προβολή φακέλου μηνυμάτων του Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Στοιχείο εκτελεστικής σύνοψης μηνυμάτων."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Λογαριασμοί αλληλογραφίας"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "Προτιμήσεις Αλληλογραφίας"
-
-#: mail/component-factory.c:117
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Φάκελος που περιέχει μηνύματα"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Κοινόχρηστη αλληλογραφία"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Κοινόχρηστος φάκελος που περιέχει μηνύματα"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Εικονικά Απορρίμματα"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Εικονικός Φάκελος Απορριμμάτων"
 
-#: mail/component-factory.c:147
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Αυτός ο φάκελος δεν μπορεί να περιέχει μηνύματα."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Properties..."
 msgstr "Ιδιότητες..."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Change this folder's properties"
 msgstr "Αλλαγή των ιδιοτήτων του φακέλου"
 
-#: mail/component-factory.c:819
-msgid "Some of your mail settings seem corrupt, please check that everything is in order."
-msgstr "Μερικές από τις ρυθμίσεις του ταχυδρομείου σας φαίνεται να είναι κατεστραμμένες, παρακαλώ ελέγξτε ότι όλα είναι σωστά."
+#: mail/component-factory.c:826
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+"Μερικές από τις ρυθμίσεις του ταχυδρομείου σας φαίνεται να είναι "
+"κατεστραμμένες, παρακαλώ ελέγξτε ότι όλα είναι σωστά."
 
-#: mail/component-factory.c:1000
+#: mail/component-factory.c:1008
 msgid "You have not set a mail transport method"
 msgstr "Δεν έχετε ορίσει τρόπο μεταφορά των μηνυμάτων"
 
-#: mail/component-factory.c:1023
+#: mail/component-factory.c:1031
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Έχετε μηνύματα που δεν έχουν αποσταλεί, θέλετε να βγείτε οπωσδήποτε? "
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "New Mail Message"
 msgstr "Νέο Μήνυμα Ταχυδρομείου"
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "_Mail Message"
 msgstr "_Αποστολή Μηνύματος"
 
-#: mail/component-factory.c:1064
+#: mail/component-factory.c:1072
 msgid "Compose a new mail message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 msgid "New Message Post"
 msgstr "Αποστολή  νέου μηνύματος"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 msgid "_Post Message"
 msgstr "Α_ποστολή Μηνύματος"
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1081
 msgid "Post a new mail message"
 msgstr "Αποστολή ενός νέου μηνύματος"
 
-#: mail/component-factory.c:1365
+#: mail/component-factory.c:1373
 msgid "Connecting..."
 msgstr "Σύνδεση..."
 
-#: mail/component-factory.c:1376
+#: mail/component-factory.c:1384
 msgid "Cannot register storage with shell"
 msgstr "Δεν είναι δυνατό να γίνει καταχώρηση αποθήκευσης με κέλυφος"
 
-#: mail/folder-browser-ui.c:486
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Ιδιότητες για \"%s\""
-
-#: mail/folder-browser-ui.c:488
-msgid "Properties"
-msgstr "Ιδιότητες"
-
-#: mail/folder-browser.c:327
-#: mail/mail-display.c:394
-#: mail/mail-display.c:942
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
-
-#: mail/folder-browser.c:782
-#, c-format
-msgid "%d new"
-msgstr "%d νέα"
-
-#: mail/folder-browser.c:785
-#: mail/folder-browser.c:793
-#: mail/folder-browser.c:796
-msgid ", "
-msgstr ", "
-
-#: mail/folder-browser.c:787
-#, c-format
-msgid "%d hidden"
-msgstr "%d κρυμμένα"
-
-#: mail/folder-browser.c:789
-#, c-format
-msgid "%d visible"
-msgstr "%d ορατά"
-
-#: mail/folder-browser.c:794
-#, c-format
-msgid "%d selected"
-msgstr "%d επιλεγμένα"
-
-#: mail/folder-browser.c:799
-#, c-format
-msgid "%d unsent"
-msgstr "%d μη απεσταλμένα"
-
-#: mail/folder-browser.c:801
-#, c-format
-msgid "%d sent"
-msgstr "%d απεσταλμένα"
-
-#: mail/folder-browser.c:803
-#, c-format
-msgid "%d total"
-msgstr "%d συνολικά"
-
-#: mail/folder-browser.c:1182
-#, fuzzy
-msgid "Create _Virtual Folder From Search..."
-msgstr "Δημιουργία Ει_κονικού Φακέλου Από το Μήνυμα"
-
-#: mail/folder-browser.c:1736
-msgid "VFolder on _Subject"
-msgstr "ΕΦάκελος στο _Θέμα"
-
-#: mail/folder-browser.c:1737
-msgid "VFolder on Se_nder"
-msgstr "ΕΦάκελος στον _Αποστολέα"
-
-#: mail/folder-browser.c:1738
-msgid "VFolder on _Recipients"
-msgstr "ΕΦάκελος στους _Παραλήπτες"
-
-#: mail/folder-browser.c:1739
-msgid "VFolder on Mailing _List"
-msgstr "ΕΦάκελος στη Λίστα _Ταχυδρομείου"
-
-#: mail/folder-browser.c:1743
-msgid "Filter on Sub_ject"
-msgstr "Φίλτρο στο _Θέμα"
-
-#: mail/folder-browser.c:1744
-msgid "Filter on Sen_der"
-msgstr "Φίλτρο στον Α_ποστολέα"
-
-#: mail/folder-browser.c:1745
-msgid "Filter on Re_cipients"
-msgstr "Φίλτρο στους Παρα_λήπτες"
-
-#: mail/folder-browser.c:1746
-#: mail/folder-browser.c:2070
-msgid "Filter on _Mailing List"
-msgstr "Φίλτρο στη Λίστα _Ταχυδρομείου"
-
-#: mail/folder-browser.c:1764
-msgid "_Edit as New Message..."
-msgstr "_Επεξεργασία ως Νέο Μήνυμα..."
-
-#: mail/folder-browser.c:1766
-msgid "_Print"
-msgstr "_Εκτύπωση"
-
-#: mail/folder-browser.c:1770
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Reply to Sender"
-msgstr "_Απάντηση στον Αποστολέα"
-
-#: mail/folder-browser.c:1771
-#: ui/evolution-mail-message.xml.h:75
-msgid "Reply to _List"
-msgstr "Απάντηση στη _Λίστα"
-
-#: mail/folder-browser.c:1772
-#: ui/evolution-mail-message.xml.h:74
-msgid "Reply to _All"
-msgstr "Απάντηση σε _Όλους"
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Λήψη Πληροφοριών Φακέλου"
 
-#: mail/folder-browser.c:1773
-msgid "_Forward"
-msgstr "_Προώθηση"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Προτιμήσεις Επεξεργαστή"
 
-#: mail/folder-browser.c:1777
-msgid "Follo_w Up..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
+"Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
+"ασφάλειας και της προβολής μηνυμάτων"
 
-#: mail/folder-browser.c:1778
-msgid "Fla_g Completed"
-msgstr "Ση_μαία Ολοκληρώθηκε"
-
-#: mail/folder-browser.c:1779
-msgid "Cl_ear Flag"
-msgstr "Εκκα_θάριση Σημαίας"
-
-#. separator here?
-#: mail/folder-browser.c:1783
-#: ui/evolution-mail-message.xml.h:43
-msgid "Mar_k as Read"
-msgstr "Σήμανση _ως Αναγνωσμένα"
-
-#: mail/folder-browser.c:1784
-msgid "Mark as _Unread"
-msgstr "Σήμανση ως _Μη Αναγνωσμένα"
-
-#: mail/folder-browser.c:1785
-msgid "Mark as _Important"
-msgstr "Σήμανση ως _Σημαντικά"
-
-#: mail/folder-browser.c:1786
-msgid "_Mark as Unimportant"
-msgstr "Σή_μανση ως Μη Σημαντικά"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
 
-#: mail/folder-browser.c:1791
-msgid "U_ndelete"
-msgstr "Α_κύρωση Διαγραφής"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
 
-#: mail/folder-browser.c:1795
-msgid "Mo_ve to Folder..."
-msgstr "Με_τακίνηση στο Φάκελο..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: mail/folder-browser.c:1796
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "_Αντιγραφή στο Φάκελο..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Επεξεργαστής Λογαριασμού Evolution"
 
-#: mail/folder-browser.c:1804
-msgid "Add Sender to Address_book"
-msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
 
-#: mail/folder-browser.c:1808
-msgid "Appl_y Filters"
-msgstr "Εφαρμο_γή Φίλτρων"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
 
-#: mail/folder-browser.c:1812
-msgid "Crea_te Rule From Message"
-msgstr "Δη_μιουργία Κανόνα Από το Μήνυμα"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
 
-#: mail/folder-browser.c:2071
-msgid "VFolder on M_ailing List"
-msgstr "ΕΦάκελος στη Λίστα Τα_χυδρομείου"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Διεπαφή ρυθμίσεων Μηνυμάτων"
 
-#: mail/folder-browser.c:2073
-#, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Φίλτρο στη Λίστα Τα_χυδρομείου (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Συστατικό για την προβολή φακέλου μηνυμάτων του Evolution."
 
-#: mail/folder-browser.c:2074
-#, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "ΕΦάκελος στη Λίστα Τα_χυδρομείου (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Στοιχείο εκτελεστικής σύνοψης μηνυμάτων."
 
-#: mail/folder-browser.h:26
-#: mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Εξ ορισμού"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Λογαριασμοί αλληλογραφίας"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Λήψη Πληροφοριών Φακέλου"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "Προτιμήσεις Αλληλογραφίας"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12336,22 +12361,19 @@ msgstr "Δεν έχετε συμπληρώσει όλα τις απαιτούμ�
 msgid "Evolution Account Editor"
 msgstr "Επεξεργαστής Λογαριασμού Evolution"
 
-#: mail/mail-account-gui.c:752
-#: mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:149
 msgid "_Host:"
 msgstr "_Σύστημα:"
 
-#: mail/mail-account-gui.c:756
-#: mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:123
 msgid "User_name:"
 msgstr "_Όνομα Χρήστη:"
 
-#: mail/mail-account-gui.c:760
-#: mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:156
 msgid "_Path:"
 msgstr "_Θέση:"
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1886
 msgid "You may not create two accounts with the same name."
 msgstr "Δεν επιτρέπεται να δημιουργήσετε δύο λογαριασμούς με το ίδιο όνομα."
 
@@ -12363,20 +12385,14 @@ msgstr "Είστε βέβαιοι για την διαγραφή αυτού το
 msgid "Don't delete"
 msgstr "Να μην διαγραφεί"
 
-#: mail/mail-accounts.c:312
-#: mail/mail-accounts.c:351
-#: mail/mail-accounts.c:391
-#: mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:693
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
 #: mail/mail-composer-prefs.c:717
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: mail/mail-accounts.c:312
-#: mail/mail-accounts.c:351
-#: mail/mail-accounts.c:393
-#: mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:693
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
 #: mail/mail-composer-prefs.c:717
 msgid "Enable"
 msgstr "Ενεργοποίηση"
@@ -12388,20 +12404,16 @@ msgstr "[Εξ ορισμού]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481
-#: mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
 #: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
 #: mail/mail-accounts.c:487
-#: mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Όνομα λογαριασμού:"
 
 #: mail/mail-accounts.c:489
-#: mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
@@ -12444,217 +12456,8 @@ msgstr ""
 "    '%s'\n"
 "Και έχει ανανεωθεί."
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101
-#: widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "Να μην ξαναεμφανιστεί αυτό το μήνυμα"
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Δεν έχετε ρυθμίσει το πρόγραμμα ταχυδρομείου\n"
-"Πρέπει πρώτα να γίνει η ρύθμιση πριν την αποστολή\n"
-"ή συγγραφή μηνυμάτων\n"
-"Θέλετε να κάνετε την ρύθμιση τώρα;"
-
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-"Πρέπει να ρυθμίσετε έναν λογαριασμό\n"
-"πριν από την συγγραφή μηνύματος"
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Πρέπει να ρυθμίσετε μια ταυτότητα\n"
-"πριν από την συγγραφή μηνύματος"
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Πρέπει να ρυθμίσετε την μεταφορά ταχυδρομείου\n"
-"πριν από την συγγραφή μηνύματος"
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-"Θα στείλετε μήνυμα σε μορφή HTML. Παρακαλώ βεβαιωθείτε ότι\n"
-" παρακάτω παραλήπτες επιθυμούν μηνύματα σε μορφή HTML:\n"
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "Να σταλεί οπωσδήποτε;"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Αυτό το μήνυμα δεν έχει θέμα.\n"
-"Να σταλεί;"
-
-#: mail/mail-callbacks.c:314
-msgid "Since the contact list you are sending to is configured to hide the list's addresses, this message will contain only Bcc recipients."
-msgstr "Μιας και η λίστα επαφών που στέλνετε είναι ρυθμισμένη να αποκρύπτει τις διευθύνσεις, αυτό το μήνυμα θα περιέχει μόνο παραλήπτες στην Ιδιαίτερη κοινοποίηση(Bcc)."
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "Αυτό το μήνυμα περιέχει μόνο παραλήπτες στο Ιδιαίτερης κοινοποίησηςBcc)."
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-"Είναι δυνατό να αποκαλύψει ο διακομιστής ταχυδρομείου τους παραλήπτες με την προσθήκη μια εμφανή επικεφαλίδα Προς.\n"
-"Να σταλεί ούτως η άλλως;"
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Πρέπει να ορίσετε παραλήπτες προκειμένου να στείλετε αυτό το μήνυμα."
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Δεν είναι δυνατό το άνοιγμα του προσωρινού φακέλου για αυτόν τον λογαριασμό.\n"
-"Θέλετε να κάνετε χρήση του εξ' ορισμού προσωρινού φακέλου;"
-
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr "ένας άγνωστος αποστολέας"
-
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "Στις %d/%b/%Y, ημέρα %A και ώρα %H:%M, ο/η %%s έγραψε:"
-
-#: mail/mail-callbacks.c:1700
-#: mail/message-browser.c:123
-msgid "Move message(s) to"
-msgstr "Μετακίνηση μηνύματος(ων) στο"
-
-#: mail/mail-callbacks.c:1702
-#: mail/message-browser.c:125
-msgid "Copy message(s) to"
-msgstr "Αντιγραφή μηνύματος(ων) στο"
-
-#: mail/mail-callbacks.c:2344
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "Είστε βέβαιοι ότι θέλετε να επεξεργαστείτε και τα %d μηνύματα;"
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Επιτρέπεται να επεξεργαστείτε μόνο τα\n"
-"μηνύματα στον Πρόχειρο Φάκελο."
-
-#: mail/mail-callbacks.c:2393
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Επιτρέπεται να ξαναστείλετε μόνο τα\n"
-"μηνύματα από τον φάκελο Απεσταλμένα."
-
-#: mail/mail-callbacks.c:2403
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "Είστε βέβαιοι ότι θέλετε να ξαναστείλετε και τα %d μηνύματα;"
-
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr "Δεν Έχει Επιλεγεί Μήνυμα"
-
-#: mail/mail-callbacks.c:2465
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"Αδυναμία αποθήκευσης σε `%s'\n"
-" %s"
-
-#: mail/mail-callbacks.c:2470
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Το %s υπάρχει ήδη.\n"
-"Θέλετε να αντικατασταθεί;"
-
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr "Αποθήκευση Μηνύματος Ως..."
-
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr "Αποθήκευση Μηνυμάτων Ως..."
-
-#: mail/mail-callbacks.c:2686
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"Με αυτή την λειτουργία θα διαγράψετε μόνιμα όλα τα μηνύματα που έχετε σημειώσει ως διαγραμμένα,\n"
-"και δεν θα μπορέσετε να τα ανακτήσετε.\n"
-"\n"
-"Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
-
-#: mail/mail-callbacks.c:2781
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Σφάλμα κατά το φόρτωμα των πληροφοριών:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr "Φίλτρα"
-
-#: mail/mail-callbacks.c:2830
-#, c-format
-msgid "Page %d of %d"
-msgstr "Σελίδα %d από %d"
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr "Εκτύπωση Μηνύματος"
-
-#: mail/mail-callbacks.c:2953
-msgid "Printing of message failed"
-msgstr "Απέτυχε η εκτύπωση του μηνύματος"
-
-#: mail/mail-callbacks.c:3146
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "Είστε βέβαιοι ότι θέλετε να ανοίξετε και τα %d μηνύματα σε άλλα παράθυρα;"
-
-#: mail/mail-composer-prefs.c:226
-#: mail/mail-composer-prefs.c:349
-#: mail/mail-config.c:1370
+#: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
+#: mail/mail-config.c:1376
 msgid "Unnamed"
 msgstr "Χωρίς Τίτλο"
 
@@ -12662,8 +12465,7 @@ msgstr "Χωρίς Τίτλο"
 msgid "You must specify a valid script name."
 msgstr "Θα πρέπει να καθορίσετε ένα έγκυρο όνομα δέσμης ενεργειών."
 
-#: mail/mail-composer-prefs.c:392
-#: mail/mail-composer-prefs.c:454
+#: mail/mail-composer-prefs.c:392 mail/mail-composer-prefs.c:454
 msgid "[script]"
 msgstr "[δέσμη ενεργειών]"
 
@@ -12679,55 +12481,78 @@ msgstr "Προσθήκη δέσμης ενεργειών υπογραφής"
 msgid "Signature(s)"
 msgstr "Υπογραφή"
 
-#: mail/mail-config-druid.c:380
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Γίνεται Έλεγχος Υπηρεσίας"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Σύνδεση στον διακομιστή..."
+
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Ταυτότητα"
 
-#: mail/mail-config-druid.c:382
-msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
-msgstr "Παρακαλώ εισάγετε το όνομά σας και την ηλεκτρονική σας διεύθυνση Τα\"προαιρετικά\" πεδία που εμφανίζονται παρακάτω δεν είναι απαραίτητο να συμπληρωθούν εκτός αν θέλετε να συμπεριλάβετε αυτές τις πληροφορίες όταν στέλνετε μηνύματα."
+#: mail/mail-config-druid.c:369
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Παρακαλώ εισάγετε το όνομά σας και την ηλεκτρονική σας διεύθυνση Τα"
+"\"προαιρετικά\" πεδία που εμφανίζονται παρακάτω δεν είναι απαραίτητο να "
+"συμπληρωθούν εκτός αν θέλετε να συμπεριλάβετε αυτές τις πληροφορίες όταν "
+"στέλνετε μηνύματα."
 
-#: mail/mail-config-druid.c:388
-#: mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "_Λήψη Μηνυμάτων"
 
-#: mail/mail-config-druid.c:390
-msgid "Please enter information about your incoming mail server below. If you are not sure, ask your system administrator or Internet Service Provider."
-msgstr "Παρακαλώ εισάγετε πληροφορίες για τον διακομιστή εισερχομένων μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον παροχέα διαδικτύου"
+#: mail/mail-config-druid.c:377
+msgid ""
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Παρακαλώ εισάγετε πληροφορίες για τον διακομιστή εισερχομένων μηνυμάτων. Αν "
+"δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον παροχέα "
+"διαδικτύου"
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr "Παρακαλώ επιλέξτε ανάμεσα ανάμεσα στις παρακάτω επιλογές"
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Απο_στολή αλληλογραφίας"
 
-#: mail/mail-config-druid.c:402
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
-msgstr "Παρακαλώ εισάγετε τις πληροφορίες σχετικά με τον τρόπο παράδοσης των μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον Παροχέα Διαδικτύου."
+#: mail/mail-config-druid.c:389
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Παρακαλώ εισάγετε τις πληροφορίες σχετικά με τον τρόπο παράδοσης των "
+"μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον "
+"Παροχέα Διαδικτύου."
 
-#: mail/mail-config-druid.c:407
-#: mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Διαχείριση Λογαριασμού"
 
-#: mail/mail-config-druid.c:409
-msgid "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only."
-msgstr "Έχετε σχεδόν τελειώσει με την διαδικασία ρύθμισης του ταχυδρομείου. Η ταυτότητα ο διακομιστής εισερχομένων και εξερχομένων καθώς και οι πληροφορίες μεταφοράς θα ομαδοποιηθούν για να δημιουργήσουν τον λογαριασμό ταχυδρομείου Evolution. Παρακαλώ εισάγετε ένα όνομα στο παρακάτω κενό.Το όνομα είναι μόνο για να προβάλει τον λογαριασμό."
-
-#: mail/mail-config.c:1074
-msgid "Checking Service"
-msgstr "Γίνεται Έλεγχος Υπηρεσίας"
-
-#: mail/mail-config.c:1152
-#: mail/mail-config.c:1156
-msgid "Connecting to server..."
-msgstr "Σύνδεση στον διακομιστή..."
+#: mail/mail-config-druid.c:396
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"Έχετε σχεδόν τελειώσει με την διαδικασία ρύθμισης του ταχυδρομείου. Η "
+"ταυτότητα ο διακομιστής εισερχομένων και εξερχομένων καθώς και οι "
+"πληροφορίες μεταφοράς θα ομαδοποιηθούν για να δημιουργήσουν τον λογαριασμό "
+"ταχυδρομείου Evolution. Παρακαλώ εισάγετε ένα όνομα στο παρακάτω κενό.Το "
+"όνομα είναι μόνο για να προβάλει τον λογαριασμό."
 
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
@@ -12743,7 +12568,9 @@ msgstr "(το SSL δεν υποστηρίζεται σε αυτή την έκδ�
 
 #: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr "Να γίνεται _πάντα κρυπτογράφηση στον εαυτό μου κατά την αποστολή κρυπτογραφημένων μηνυμάτων"
+msgstr ""
+"Να γίνεται _πάντα κρυπτογράφηση στον εαυτό μου κατά την αποστολή "
+"κρυπτογραφημένων μηνυμάτων"
 
 #: mail/mail-config.glade.h:8
 msgid "Account Editor"
@@ -12763,7 +12590,9 @@ msgstr "Προσθήκη νέας υπογραφής..."
 
 #: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "Να γίνεται πάντα κ_ρυπτογράφηση στον εαυτό μου κατά την αποστολή κρυπτογραφημένων μηνυμάτων"
+msgstr ""
+"Να γίνεται πάντα κ_ρυπτογράφηση στον εαυτό μου κατά την αποστολή "
+"κρυπτογραφημένων μηνυμάτων"
 
 #: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
@@ -12779,14 +12608,15 @@ msgstr "Πάντοτε κοι_νοποίηση (Cc) σε:"
 
 #: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Να είναι πάντοτε έμπισ_τα τα κλειδία στην κλειδοθήκη μου κατά την κρυπτογράφηση"
+msgstr ""
+"Να είναι πάντοτε έμπισ_τα τα κλειδία στην κλειδοθήκη μου κατά την "
+"κρυπτογράφηση"
 
 #: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Επισύναψη αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:21
-#: mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Συννημένο"
 
@@ -12851,6 +12681,10 @@ msgstr ""
 msgid "De_fault"
 msgstr "Εξ ορισμού"
 
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Εξ ορισμού"
+
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Εξ ορισμού Συμπεριφορά"
@@ -12873,10 +12707,10 @@ msgstr "Να μην γίνεται παράθεση αρχικού μηνύμα�
 
 #: mail/mail-config.glade.h:46
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "Να μην υπογράφονται αιτήσεις _συναντήσεων (για συμβατότητα με το Outlook)"
+msgstr ""
+"Να μην υπογράφονται αιτήσεις _συναντήσεων (για συμβατότητα με το Outlook)"
 
-#: mail/mail-config.glade.h:47
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Τέλος"
 
@@ -12974,8 +12808,11 @@ msgid "New Mail Notification"
 msgstr "Ειδοποίηση Νέου Μηνύματος"
 
 #: mail/mail-config.glade.h:77
-msgid "Note: you will not be prompted for a password until you connect for the first time"
-msgstr "Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+"Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
 
 #: mail/mail-config.glade.h:78
 msgid "Optional Information"
@@ -12995,7 +12832,9 @@ msgstr "Διαλέξτε χρώμα"
 
 #: mail/mail-config.glade.h:86
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Ερώτηση στην αποστολή μηνυμάτων όπου έχουν οριστεί μόνο παραλήπτες στην κρυφή _κοινοποίηση (Bcc)"
+msgstr ""
+"Ερώτηση στην αποστολή μηνυμάτων όπου έχουν οριστεί μόνο παραλήπτες στην "
+"κρυφή _κοινοποίηση (Bcc)"
 
 #: mail/mail-config.glade.h:87
 msgid "Pretty Good Privacy (PGP/GPG)"
@@ -13116,8 +12955,14 @@ msgstr ""
 "μόνο για την εμφάνιση."
 
 #: mail/mail-config.glade.h:119
-msgid "This page allows you to configure spell checking behavior and language. The list of languages here reflects only the languages for which you have a dictionary installed."
-msgstr "Αυτή η σελίδα σας επιτρέπει να ρυθμίσετε την συμπεριφορά του ορθογραφικού ελέγχου και της γλώσσας. Η λίστα των γλωσσών εδώ αντικατοπτρίζει μόνο τις γλώσσες για τις οποίες έχετε εγκαταστήσει το αντίστοιχο λεξικό."
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Αυτή η σελίδα σας επιτρέπει να ρυθμίσετε την συμπεριφορά του ορθογραφικού "
+"ελέγχου και της γλώσσας. Η λίστα των γλωσσών εδώ αντικατοπτρίζει μόνο τις "
+"γλώσσες για τις οποίες έχετε εγκαταστήσει το αντίστοιχο λεξικό."
 
 #: mail/mail-config.glade.h:121
 msgid ""
@@ -13227,8 +13072,7 @@ msgstr "Αυτός είναι ο _εξ ορισμού λογαριασμός"
 msgid "_Mark messages as read after"
 msgstr "_Σήμανση μηνυμάτων ως αναγνωσμένα μετά από"
 
-#: mail/mail-config.glade.h:154
-#: my-evolution/e-summary-preferences.c:575
+#: mail/mail-config.glade.h:154 my-evolution/e-summary-preferences.c:575
 msgid "_Name:"
 msgstr "_Όνομα:"
 
@@ -13294,217 +13138,25 @@ msgstr "_Χρήση ασφαλούς σύνδεσης (SSL):"
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
-msgid "color"
-msgstr " χρώμα"
-
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "Περιγραφή"
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων υπογραφής S/MIME."
-
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
-msgstr "Αδυναμία δημιουργίας S/MIME certsonly context."
-
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων κρυπτογράφηση S/MIME."
-
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
-msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων φακέλου S/MIME."
-
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων αποκρυπτογράφηση S/MIME."
-
-#: mail/mail-display.c:197
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Το αρχείο `%s' υπάρχει ήδη\n"
-"Να αντικατασταθεί;"
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr "Αποθήκευση επισύναψης..."
-
-#: mail/mail-display.c:409
-#, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "Δεν είναι δυνατή η δημιουργία προσωρινού αρχείου '%s': %s"
-
-#: mail/mail-display.c:457
-msgid "Save Attachment..."
-msgstr "Αποθήκευση συνημμένου..."
-
-#: mail/mail-display.c:458
-msgid "View Inline"
-msgstr "Προβολή μέσα στο μήνυμα"
-
-#: mail/mail-display.c:459
-#, c-format
-msgid "Open in %s..."
-msgstr "Άνοιγμα με %s..."
-
-#: mail/mail-display.c:515
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Προβολή μέσα στο μήνυμα (μέσω %s)"
-
-#: mail/mail-display.c:519
-msgid "Hide"
-msgstr "Απόκρυψη"
-
-#: mail/mail-display.c:539
-msgid "External Viewer"
-msgstr "Εξωτερικό Πρόγραμμα Προβολής"
-
-#: mail/mail-display.c:1368
-msgid "Downloading images"
-msgstr "Μεταφόρτωση εικόνων"
-
-#: mail/mail-display.c:1545
-msgid "Loading message content"
-msgstr "Φόρτωμα περιεχόμενα μηνύματος"
-
-#: mail/mail-display.c:1887
-msgid "Overdue:"
-msgstr "'Εχουν λήξει:"
-
-#: mail/mail-display.c:1891
-msgid "by %B %d, %Y, %l:%M %P"
-msgstr "από %B %d, %Y, %l:%M %P"
-
-#: mail/mail-display.c:2255
-msgid "Open Link in Browser"
-msgstr "Άνοιγμα Συνδέσμου στον Περιηγητή"
-
-#: mail/mail-display.c:2256
-msgid "Copy Link Location"
-msgstr "Αντιγραφή Θέσης Συντόμευσης"
-
-#: mail/mail-display.c:2258
-msgid "Save Link as (FIXME)"
-msgstr "Αποθήκευση δεσμού ως (FIXME)"
-
-#: mail/mail-display.c:2260
-msgid "Save Image as..."
-msgstr "Αποθήκευση εικόνας ως..."
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-format.c:665
-#, c-format
-msgid "%s attachment"
-msgstr " %s επισύναψη"
-
-#: mail/mail-format.c:707
-#: mail/mail-format.c:1370
-#: mail/mail-format.c:1439
-#: mail/mail-format.c:1559
-#: mail/mail-format.c:1683
-#: mail/mail-format.c:1708
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
-
-#: mail/mail-format.c:785
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Ημερομηνία"
-
-#: mail/mail-format.c:871
-msgid "Bad Address"
-msgstr "Εσφαλμένη Διεύθυνση"
-
-#: mail/mail-format.c:912
-#: mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Από"
-
-#: mail/mail-format.c:916
-msgid "Reply-To"
-msgstr "Απάντηση Σε"
-
-#: mail/mail-format.c:921
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Προς"
-
-#: mail/mail-format.c:926
-msgid "Cc"
-msgstr "Αντίγραφο:"
-
-#: mail/mail-format.c:931
-msgid "Bcc"
-msgstr "Ιδιαίτερη Κοινοποίηση"
-
-#: mail/mail-format.c:1482
-msgid "This message is digitally signed. Click the lock icon for more information."
-msgstr "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο. Κάντε κλικ στο εικονίδιο με το λουκέτο για περισσότερες πληροφορίες."
-
-#: mail/mail-format.c:1510
-msgid "Could not create a PGP verfication context"
-msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων επαλήθευσης PGP."
-
-#: mail/mail-format.c:1518
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και βρέθηκε να είναι αυθεντικό."
-
-#: mail/mail-format.c:1525
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και δεν βρέθηκε να είναι αυθεντικό."
-
-#: mail/mail-format.c:1789
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Δείκτης σε σελίδα FTP (%s)"
-
-#: mail/mail-format.c:1800
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στην σελίδα \"%s\""
-
-#: mail/mail-format.c:1803
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Δείκτης σε τοπικό αρχείο (%s)"
-
-#: mail/mail-format.c:1830
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Δείκτης σε απομακρυσμένα δεδομένα (%s)"
-
-#: mail/mail-format.c:1836
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Δείκτης σε άγνωστα εξωτερικά δεδομένα (τύπος \"%s\")"
-
-#: mail/mail-format.c:1838
-msgid "Malformed external-body part."
-msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
-
-#: mail/mail-local.c:541
-#: mail/mail-local.c:543
+#: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Τοπικοί Φάκελοι/%s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:711
 msgid "Reconfiguring folder"
 msgstr "Επαναρύθμιση φακέλου"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:792
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13513,22 +13165,22 @@ msgstr ""
 "Δεν είναι δυνατό να αποθηκευτεί ο φάκελος metainfo, μάλλον θα διαπιστώσετε\n"
 "ότι δεν μπορείτε να ανοίξετε πλέον αυτόν τον φάκελο: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:848
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Δεν είναι δυνατό να αποθηκευτεί ο φάκελος metainfo στο %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:900
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Δεν ήταν δυνατό να διαγραφεί ο φάκελος metadata %s: %s"
 
-#: mail/mail-local.c:1323
+#: mail/mail-local.c:1363
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Γίνεται αλλαγή του φακέλου \"%s\" σε φορμά \"%s\""
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1388
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13536,16 +13188,16 @@ msgstr ""
 "Αν δεν μπορείτε να ανοίξετε πλέον αυτό το maibox, τότε\n"
 "θα πρέπει να το επισκευάστε μόνοι σας."
 
-#: mail/mail-local.c:1448
+#: mail/mail-local.c:1488
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Ρυθμίζεται ξανά ο /%s"
 
-#: mail/mail-local.c:1512
+#: mail/mail-local.c:1552
 msgid "You cannot change the format of a non-local folder."
 msgstr "Δεν μπορείτε να αλλάξετε το φορμά ενός μη-τοπικού φακέλου."
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:259
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13554,7 +13206,7 @@ msgstr ""
 "Σφάλμα κατά '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:262
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13563,122 +13215,131 @@ msgstr ""
 "Σφάλμα κατά την εκτέλεση της λειτουργίας:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:913
 msgid "Working"
 msgstr "Εργάζεται"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:87
 msgid "Filtering Folder"
 msgstr "Φιλτράρισμα Φακέλου"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Λήψη Μηνύματος"
 
-#: mail/mail-ops.c:550
-#: mail/mail-ops.c:579
-msgid "However, the message was successfully sent."
-msgstr "Παρ'όλα αυτά το μήνυμα στάλθηκε με επιτυχία."
+#: mail/mail-ops.c:557
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Δεν ήταν δυνατή η αποθήκευση του προσωρινού αρχείο μηνυμάτων %s: %s"
+
+#: mail/mail-ops.c:578
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: mail/mail-ops.c:587
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Δεν ήταν δυνατή η αποθήκευση του προσωρινού αρχείο μηνυμάτων %s: %s"
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Αποστέλλεται \"%s\""
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Αποστολή μηνύματος %d από %d"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Αποτυχία στο μήνυμα %d από %d"
 
-#: mail/mail-ops.c:750
-#: mail/mail-send-recv.c:581
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr "Ολοκληρώθηκε."
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "Αποθήκευση μηνύματος στον φάκελο"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Αντιγραφή μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Σάρωση φακέλων στο \"%s\""
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr "Προωθημένα μηνύματα"
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr "Άνοιγμα φακέλου %s"
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr "Άνοιγμα αποθήκης %s"
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr "Αφαιρείται ο φακέλος %s"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Αποθηκεύεται ο φακέλος '%s'"
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr "Ανανεώνεται ο φακέλος"
 
-#: mail/mail-ops.c:1594
-#: mail/mail-ops.c:1645
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr "Εξαλείφεται ο φακέλος"
 
-#: mail/mail-ops.c:1642
-#, fuzzy
+#: mail/mail-ops.c:1666
+#, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Εισάγεται ως %s"
 
-#: mail/mail-ops.c:1643
-#: my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Τοπικοί Φάκελοι"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Παραλαμβάνεται το μήνυμα %s"
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Παραλαμβάνονται %d μήνυμα(τα)"
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Αποθήκευση %d μηνυμάτων"
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13687,7 +13348,7 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία του αρχείου εξόδου: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13696,11 +13357,11 @@ msgstr ""
 "Σφάλμα κατά την αποθήκευση μηνυμάτων στο %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Αποθήκευση συννημένου"
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13709,110 +13370,78 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία αρχείου εξόδου: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Αποσύνδεση από το %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Επανασύνδεση στο %s"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Μήνυμα Χωρίς Τίτλο)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Μήνυμα Χωρίς Τίτλο"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Κενό Μήνυμα"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "Εύρεση στο Μήνυμα"
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr "Διάκριση πεζών κεφαλαίων"
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "Αναζήτηση Προωθημένων"
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr "Εύρεση:"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Ταιριάζει με:"
-
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr "Γίνεται Ακύρωση..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Διακομιστής: %s, Είδος: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Θέση: %s, Τύπος: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:259
 #, c-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:308
 msgid "Send & Receive Mail"
 msgstr "Αποστολή & Λήψη Μηνυμάτων"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Ακύρωση Όλων"
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:390
 msgid "Updating..."
 msgstr "Ανανέωση..."
 
-#: mail/mail-send-recv.c:390
-#: mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 msgid "Waiting..."
 msgstr "Αναμονή..."
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:229
 msgid "User canceled operation."
 msgstr "Ο χρήστης ακύρωσε την λειτουργία."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:262
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Εισάγετε κωδικό πρόσβασης για %s"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:264
 msgid "Enter Password"
 msgstr "Εισάγετε κωδικό πρόσβασης"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:287
 msgid "_Remember this password"
 msgstr "_Απομνημόνευση αυτού του κωδικού"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:288
 msgid "_Remember this password for the remainder of this session"
-msgstr "Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
+msgstr ""
+"Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
 
 #: mail/mail-signature-editor.c:80
 #, c-format
@@ -13858,21 +13487,17 @@ msgstr "Προωθημένο μήνυμα - %s"
 msgid "Forwarded message"
 msgstr "Προωθημένο μήνυμα"
 
-#: mail/mail-tools.c:438
-msgid "Forwarded Message"
-msgstr "Προωθημένο Μήνυμα"
-
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ρύθμιση εφακέλου: %s"
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:209
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Αναβάθμιση εφακέλων για το uri: %s"
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:467
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13885,100 +13510,95 @@ msgstr ""
 "    '%s'\n"
 "Και έχει ανανεωθεί."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:776
 msgid "VFolders"
 msgstr "ΕΦάκελοι"
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:834
 msgid "vFolders"
 msgstr "εΦάκελοι"
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:873
 msgid "Edit VFolder"
 msgstr "Επεξεργασία ΕΦακέλου"
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Προσπάθεια επεξεργασίας εφακέλου '%s' που δεν υπάρχει."
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:965
 msgid "New VFolder"
 msgstr "Νέος ΕΦάκελος"
 
-#: mail/message-browser.c:224
-msgid "(No subject)"
-msgstr "(Χωρίς Θέμα)"
-
-#: mail/message-browser.c:226
-#, c-format
-msgid "%s - Message"
-msgstr "%s - Μήνυμα"
-
-#: mail/message-list.c:741
+#: mail/message-list.c:900
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:742
+#: mail/message-list.c:901
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:743
+#: mail/message-list.c:902
 msgid "Answered"
 msgstr "Απαντημένα"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:903
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:745
+#: mail/message-list.c:904
 msgid "Multiple Messages"
 msgstr "Πολλαπλά Μηνύματα"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:908
 msgid "Lowest"
 msgstr "Χαμηλότερα"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:909
 msgid "Lower"
 msgstr "Χαμηλά"
 
-#: mail/message-list.c:754
+#: mail/message-list.c:913
 msgid "Higher"
 msgstr "Υψηλά"
 
-#: mail/message-list.c:755
+#: mail/message-list.c:914
 msgid "Highest"
 msgstr "Υψηλότερα"
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1231
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1238
 msgid "Today %l:%M %p"
 msgstr "Σήμερα %l:%M %p"
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1247
 msgid "Yesterday %l:%M %p"
 msgstr "Χθες %l:%M %p"
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1259
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1267
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1269
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3062
 msgid "Generating message list"
 msgstr "Δημιουργία λίστας μηνυμάτων"
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Ημερομηνία"
+
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Λήξη "
@@ -13995,6 +13615,10 @@ msgstr "Σημειωμένο"
 msgid "Follow Up Flag"
 msgstr ""
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Από"
+
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Αρχική τοποθεσία"
@@ -14007,6 +13631,10 @@ msgstr "Ελήφθη"
 msgid "Size"
 msgstr "Μέγεθος"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Προς"
+
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Κλήση"
@@ -14023,8 +13651,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr "Για πληροφόρηση σας"
 
-#: mail/message-tag-followup.c:66
-#: ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr "Προώθηση"
 
@@ -14032,13 +13659,11 @@ msgstr "Προώθηση"
 msgid "No Response Necessary"
 msgstr "Δεν είναι απαραίτητη απάντηση"
 
-#: mail/message-tag-followup.c:69
-#: ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: mail/message-tag-followup.c:70
-#: ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
 msgid "Reply to All"
 msgstr "Απάντηση σε Όλους"
 
@@ -14046,8 +13671,7 @@ msgstr "Απάντηση σε Όλους"
 msgid "Review"
 msgstr "Επισκόπηση"
 
-#: mail/message-tag-followup.c:281
-#: mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:281 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -14069,40 +13693,6 @@ msgstr "_Λήξη: "
 msgid "_Flag:"
 msgstr "_Σημαία:"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "Σάρωση φακέλων κάτω από %s στο \"%s\""
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "Σάρωση των ριζικών φακέλων στο \"%s\""
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Συνδρομή στον φάκελο \"%s\""
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Κατάργηση συνδρομής στον φάκελο \"%s\""
-
-#: mail/subscribe-dialog.c:1270
-#: mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Φάκελος"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "Δεν έχει επιλεγεί διακομιστής"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Παρακαλώ επιλέξτε διακομιστή."
-
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -14119,18 +13709,126 @@ msgid "S_erver:"
 msgstr "_κάθε"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Scanning folders ..."
-msgstr "Ανάγνωση φακέλων..."
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Συνδρομή"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
 msgstr "_Κατάργηση Συνδρομής"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Φάκελος που περιέχει την περίληψη του Evolution"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %e %B  %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Παρακαλώ περιμένετε..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Εκτύπωση Περίληψης"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Η Εκτύπωση Περίληψης απέτυχε"
+
+#: my-evolution/e-summary-calendar.c:384
+msgid "Appointments"
+msgstr "Ραντεβού"
+
+#: my-evolution/e-summary-calendar.c:392
+#, fuzzy
+msgid "No appointments."
+msgstr "Χωρίς Ραντεβού"
+
+#: my-evolution/e-summary-calendar.c:409
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:411
+#, fuzzy
+msgid "%l:%M%p %d %B"
+msgstr "%l:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:429
+msgid "No description"
+msgstr "Χωρίς περιγραφή"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Σύνοψη μηνυμάτων"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Word of the Day"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Φράσεις Ημέρας"
+
+#: my-evolution/e-summary-preferences.c:565
+#, fuzzy
+msgid "New News Feed"
+msgstr "Τροφοδοσία Ειδήσεων"
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr "_URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Σφάλμα κατά την λήψη του RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Τροφοδοσία Ειδήσεων"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Όλα"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Σουηδία"
+
+#: my-evolution/e-summary-tasks.c:349
+msgid "No tasks"
+msgstr "Δεν υπάρχουν εργασίες"
+
+#: my-evolution/e-summary-tasks.c:387
+#, fuzzy
+msgid "blue"
+msgstr "Μέλος"
+
+#: my-evolution/e-summary-tasks.c:387
+msgid "(No Description)"
+msgstr "(Χωρίς Περιγραφή)"
+
+#: my-evolution/e-summary-weather.c:72
+msgid "My Weather"
+msgstr "Ο Καιρός μου"
+
+#: my-evolution/e-summary-weather.c:261
+msgid "There was an error downloading data for"
+msgstr "Σφάλμα μεταφόρτωσης δεδομένων για"
+
+#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Καιρός"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:582
+msgid "KBOS"
+msgstr "KBOS"
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Ρυθμίστε εδώ την εμφάνιση της περίληψης του Evolution"
@@ -17707,8 +17405,7 @@ msgid "Hagerstown"
 msgstr ""
 
 #. HAIL
-#: my-evolution/Locations.h:885
-#: my-evolution/metar.c:218
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr "Χαλάζι"
 
@@ -24532,117 +24229,6 @@ msgstr ""
 msgid "Zurich"
 msgstr "Ζυρίχη"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Φάκελος που περιέχει την περίληψη του Evolution"
-
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr "Ραντεβού"
-
-#: my-evolution/e-summary-calendar.c:389
-#, fuzzy
-msgid "No appointments."
-msgstr "Χωρίς Ραντεβού"
-
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:408
-#, fuzzy
-msgid "%l:%M%P %d %B"
-msgstr "%l:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr "Χωρίς περιγραφή"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Σύνοψη μηνυμάτων"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Word of the Day"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Φράσεις Ημέρας"
-
-#: my-evolution/e-summary-preferences.c:565
-#, fuzzy
-msgid "New News Feed"
-msgstr "Τροφοδοσία Ειδήσεων"
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "_URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Σφάλμα κατά την λήψη του RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Τροφοδοσία Ειδήσεων"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Όλα"
-
-#: my-evolution/e-summary-shown.c:521
-#: my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "Σουηδία"
-
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr "Δεν υπάρχουν εργασίες"
-
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr "(Χωρίς Περιγραφή)"
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Ο Καιρός μου"
-
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr "Σφάλμα μεταφόρτωσης δεδομένων για"
-
-#: my-evolution/e-summary-weather.c:479
-#: my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Καιρός"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr "KBOS"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %e %B  %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Παρακαλώ περιμένετε..."
-
-#: my-evolution/e-summary.c:622
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Εκτύπωση Περίληψης"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Η Εκτύπωση Περίληψης απέτυχε"
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -24695,9 +24281,7 @@ msgstr "Μερικά σύννεφα"
 msgid "Overcast"
 msgstr "Συννεφιά"
 
-#: my-evolution/metar.c:57
-#: my-evolution/metar.c:75
-#: my-evolution/metar.c:486
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr "Μη έγκυρη"
 
@@ -24802,8 +24386,7 @@ msgstr "Τμήματα με ψιχάλισμα"
 msgid "Partial drizzle"
 msgstr "Μερικό ψιχάλισμα"
 
-#: my-evolution/metar.c:136
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Καταιγίδα"
 
@@ -24905,8 +24488,7 @@ msgstr "Τμήματα με χιόνι"
 msgid "Partial snowfall"
 msgstr "Τμήματα με χιονόπτωση"
 
-#: my-evolution/metar.c:166
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Χιονοθύελλα"
 
@@ -25081,8 +24663,7 @@ msgstr "Παγωμένοι σβώλοι πάγου"
 msgid "Hail in the vicinity"
 msgstr "Τοπικό χαλάζι"
 
-#: my-evolution/metar.c:220
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Ελαφρύ χαλάζι"
 
@@ -25749,8 +25330,7 @@ msgid "Drifting funnel cloud"
 msgstr "Μετακινούμενα στενά σύννεφα"
 
 #. TORNADO
-#: my-evolution/metar.c:443
-#: my-evolution/metar.c:452
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr "Θύελλα"
 
@@ -25913,22 +25493,28 @@ msgstr "_Μία ημέρα"
 msgid "_Show full path for folders"
 msgstr "_Εμφάνιση ολόκληρης θέσης των φακέλων"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
+#: notes/component-factory.c:27
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Νέο"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#: notes/component-factory.c:27
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "Κέλυφος Evolution."
+msgid "Create a new note"
+msgstr "Δημιουργία νέου φακέλου"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
 msgstr ""
+"Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Ρυθμίσεις φακέλων"
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25947,8 +25533,7 @@ msgstr ""
 "Αδύνατη η μεταφορά του φακέλου:\n"
 "%s"
 
-#: shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "\"%s\" σε  \"%s\""
@@ -25961,8 +25546,7 @@ msgstr "Προσθήκη ενός φακέλου"
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: shell/e-local-storage.c:180
-#: shell/e-shell-view.c:481
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
 #: shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Εισερχόμενα"
@@ -26025,6 +25609,49 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Συνεργάστηκαν"
 
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Αδυναμία ενεργοποίησης στοιχείου%s :\n"
+"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Δεν ήταν δυνατή η δημιουργία τοπικής αποθήκευσης -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Το συστατικό του Evolution που διαχειρίζεται του φακέλους τύπου\"%s\"\n"
+"τερματίστηκαν αναπάντεχα. Θα χρειαστεί να τερματίζεται το Evolution και\n"
+"να το ξεκινήσετε πάλι για να έχετε ξανά πρόσβαση στα δεδομένα."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Μη έγκυρη παράμετρος"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Γενικό σφάλμα"
+
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
@@ -26114,26 +25741,31 @@ msgstr ""
 "Δεν ήταν δυνατή η μετονομασία του φακέλου :\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:538
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Μετονομασία φακέλου \"%s\" σε:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:541
 msgid "Rename Folder"
 msgstr "Μετονομασία Φακέλου"
 
-#: shell/e-shell-folder-commands.c:553
+#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Το συγκεκριμένο όνομα φακέλου δεν είναι έγκυρο: %s"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:590
+#: shell/e-shell-folder-commands.c:587
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -26155,8 +25787,7 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Δημιουργία Νέου Φακέλου.."
 
-#: shell/e-shell-folder-title-bar.c:592
-#: shell/e-shell-folder-title-bar.c:593
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Χωρίς Τίτλο)"
 
@@ -26166,21 +25797,31 @@ msgstr "Επιλέξτε τον τύπο του εισαγωγέα που θα �
 
 #: shell/e-shell-importer.c:142
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
-"Επιλέξτε το αρχείο και τον τύπο του αρχείου που θέλετε να εισάγετε στο Evolution, από την λίστα\n"
+"Επιλέξτε το αρχείο και τον τύπο του αρχείου που θέλετε να εισάγετε στο "
+"Evolution, από την λίστα\n"
 "\n"
-"Μπορείτε να επιλέξτε \"Αυτόματη\" αν δεν ξέρετε, και το Evolution θα δοκιμάσει να βρει την λίστα."
+"Μπορείτε να επιλέξτε \"Αυτόματη\" αν δεν ξέρετε, και το Evolution θα "
+"δοκιμάσει να βρει την λίστα."
 
-#: shell/e-shell-importer.c:148
-#: shell/e-shell-startup-wizard.c:709
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
 msgid "Please select the information that you would like to import:"
 msgstr "Παρακαλώ επιλέξτε την πληροφορία που θέλετε να εισάγετε:"
 
-#: shell/e-shell-importer.c:213
-#: shell/e-shell-importer.c:244
+#: shell/e-shell-importer.c:151
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26189,22 +25830,21 @@ msgstr ""
 "Εισάγεται το %s\n"
 "Εισάγεται το στοιχείο%d."
 
-#: shell/e-shell-importer.c:317
+#: shell/e-shell-importer.c:323
 msgid "Select importer"
 msgstr "Επιλογή εισαγωγής"
 
-#: shell/e-shell-importer.c:458
+#: shell/e-shell-importer.c:464
 #, c-format
 msgid "File %s does not exist"
 msgstr "Το αρχείο %s δεν υπάρχει"
 
-#: shell/e-shell-importer.c:459
-#: shell/e-shell-importer.c:476
-#: shell/e-shell-importer.c:518
+#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
+#: shell/e-shell-importer.c:524
 msgid "Evolution Error"
 msgstr "Σφάλμα Evolution"
 
-#: shell/e-shell-importer.c:475
+#: shell/e-shell-importer.c:481
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26213,11 +25853,11 @@ msgstr ""
 "Δεν υπάρχει εισαγωγέας που να μπορεί να χειριστεί το\n"
 "%s"
 
-#: shell/e-shell-importer.c:484
+#: shell/e-shell-importer.c:490
 msgid "Importing"
 msgstr "Εισάγεται"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26226,17 +25866,17 @@ msgstr ""
 "Εισάγεται το %s.\n"
 "Ξεκίνα το %s"
 
-#: shell/e-shell-importer.c:503
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid "Error starting %s"
 msgstr "Σφάλμα κατά την εκκίνηση του %s"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:523
 #, c-format
 msgid "Error loading %s"
 msgstr "Σφάλμα κατά το φόρτωμα του %s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:540
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26245,32 +25885,35 @@ msgstr ""
 "Εισάγεται το %s\n"
 "Εισάγεται το στοιχείο 1."
 
-#: shell/e-shell-importer.c:588
+#: shell/e-shell-importer.c:594
 msgid "Automatic"
 msgstr "Αυτόματη"
 
-#: shell/e-shell-importer.c:637
-msgid "Filename:"
+#: shell/e-shell-importer.c:643
+#, fuzzy
+msgid "_Filename:"
 msgstr "Όνομα Αρχείου:"
 
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr "Επιλέξτε ένα αρχείο"
 
-#: shell/e-shell-importer.c:651
-msgid "File type:"
+#: shell/e-shell-importer.c:658
+#, fuzzy
+msgid "File _type:"
 msgstr "Τύπος αρχείου:"
 
-#: shell/e-shell-importer.c:676
-msgid "Import data and settings from older programs"
+#: shell/e-shell-importer.c:684
+#, fuzzy
+msgid "Import data and settings from _older programs"
 msgstr "Εισαγωγή δεδομένων και ρυθμίσεις από παλαιότερα προγράμματα"
 
-#: shell/e-shell-importer.c:680
-msgid "Import a single file"
+#: shell/e-shell-importer.c:687
+#, fuzzy
+msgid "Import a _single file"
 msgstr "Εισαγωγή μοναδικού αρχείου"
 
-#: shell/e-shell-importer.c:746
-#: shell/e-shell-startup-wizard.c:538
+#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -26278,27 +25921,26 @@ msgstr ""
 "Παρακαλώ περιμένετε...\n"
 "Γίνεται σάρωση για υπάρχουσες εγκαταστάσεις"
 
-#: shell/e-shell-importer.c:749
+#: shell/e-shell-importer.c:758
 msgid "Starting Intelligent Importers"
 msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων"
 
-#: shell/e-shell-importer.c:873
-#: shell/e-shell-startup-wizard.c:664
+#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
 #, c-format
 msgid "From %s:"
 msgstr "Από %s:"
 
-#: shell/e-shell-importer.c:1047
+#: shell/e-shell-importer.c:1061
 msgid "Select folder"
 msgstr "Επιλογή Φακέλου"
 
-#: shell/e-shell-importer.c:1048
+#: shell/e-shell-importer.c:1062
 msgid "Select a destination folder for importing this data"
 msgstr "Επιλέξτε έναν φάκελο προορισμού για την εισαγωγή αυτών των δεδομένων"
 
-#: shell/e-shell-importer.c:1178
-#: shell/importer/intelligent.c:191
-msgid "Import"
+#: shell/e-shell-importer.c:1193
+#, fuzzy
+msgid "_Import"
 msgstr "Εισαγωγή"
 
 #: shell/e-shell-offline-handler.c:592
@@ -26358,11 +26000,19 @@ msgstr "Δεν ήταν δυνατό το άνοιγμα κοινόχρηστο�
 msgid "Cannot find the specified shared folder."
 msgstr "Δεν ήταν δυνατή η εύρεση του συγκεκριμένου κοινόχρηστου φακέλου."
 
-#: shell/e-shell-user-creatable-items-handler.c:586
-#: shell/e-shell-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Νέο"
+#: shell/e-shell-startup-wizard.c:771
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:782
+#, fuzzy
+msgid "Quit Assistant"
+msgstr "Βοηθός"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -26386,9 +26036,42 @@ msgstr "Ο φάκελος δεν είναι δυνατό να περιέχει �
 msgid "'.' and '..' are reserved folder names."
 msgstr "το '.' and '..' είναι κρατημένα ονόματα φακέλων."
 
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Δεν εμφανίζεται φάκελος)"
+
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(Κενό)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για "
+"να αποσυνδεθείτε."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Το Ximian Evolution είναι στην διαδικασία αποσύνδεσης από το δίκτυο."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να "
+"συνδεθείτε."
+
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Τα εργαλεία GNOME Pilot φαίνεται να μην είναι εγκατεστημένα σ' αυτό το σύστημα."
+msgstr ""
+"Τα εργαλεία GNOME Pilot φαίνεται να μην είναι εγκατεστημένα σ' αυτό το "
+"σύστημα."
 
 #: shell/e-shell-view-menu.c:97
 #, c-format
@@ -26427,84 +26110,21 @@ msgstr "Επιλέξτε τον φάκελο που θα συνδεθεί με �
 msgid "_Work Online"
 msgstr "Εργασία εν_τός Δικτύου"
 
-#: shell/e-shell-view-menu.c:782
-#: ui/evolution.xml.h:65
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "Εργασία εκ_τός Δικτύου"
 
-#: shell/e-shell-view-menu.c:795
-#: ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Χρήση Χωρίς Σύνδεση"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Δεν εμφανίζεται φάκελος)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Κενό)"
-
-#: shell/e-shell-view.c:2083
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr "Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για να αποσυνδεθείτε."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Το Ximian Evolution είναι στην διαδικασία αποσύνδεσης από το δίκτυο."
-
-#: shell/e-shell-view.c:2096
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να συνδεθείτε."
-
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Αδυναμία ενεργοποίησης στοιχείου%s :\n"
-"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Δεν ήταν δυνατή η δημιουργία τοπικής αποθήκευσης -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Το συστατικό του Evolution που διαχειρίζεται του φακέλους τύπου\"%s\"\n"
-"τερματίστηκαν αναπάντεχα. Θα χρειαστεί να τερματίζεται το Evolution και\n"
-"να το ξεκινήσετε πάλι για να έχετε ξανά πρόσβαση στα δεδομένα."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Μη έγκυρη παράμετρος"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Σφάλμα κατά την αποθήκευση των συντομεύσεων."
 
-#: shell/e-shell.c:2075
-#: shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Γενικό σφάλμα"
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Συντομεύσεις"
 
 #: shell/e-shortcuts-view.c:80
 #, fuzzy
@@ -26599,8 +26219,7 @@ msgstr "Μετονομασία επιλεγμένης συντόμευσης σ�
 msgid "Open the folder linked to this shortcut"
 msgstr "Άνοιγμα του φακέλου συνδεμένο με αυτή την συντόμευση"
 
-#: shell/e-shortcuts-view.c:424
-#: ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:424 ui/evolution.xml.h:23
 msgid "Open in New _Window"
 msgstr "Άνοιγμα σε Νέο _Παράθυρο"
 
@@ -26624,18 +26243,6 @@ msgstr "_Αφαίρεση"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Αφαίρεση αυτής της συντόμευσης από την γραμμή συντομεύσεων"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Σφάλμα κατά την αποθήκευση των συντομεύσεων."
-
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Συντομεύσεις"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Checkbox"
-
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Χωρίς σφάλμα"
@@ -26674,11 +26281,13 @@ msgstr "Η λειτουργία δεν υποστηρίζεται"
 
 #: shell/e-storage.c:588
 msgid "The specified type is not supported in this storage"
-msgstr "Δεν υπάρχει υποστηρίξει για τον συγκεκριμένο τύπο σε αυτή τη αποθήκευση"
+msgstr ""
+"Δεν υπάρχει υποστηρίξει για τον συγκεκριμένο τύπο σε αυτή τη αποθήκευση"
 
 #: shell/e-storage.c:590
 msgid "The specified folder cannot be modified or removed"
-msgstr "Δεν είναι δυνατό να μετονομαστεί η να μετακινηθεί ο συγκεκριμένος φάκελος "
+msgstr ""
+"Δεν είναι δυνατό να μετονομαστεί η να μετακινηθεί ο συγκεκριμένος φάκελος "
 
 #: shell/e-storage.c:592
 msgid "Cannot make a folder a child of one of its descendants"
@@ -26692,6 +26301,14 @@ msgstr "Δεν ήταν δυνατή η δημιουργία φακέλου με
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Checkbox"
+
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Φάκελος"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -26706,103 +26323,103 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 msgid "<click here to select a folder>"
 msgstr "<κάντε κλικ εδώ για να επιλέξετε φάκελο>"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Άγνωστο Σφάλμα."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Το σφάλμα από το σύστημα συστατικών είναι:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
-"%s"
-
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr "Σφάλμα CORBA"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1189
 msgid "Interrupted"
 msgstr "Έγινε Διακοπή"
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1191
 msgid "Invalid argument"
 msgstr "Μη έγκυρη παράμετρος"
 
-#: shell/evolution-shell-component.c:1190
+#: shell/evolution-shell-component.c:1193
 msgid "Already has an owner"
 msgstr "Έχει ήδη ιδιοκτήτη"
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1195
 msgid "No owner"
 msgstr "Χωρίς ιδιοκτήτη"
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1197
 msgid "Not found"
 msgstr "Δεν βρέθηκε"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1199
 msgid "Unsupported type"
 msgstr "Ο τύπος δεν υποστηρίζεται"
 
-#: shell/evolution-shell-component.c:1198
+#: shell/evolution-shell-component.c:1201
 msgid "Unsupported schema"
 msgstr "Μη υποστηριζόμενο σχήμα"
 
-#: shell/evolution-shell-component.c:1200
+#: shell/evolution-shell-component.c:1203
 msgid "Unsupported operation"
 msgstr "Η λειτουργία δεν υποστηρίζεται"
 
-#: shell/evolution-shell-component.c:1202
+#: shell/evolution-shell-component.c:1205
 msgid "Internal error"
 msgstr "Εσωτερικό σφάλμα"
 
-#: shell/evolution-shell-component.c:1206
+#: shell/evolution-shell-component.c:1209
 msgid "Exists"
 msgstr "Τερματίζει"
 
-#: shell/evolution-shell-component.c:1208
+#: shell/evolution-shell-component.c:1211
 msgid "Invalid URI"
 msgstr "Μη έγκυρο URI"
 
-#: shell/evolution-shell-component.c:1212
+#: shell/evolution-shell-component.c:1215
 msgid "Has subfolders"
 msgstr "Έχει υποφακέλους"
 
-#: shell/evolution-shell-component.c:1214
+#: shell/evolution-shell-component.c:1217
 msgid "No space left"
 msgstr "Δεν έχει μείνει ελεύθερος χώρος"
 
-#: shell/evolution-shell-component.c:1216
+#: shell/evolution-shell-component.c:1219
 msgid "Old owner has died"
 msgstr "Ο παλαιός ιδιοκτήτης έχει πεθάνει"
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Άγνωστο Σφάλμα."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Το σφάλμα από το σύστημα συστατικών είναι:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
+"%s"
+
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Τύπος δοκιμής:"
@@ -26817,7 +26434,9 @@ msgstr "Ενεργές Συνδέσεις"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
-msgstr "Κάντε κλικ στο ΟΚ για να κλείσετε τις συνδέσεις και να δουλέψετε εκτός δικτύου"
+msgstr ""
+"Κάντε κλικ στο ΟΚ για να κλείσετε τις συνδέσεις και να δουλέψετε εκτός "
+"δικτύου"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "The following connections are currently active:"
@@ -26911,9 +26530,28 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Τερματισμός\" για να αποθηκεύσετε τις ρυθμίσεις. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Κέλυφος Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Ρυθμίσεις φακέλων"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Κάντε κλικ στο \"Εισαγωγή\" για να ξεκινήσετε την εισαγωγή του αρχείου στο Evolution. "
+msgstr ""
+"Κάντε κλικ στο \"Εισαγωγή\" για να ξεκινήσετε την εισαγωγή του αρχείου στο "
+"Evolution. "
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -26949,6 +26587,10 @@ msgstr ""
 msgid "Importers"
 msgstr "Εισαγωγείς"
 
+#: shell/importer/intelligent.c:191
+msgid "Import"
+msgstr "Εισαγωγή"
+
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Όχι εισαγωγή"
@@ -26959,10 +26601,10 @@ msgstr "Να μην ξαναγίνει η ερώτηση"
 
 #: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
-msgstr "Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
+msgstr ""
+"Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
 
-#: shell/main.c:112
-#: shell/main.c:574
+#: shell/main.c:112 shell/main.c:574
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -27010,7 +26652,8 @@ msgstr "Δεν ήταν δυνατή η πρόσβαση στο περιβάλλ
 #: shell/main.c:410
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
+msgstr ""
+"Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
 
 #: shell/main.c:542
 msgid "Disable splash screen"
@@ -27030,7 +26673,8 @@ msgstr ""
 
 #: shell/main.c:552
 msgid "Send the debugging output of all components to a file."
-msgstr "Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
+msgstr ""
+"Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
 
 #: shell/main.c:578
 #, c-format
@@ -27096,8 +26740,7 @@ msgstr ""
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Αντιγραφή επαφών σε άλλο φάκελο..."
 
-#: ui/evolution-addressbook.xml.h:4
-#: ui/evolution-calendar.xml.h:2
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Αντιγραφή της επιλογής"
 
@@ -27105,8 +26748,7 @@ msgstr "Αντιγραφή της επιλογής"
 msgid "Copy to Folder..."
 msgstr "Αντιγραφή σε Φάκελο..."
 
-#: ui/evolution-addressbook.xml.h:7
-#: ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Αποκοπή της επιλογής"
 
@@ -27122,8 +26764,7 @@ msgstr "Μετακίνηση επαφών σε άλλο φάκελο..."
 msgid "Move to Folder..."
 msgstr "Μετακίνηση στο Φάκελο..."
 
-#: ui/evolution-addressbook.xml.h:14
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "Επικόλληση του προχείρου"
 
@@ -27131,11 +26772,9 @@ msgstr "Επικόλληση του προχείρου"
 msgid "Previews the contacts to be printed"
 msgstr "Προεπισκόπηση των επαφών προς εκτύπωση"
 
-#: ui/evolution-addressbook.xml.h:17
-#: ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "_Προεπισκόπηση Εκτύπωσης"
 
@@ -27179,24 +26818,21 @@ msgstr "Τερματισμός Φόρτωσης"
 msgid "View the current contact"
 msgstr "Προβολή της τρέχουσας επαφής"
 
-#: ui/evolution-addressbook.xml.h:29
-#: ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11
-#: ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "Ε_νέργειες"
 
-#: ui/evolution-addressbook.xml.h:34
-#: ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "_Αντιγραφή στο Φάκελο..."
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Προώθηση Επαφής..."
 
@@ -27267,48 +26903,61 @@ msgstr "Μετάβαση σε συγκεκριμένη ημερομηνία"
 msgid "Go to today"
 msgstr "Μετάβαση στο σήμερα"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "Μήνας"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr "Προεπισκόπηση του ημερολογίου προς εκτύπωση"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Εκτύπωση αυτού του ημερολογίου"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Δημοσίευση πληροφοριών Διαθεσιμότητας για αυτό το ημερολόγιο"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#, fuzzy
+msgid "Purg_e"
+msgstr "Μπούρζ"
+
+#: ui/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Purge old appointments and meetings"
+msgstr "Δημόσιος φάκελος που περιέχει ραντεβού και γεγονότα"
+
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Show as list"
+msgstr "Εμφάνιση Λεπτομερειών"
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr "Εμφάνιση μίας ημέρας"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr "Εμφάνιση ένας μήνα"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr "Εμφάνιση μίας εβδομάδας"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Εμφάνιση της εργάσιμης εβδομάδας"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr "Εβδομάδα"
 
-#: ui/evolution-comp-editor.xml.h:2
-#: ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Κλείσιμο"
@@ -27317,15 +26966,12 @@ msgstr "Κλείσιμο"
 msgid "Close this item"
 msgstr "Κλείσιμο αυτού του στοιχείου"
 
-#: ui/evolution-comp-editor.xml.h:5
-#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Διαγραφή αυτού του στοιχείου"
 
-#: ui/evolution-comp-editor.xml.h:6
-#: ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:18
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Κεντρική γραμμή εργαλείων"
 
@@ -27333,53 +26979,58 @@ msgstr "Κεντρική γραμμή εργαλείων"
 msgid "Preview the printed item"
 msgstr "Προεπισκόπηση του εκτυπωμένου στοιχείου"
 
-#: ui/evolution-comp-editor.xml.h:10
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Εκτύπωση αυτού του στοιχείου"
 
-#: ui/evolution-comp-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Αποθήκευση"
-
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
-msgstr "Αποθήκευση Ως..."
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Αποθήκευση _Ως..."
 
-#: ui/evolution-comp-editor.xml.h:14
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Αποθήκευση και Κλείσιμο"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save and _Close"
+msgstr "Αποθήκευση και Κλείσιμο"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
 msgstr "Αποθήκευση αυτού του στοιχείου και κλείσιμο της οθόνης διαλόγου"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr "Αποθήκευσης αυτού του στοιχείου στον δίσκο"
 
-#: ui/evolution-comp-editor.xml.h:18
-#: ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12
-#: ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Αρχείο"
 
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Αποθήκευση"
+
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Αντιγραφή επιλεγμένου κειμένου στο πρόχειρο"
 
-#: ui/evolution-composer-entries.xml.h:2
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "_Αποκοπή"
 
@@ -27392,8 +27043,7 @@ msgstr "Αποκοπή επιλεγμένων μηνυμάτων στο πρόχ
 msgid "Paste text from the clipboard"
 msgstr "Επικόλληση κειμένου από το πρόχειρο"
 
-#: ui/evolution-composer-entries.xml.h:5
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
 #: ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Επιλογή _Όλων"
@@ -27402,51 +27052,39 @@ msgstr "Επιλογή _Όλων"
 msgid "Select all text"
 msgstr "Επιλογή όλου του κειμένου"
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr "Εκτύπωση _Φακέλου..."
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Αποθήκευση _Ως..."
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
 msgstr "Αποθήκευση της επαφής και κλείσιμο της οθόνης διαλόγου"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
 msgstr "Αποστολή _Μηνύματος σε Επαφή..."
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Αποθήκευση"
-
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
 msgstr "Διαγραφή αυτής της λίστας"
 
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
-msgstr "Διαγραφή..."
-
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
 msgstr "Αποθήκευση της λίστας και κλείσιμο της οθόνης διαλόγου"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."
 msgstr "Α_ποστολή λίστας σε άλλους..."
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
 msgid "Send _message to list..."
 msgstr "Αποστολή _μηνύματος στη λίστα..."
 
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Διαγραφή..."
+
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Ακύρωση _Συνάντησης"
@@ -27455,13 +27093,11 @@ msgstr "Ακύρωση _Συνάντησης"
 msgid "Cancel the meeting for this item"
 msgstr "Ακύρωση της συνάντησης για αυτό το στοιχείο"
 
-#: ui/evolution-event-editor.xml.h:3
-#: ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Προώθηση ως i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:4
-#: ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Προώθηση αυτού του στοιχείου μέσω email"
 
@@ -27511,7 +27147,9 @@ msgstr "Ξέχασε τους Κ_ωδικούς Πρόσβασης"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Ξέχασε όλους τους κωδικούς πρόσβασης που υπάρχουν στην μνήμη ώστε να ξαναζητηθούν"
+msgstr ""
+"Ξέχασε όλους τους κωδικούς πρόσβασης που υπάρχουν στην μνήμη ώστε να "
+"ξαναζητηθούν"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
@@ -27519,10 +27157,12 @@ msgstr "Άνοιγμα παραθύρου για την σύνθεση νέου
 
 #: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Οριστική διαγραφή όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
+msgstr ""
+"Οριστική διαγραφή όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
 
 #: ui/evolution-mail-global.xml.h:11
-msgid "Post New Message"
+#, fuzzy
+msgid "Post Ne_w Message"
 msgstr "Αποστολή Νέου Μηνύματος"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -27539,7 +27179,8 @@ msgstr "Εμφάνιση οθόνης προεπισκόπησης"
 
 #: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
+msgstr ""
+"Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
 
 #: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
@@ -27557,14 +27198,19 @@ msgstr "_Οθόνη Προεπισκόπησης"
 msgid "Change the properties of this folder"
 msgstr "Αλλαγή των ιδιοτήτων αυτού του φακέλου"
 
-#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Αντιγραφή επιλεγμένων μηνυμάτων στο πρόχειρο"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Αποκοπή επιλεγμένων μηνυμάτων στο πρόχειρο"
 
+#: ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "E_xpunge"
+msgstr "_Εξάλειψη"
+
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Απόκρυψη Επι_λεγμένων Μηνυμάτων"
@@ -27578,24 +27224,29 @@ msgid "Hide _Read Messages"
 msgstr "Απόκρυψη _Αναγνωσμένων Μηνυμάτων"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Απόκρυψη των μηνυμάτων που έχουν διαγραφεί και όχι την εμφάνιση τους με μια γραμμή στην μέση"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Απόκρυψη των μηνυμάτων που έχουν διαγραφεί και όχι την εμφάνιση τους με μια "
+"γραμμή στην μέση"
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as R_ead"
+#, fuzzy
+msgid "Mark All as _Read"
 msgstr "Σήμανση Ό_λων ως Αναγνωσμένα"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Σήμανση όλων των εμφανών μηνυμάτων ως αναγνωσμένα"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
 msgid "Paste message(s) from the clipboard"
 msgstr "Επικόλληση μηνύματος από το πρόχειρο"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Μόνιμη διαγραφή όλων των μηνυμάτων που έχουν διαγραφεί από αυτόν τον φάκελο"
+msgstr ""
+"Μόνιμη διαγραφή όλων των μηνυμάτων που έχουν διαγραφεί από αυτόν τον φάκελο"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
@@ -27633,29 +27284,37 @@ msgstr "Προσωρινή απόκρυψη των επιλεγμένων μην
 msgid "Threaded Message list"
 msgstr "Λίστα μηνυμάτων κατά θέμα"
 
-#: ui/evolution-mail-list.xml.h:26
-#: ui/evolution-tasks.xml.h:18
-msgid "_Expunge"
-msgstr "_Εξάλειψη"
-
-#: ui/evolution-mail-list.xml.h:27
-#: ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Φάκελος"
 
-#: ui/evolution-mail-list.xml.h:28
-#: ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Αντιστρο_φή Επιλογής"
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Ιδιότητες..."
 
-#: ui/evolution-mail-list.xml.h:31
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "Λίστα Μηνυμάτων κατά _Θέμα"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Κλείσιμο του παραθύρου"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Προβολή"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Προσ_θήκη Αποστολέα στο Βιβλίο Διευθύνσεων"
@@ -27673,410 +27332,420 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Εφαρμογή φίλτρου στα επιλεγμένα μηνύματα"
 
 #: ui/evolution-mail-message.xml.h:5
+#, fuzzy
+msgid "Caret _Mode"
+msgstr "Μοντέλο Κειμένου"
+
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Συγγραφή απάντησης σε όλους τους παραλήπτες από αυτό το μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Συγγραφή απάντησης στη λίστα ταχυδρομείου από αυτό το μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Συγγραφή απάντησης στον αποστολέα του επιλεγμένου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Αντιγραφή επιλεγμένων μηνυμάτων σε άλλο φάκελο"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr "Δημιουργία Ει_κονικού Φακέλου Από το Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων από αυτόν τον αποστολέα"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
+msgstr ""
+"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
+msgstr ""
+"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτό το θέμα"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr "Δημιουργία εικονικού φακέλου για αυτούς τους παραλήπτες"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr "Δημιουργία εικονικού φακέλου για αύτη τη λίστα ταχυδρομείου"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr "Δημιουργία εικονικού φακέλου για αυτόν τον αποστολέα"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr "Δημιουργία εικονικού φακέλου για αυτό το θέμα"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Σμίκρυνση κειμένου"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Εμφάνιση επόμενου σημαντικού μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Εμφάνιση επόμενου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Εμφάνιση επόμενου μη αναγνωσμένου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Εμφάνιση επόμενου μη αναγνωσμένου θέμα"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Εμφάνιση προηγούμενου σημαντικού μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Εμφάνιση προηγούμενου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Εμφάνιση προηγούμενου μη αναγνωσμένου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "F_orward"
 msgstr "Πρ_οώθηση"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "Φίλτρο βάση Λίστας _Ταχυδρομείου..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Φίλτρο με βάση τον Αποστο_λέα..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Φίλτρο βάση _Παραληπτών..."
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Φίλτρο βάση _Θέματος..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων για διαγραφή"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Follow _Up..."
 msgstr "_Πλήρες Όνομα..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 msgid "Force images in HTML mail to be loaded"
 msgstr "Υποχρεωτική φόρτωση των εικόνων στα μηνύματα HTML"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message in the body of a new message"
 msgstr "Προώθηση του επιλεγμένου μηνύματος στο σώμα ενός νέου μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message quoted like a reply"
 msgstr "Προώθηση του επιλεγμένου μηνύματος με αναφορά σαν απάντηση"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message to someone"
 msgstr "Προώθηση του επιλεγμένου μηνύματος σε κάποιον"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Προώθηση του επιλεγμένου μηνύματος σε κάποιον ως επισύναψη"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:45
 msgid "Increase the text size"
 msgstr "Μεγέθυνση του κειμένου"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:46
 msgid "Load _Images"
 msgstr "Φόρτωση _Εικόνων"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr "Σήμανση _ως Αναγνωσμένα"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr "Σήμανση ως _Σημαντικό"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as U_nread"
 msgstr "Σήμανση ως _Μη Αναγνωσμένα"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as Unimp_ortant"
 msgstr "Σήμανση ως Ασ_ήμαντο"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as having been read"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως αναγνωσμένα"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as important"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως σημαντικά"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως μη αναγνωσμένα"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων ως μη σημαντικά"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Σήμανση των επιλεγμένων μηνυμάτων για διαγραφή"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:56
 msgid "Move"
 msgstr "Μετακίνηση"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:57
 msgid "Move selected message(s) to another folder"
 msgstr "Μετακίνηση επιλεγμένων μηνυμάτων σε άλλο φάκελο"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr "Επόμενο Σ_ημαντικό Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "Επόμενη Α_λληλουχία"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "Επόμενο _Μη Αναγνωσμένο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:62
 msgid "Open the selected message in a new window"
 msgstr "Άνοιγμα επιλεγμένου μηνύματος σε νέο παράθυρο"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:63
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Άνοιγμα του επιλεγμένου μηνύματος στον επεξεργαστή για να ξανά-σταλεί"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:64
 msgid "Original Si_ze"
 msgstr "Αρχικό _Μέγεθος"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:65
 msgid "P_revious Unread Message"
 msgstr "Π_ροηγούμενο μη Αναγνωσμένο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:62
-msgid "Post a Reply"
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Post a Repl_y"
 msgstr "Αποστολή μιας απάντησης"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:69
 msgid "Pr_evious Important Message"
 msgstr "Πρ_οηγούμενο Σημαντικό Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:70
 msgid "Preview the message to be printed"
 msgstr "Προεπισκόπηση του μηνύματος προς εκτύπωση"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:71
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:74
 msgid "Print this message"
 msgstr "Εκτύπωση μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:75
 msgid "Re_direct"
 msgstr "Ανα_δρομολόγηση"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Προώθηση του επιλεγμένου μηνύματος σε κάποιον"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "Απάντηση σε _Όλους"
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr "Απάντηση στη _Λίστα"
+
+#: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr "Επαναφορά του κειμένου στο κανονικό μέγεθος"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch Message..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "S_earch in Message..."
 msgstr "Ανα_ζήτηση Μηνύματος..."
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "S_maller"
 msgstr "_Μικρότερο"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
 msgid "Save the message as a text file"
 msgstr "Αποθήκευση του μηνύματος ως αρχείο κειμένου"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:85
 msgid "Search for text in the body of the displayed message"
 msgstr "Εύρεση κειμένου στο σώμα του μηνύματος που φαίνεται"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Ρυθμίστε την διαμόρφωση σελίδας για τον τρέχοντα εκτυπωτή"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show Email _Source"
 msgstr "Εμφάνιση _Πηγής Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show Full _Headers"
 msgstr "Εμφάνιση Όλων των _Επικεφαλίδων"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Εύρεση κειμένου στο σώμα του μηνύματος που φαίνεται"
+
+#: ui/evolution-mail-message.xml.h:90
 msgid "Show message in the normal style"
 msgstr "Εμφάνιση μηνύματος σε κανονική μορφή"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Show message with all email headers"
 msgstr "Εμφάνιση μηνύματος με όλες τις επικεφαλίδες ηλεκτρονικού ταχυδρομείου"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Απλή εμφάνιση της πηγής του μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Text Si_ze"
 msgstr "_Μέγεθος Κειμένου"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr "Ακύρωση διαγραφής των επιλεγμένων μηνυμάτων"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "VFolder on Mailing _List..."
 msgstr "ΕΦάκελος στην _Λίστα Ταχυδρομείου..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "VFolder on Se_nder..."
 msgstr "ΕΦάκελος στον _Αποστολέα..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "VFolder on _Recipients..."
 msgstr "ΕΦάκελος στους _Παραλήπτες..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "VFolder on _Subject..."
 msgstr "ΕΦάκελος στο _Θέμα..."
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "Ε_πισύναψη"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Copy to Folder"
 msgstr "_Αντιγραφή σε Φάκελο"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Create Filter From Message"
 msgstr "_Δημιουργία Φίλτρου Από το Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Forward Message"
 msgstr "_Προώθηση Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Μετάβαση σε"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Inline"
 msgstr "Μέσα στο _μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Larger"
 msgstr "_Μεγαλύτερο"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Message Display"
 msgstr "_Προβολή Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Move to Folder"
 msgstr "_Μετακίνηση σε φάκελο"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Next Message"
 msgstr "Επόμε_νο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Normal Display"
 msgstr "_Κανονική Προβολή"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Open Message"
 msgstr "_Άνοιγμα Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Previous Message"
 msgstr "_Προηγούμενο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Quoted"
 msgstr "Σε παρά_θεση"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr "_Απάντηση στον Αποστολέα"
+
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Resend..."
 msgstr "_Αποστολή ξανά..."
 
-#: ui/evolution-mail-message.xml.h:113
-#: ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "Εργα_λεία"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Undelete"
 msgstr "Α_ναίρεση Διαγραφής"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2
-#: ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Κλείσιμο του παραθύρου"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10
-#: ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "_Κλείσιμο"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49
-#: ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Προβολή"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Επισύναψη"
@@ -28085,8 +27754,7 @@ msgstr "Επισύναψη"
 msgid "Attach a file"
 msgstr "Επισύναψη αρχείου"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Κλείσιμο του τρέχοντος αρχείου"
 
@@ -28100,10 +27768,10 @@ msgstr "Κρυπτογραφήστε αυτό το μήνυμα με PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
+msgstr ""
+"Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
 
-#: ui/evolution-message-composer.xml.h:8
-#: ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "_Μορφή"
 
@@ -28135,6 +27803,11 @@ msgstr "Κρυπτογράφηση S/MIME"
 msgid "S/MIME Sign"
 msgstr "Υπογραφή S/MIME"
 
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Αποθήκευση"
+
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Αποθήκευση Ως"
@@ -28148,7 +27821,7 @@ msgid "Save in folder..."
 msgstr "Αποθήκευση στο φάκελο..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Αποθήκευση του παρόντος αρχείου"
 
@@ -28165,7 +27838,7 @@ msgid "Send"
 msgstr "Αποστολή"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Αποστολή του μηνύματος σε μορφή HTML"
 
@@ -28230,7 +27903,7 @@ msgid "_From Field"
 msgstr "Πεδίο _Από"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -28246,11 +27919,11 @@ msgstr "_Πεδίο Απάντησης"
 msgid "_Security"
 msgstr "_Ασφάλεια"
 
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Αποθήκευση αυτού του αρχείου και κλείσιμο του παραθύρου"
 
@@ -28326,15 +27999,20 @@ msgstr "Διαγραφή επιλεγμένων εργασιών"
 msgid "Mar_k as Complete"
 msgstr "_Σημείωση ως Ολοκληρωμένο"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Mark selected tasks as complete"
+msgstr "_Σημείωση επιλεγμένων εργασιών ως ολοκληρωμένες"
+
+#: ui/evolution-tasks.xml.h:11
 msgid "Paste task from the clipboard"
 msgstr "Επικόλληση εργασίας από το πρόχειρο"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Previews the list of tasks to be printed"
 msgstr "Προεπισκόπηση της λίστας εργασιών προς εκτύπωση"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:14
 msgid "Print the list of tasks"
 msgstr "Εκτύπωση της λίστας εργασιών"
 
@@ -28584,27 +28262,32 @@ msgid "_Work Week View"
 msgstr "Προ_βολή Εργάσιμων Ημερών"
 
 #: views/mail/galview.xml.h:1
-msgid "As Sent Folder"
+#, fuzzy
+msgid "As _Sent Folder"
 msgstr "Ως φάκελος Απεσταλμένων"
 
 #: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr ""
+#, fuzzy
+msgid "By S_tatus"
+msgstr "Κατά Κατάσταση"
 
 #: views/mail/galview.xml.h:3
-msgid "By Sender"
+#, fuzzy
+msgid "By Se_nder"
 msgstr "Κατά Αποστολέα"
 
 #: views/mail/galview.xml.h:4
-msgid "By Status"
-msgstr "Κατά Κατάσταση"
+#, fuzzy
+msgid "By Su_bject"
+msgstr "Κατά Θέμα"
 
 #: views/mail/galview.xml.h:5
-msgid "By Subject"
-msgstr "Κατά Θέμα"
+msgid "By _Follow Up Flag"
+msgstr ""
 
 #: views/mail/galview.xml.h:6
-msgid "Messages"
+#, fuzzy
+msgid "_Messages"
 msgstr "Μηνύματα"
 
 #: views/tasks/galview.xml.h:1
@@ -28631,10 +28314,12 @@ msgstr "Ζώνη Αλλαγής Ώρας:"
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 #, fuzzy
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Κάντε χρήση του αριστερού πλήκτρου του ποντικιού για να μεγενθύνετε μια περιοχή στον χάρτη και επιλέξτε μια ζώνη αλλαγής ώρας:\n"
+"Κάντε χρήση του αριστερού πλήκτρου του ποντικιού για να μεγενθύνετε μια "
+"περιοχή στον χάρτη και επιλέξτε μια ζώνη αλλαγής ώρας:\n"
 "Με το δεξί πλήκτρο του ποντικιού κάνετε σμίκρυνση του χάρτη."
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
@@ -28662,22 +28347,20 @@ 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:427
+#: widgets/misc/e-calendar-item.c:456
 msgid "MTWTFSS"
 msgstr "ΔΤΤΠΠΣΚ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
+#: widgets/misc/e-calendar-item.c:1174
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241
-#: widgets/misc/e-dateedit.c:428
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
 msgid "Now"
 msgstr "Τώρα"
 
-#: widgets/misc/e-cell-date-edit.c:249
-#: widgets/misc/e-dateedit.c:434
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
 msgid "Today"
 msgstr "Σήμερα"
 
@@ -28734,16 +28417,13 @@ msgstr "Unicode"
 msgid "Western European"
 msgstr "Δυτικής Ευρώπης"
 
-#: widgets/misc/e-charset-picker.c:88
-#: widgets/misc/e-charset-picker.c:89
+#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
 #: widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "Παραδοσιακά"
 
-#: widgets/misc/e-charset-picker.c:91
-#: widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:93
-#: widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "Απλοποιημένα"
 
@@ -28760,8 +28440,7 @@ msgstr "Οπτική"
 msgid "Unknown character set: %s"
 msgstr "Άγνωστο σύνολο χαρακτήρων: %s"
 
-#: widgets/misc/e-charset-picker.c:213
-#: widgets/misc/e-charset-picker.c:442
+#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
 msgid "Character Encoding"
 msgstr "Κωδικοποίηση Χαρακτήρων"
 
@@ -28786,37 +28465,18 @@ msgstr "Επεξεργαστής Αναζήτησης"
 msgid "Save Search"
 msgstr "Αποθήκευση Αναζήτησης"
 
-#: widgets/misc/e-filter-bar.h:91
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 msgid "_Save Search..."
 msgstr "_Αποθήκευση Αναζήτησης..."
 
-#: widgets/misc/e-filter-bar.h:92
-#: widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Edit Saved Searches..."
 msgstr "_Επεξεργασία Αποθηκευμένων  Αναζητήσεων..."
 
-#: widgets/misc/e-filter-bar.h:93
-#: widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
 msgid "_Advanced..."
 msgstr "Για Προ_χωρημένους..."
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr "Πληροφορία"
-
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr "Ερώτηση"
-
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr "Μήνυμα"
-
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "Ανα_ζήτηση"
@@ -28865,3 +28525,539 @@ msgstr "Προβολή iTip/iMip ημερολογίου Evolution"
 msgid "Evolution Addressbook local file backend"
 msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
 
+#~ msgid "That person is already attending the meeting!"
+#~ msgstr "Αυτό το άτομο είναι ήδη σε συνάντηση!"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "_Save as..."
+#~ msgstr "Αποθήκευ_ση ως..."
+
+#~ msgid "End Date"
+#~ msgstr "Ημερομηνία Λήξης"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Νέο _Ραντεβού"
+
+#~ msgid "Print..."
+#~ msgstr "Εκτύπωση..."
+
+#~ msgid "Chair Persons"
+#~ msgstr "Άτομα Προεδρείου"
+
+#~ msgid "Required Participants"
+#~ msgstr "Απαραίτητοι Συμμετέχοντες"
+
+#~ msgid "Optional Participants"
+#~ msgstr "Προαιρετικοί Συμμετέχοντες"
+
+#~ msgid "Resources"
+#~ msgstr "Πόροι"
+
+#~ msgid "Individual"
+#~ msgstr "Άτομο"
+
+#~ msgid "Group"
+#~ msgstr "Ομάδα"
+
+#~ msgid "Resource"
+#~ msgstr "Πόρος"
+
+#~ msgid "Room"
+#~ msgstr "Αίθουσα"
+
+#~ msgid "Chair"
+#~ msgstr "Προεδρείο"
+
+#~ msgid "Required Participant"
+#~ msgstr "Απαραίτητος Συμμετέχων"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Προαιρετικός Συμμετέχων"
+
+#~ msgid "Non-Participant"
+#~ msgstr "Μη-Συμμετέχων"
+
+#~ msgid "Needs Action"
+#~ msgstr "Απαιτεί Ενέργεια"
+
+#~ msgid "Delegated"
+#~ msgstr "Εξουσιοδοτήθηκε"
+
+#~ msgid "In Process"
+#~ msgstr "Σε Εξέλιξη"
+
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Ιδιότητες για \"%s\""
+
+#~ msgid "Properties"
+#~ msgstr "Ιδιότητες"
+
+#~ msgid "Could not create temporary directory: %s"
+#~ msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
+
+#~ msgid "%d new"
+#~ msgstr "%d νέα"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "%d hidden"
+#~ msgstr "%d κρυμμένα"
+
+#~ msgid "%d visible"
+#~ msgstr "%d ορατά"
+
+#~ msgid "%d selected"
+#~ msgstr "%d επιλεγμένα"
+
+#~ msgid "%d unsent"
+#~ msgstr "%d μη απεσταλμένα"
+
+#~ msgid "%d sent"
+#~ msgstr "%d απεσταλμένα"
+
+#~ msgid "%d total"
+#~ msgstr "%d συνολικά"
+
+#, fuzzy
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "Δημιουργία Ει_κονικού Φακέλου Από το Μήνυμα"
+
+#~ msgid "VFolder on _Subject"
+#~ msgstr "ΕΦάκελος στο _Θέμα"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "ΕΦάκελος στον _Αποστολέα"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "ΕΦάκελος στους _Παραλήπτες"
+
+#~ msgid "VFolder on Mailing _List"
+#~ msgstr "ΕΦάκελος στη Λίστα _Ταχυδρομείου"
+
+#~ msgid "Filter on Sub_ject"
+#~ msgstr "Φίλτρο στο _Θέμα"
+
+#~ msgid "Filter on Sen_der"
+#~ msgstr "Φίλτρο στον Α_ποστολέα"
+
+#~ msgid "Filter on Re_cipients"
+#~ msgstr "Φίλτρο στους Παρα_λήπτες"
+
+#~ msgid "Filter on _Mailing List"
+#~ msgstr "Φίλτρο στη Λίστα _Ταχυδρομείου"
+
+#~ msgid "_Edit as New Message..."
+#~ msgstr "_Επεξεργασία ως Νέο Μήνυμα..."
+
+#~ msgid "_Print"
+#~ msgstr "_Εκτύπωση"
+
+#~ msgid "_Forward"
+#~ msgstr "_Προώθηση"
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "Ση_μαία Ολοκληρώθηκε"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Εκκα_θάριση Σημαίας"
+
+#~ msgid "Mark as _Unread"
+#~ msgstr "Σήμανση ως _Μη Αναγνωσμένα"
+
+#~ msgid "Mark as _Important"
+#~ msgstr "Σήμανση ως _Σημαντικά"
+
+#~ msgid "_Mark as Unimportant"
+#~ msgstr "Σή_μανση ως Μη Σημαντικά"
+
+#~ msgid "U_ndelete"
+#~ msgstr "Α_κύρωση Διαγραφής"
+
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "Με_τακίνηση στο Φάκελο..."
+
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
+
+#~ msgid "Appl_y Filters"
+#~ msgstr "Εφαρμο_γή Φίλτρων"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Δη_μιουργία Κανόνα Από το Μήνυμα"
+
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "ΕΦάκελος στη Λίστα Τα_χυδρομείου"
+
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Φίλτρο στη Λίστα Τα_χυδρομείου (%s)"
+
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "ΕΦάκελος στη Λίστα Τα_χυδρομείου (%s)"
+
+#~ msgid "Don't show this message again."
+#~ msgstr "Να μην ξαναεμφανιστεί αυτό το μήνυμα"
+
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "Δεν έχετε ρυθμίσει το πρόγραμμα ταχυδρομείου\n"
+#~ "Πρέπει πρώτα να γίνει η ρύθμιση πριν την αποστολή\n"
+#~ "ή συγγραφή μηνυμάτων\n"
+#~ "Θέλετε να κάνετε την ρύθμιση τώρα;"
+
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Πρέπει να ρυθμίσετε μια ταυτότητα\n"
+#~ "πριν από την συγγραφή μηνύματος"
+
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Πρέπει να ρυθμίσετε την μεταφορά ταχυδρομείου\n"
+#~ "πριν από την συγγραφή μηνύματος"
+
+#~ msgid ""
+#~ "You are sending an HTML-formatted message. Please make sure that\n"
+#~ "the following recipients are willing and able to receive HTML mail:\n"
+#~ msgstr ""
+#~ "Θα στείλετε μήνυμα σε μορφή HTML. Παρακαλώ βεβαιωθείτε ότι\n"
+#~ " παρακάτω παραλήπτες επιθυμούν μηνύματα σε μορφή HTML:\n"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Να σταλεί οπωσδήποτε;"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Αυτό το μήνυμα δεν έχει θέμα.\n"
+#~ "Να σταλεί;"
+
+#~ msgid ""
+#~ "Since the contact list you are sending to is configured to hide the "
+#~ "list's addresses, this message will contain only Bcc recipients."
+#~ msgstr ""
+#~ "Μιας και η λίστα επαφών που στέλνετε είναι ρυθμισμένη να αποκρύπτει τις "
+#~ "διευθύνσεις, αυτό το μήνυμα θα περιέχει μόνο παραλήπτες στην Ιδιαίτερη "
+#~ "κοινοποίηση(Bcc)."
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr ""
+#~ "Αυτό το μήνυμα περιέχει μόνο παραλήπτες στο Ιδιαίτερης κοινοποίησηςBcc)."
+
+#~ msgid ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "Είναι δυνατό να αποκαλύψει ο διακομιστής ταχυδρομείου τους παραλήπτες με "
+#~ "την προσθήκη μια εμφανή επικεφαλίδα Προς.\n"
+#~ "Να σταλεί ούτως η άλλως;"
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr ""
+#~ "Πρέπει να ορίσετε παραλήπτες προκειμένου να στείλετε αυτό το μήνυμα."
+
+#~ msgid ""
+#~ "Unable to open the drafts folder for this account.\n"
+#~ "Would you like to use the default drafts folder?"
+#~ msgstr ""
+#~ "Δεν είναι δυνατό το άνοιγμα του προσωρινού φακέλου για αυτόν τον "
+#~ "λογαριασμό.\n"
+#~ "Θέλετε να κάνετε χρήση του εξ' ορισμού προσωρινού φακέλου;"
+
+#~ msgid "an unknown sender"
+#~ msgstr "ένας άγνωστος αποστολέας"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+#~ msgstr "Στις %d/%b/%Y, ημέρα %A και ώρα %H:%M, ο/η %%s έγραψε:"
+
+#~ msgid "Move message(s) to"
+#~ msgstr "Μετακίνηση μηνύματος(ων) στο"
+
+#~ msgid "Copy message(s) to"
+#~ msgstr "Αντιγραφή μηνύματος(ων) στο"
+
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "Είστε βέβαιοι ότι θέλετε να επεξεργαστείτε και τα %d μηνύματα;"
+
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Επιτρέπεται να επεξεργαστείτε μόνο τα\n"
+#~ "μηνύματα στον Πρόχειρο Φάκελο."
+
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Επιτρέπεται να ξαναστείλετε μόνο τα\n"
+#~ "μηνύματα από τον φάκελο Απεσταλμένα."
+
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr "Είστε βέβαιοι ότι θέλετε να ξαναστείλετε και τα %d μηνύματα;"
+
+#~ msgid "No Message Selected"
+#~ msgstr "Δεν Έχει Επιλεγεί Μήνυμα"
+
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Αδυναμία αποθήκευσης σε `%s'\n"
+#~ " %s"
+
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Το %s υπάρχει ήδη.\n"
+#~ "Θέλετε να αντικατασταθεί;"
+
+#~ msgid "Save Message As..."
+#~ msgstr "Αποθήκευση Μηνύματος Ως..."
+
+#~ msgid "Save Messages As..."
+#~ msgstr "Αποθήκευση Μηνυμάτων Ως..."
+
+#~ msgid ""
+#~ "This operation will permanently erase all messages marked as\n"
+#~ "deleted. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "Με αυτή την λειτουργία θα διαγράψετε μόνιμα όλα τα μηνύματα που έχετε "
+#~ "σημειώσει ως διαγραμμένα,\n"
+#~ "και δεν θα μπορέσετε να τα ανακτήσετε.\n"
+#~ "\n"
+#~ "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
+
+#~ msgid ""
+#~ "Error loading filter information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Σφάλμα κατά το φόρτωμα των πληροφοριών:\n"
+#~ "%s"
+
+#~ msgid "Filters"
+#~ msgstr "Φίλτρα"
+
+#~ msgid "Page %d of %d"
+#~ msgstr "Σελίδα %d από %d"
+
+#~ msgid "Print Message"
+#~ msgstr "Εκτύπωση Μηνύματος"
+
+#~ msgid "Printing of message failed"
+#~ msgstr "Απέτυχε η εκτύπωση του μηνύματος"
+
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr ""
+#~ "Είστε βέβαιοι ότι θέλετε να ανοίξετε και τα %d μηνύματα σε άλλα παράθυρα;"
+
+#~ msgid "Could not create a S/MIME signature context."
+#~ msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων υπογραφής S/MIME."
+
+#~ msgid "Could not create a S/MIME certsonly context."
+#~ msgstr "Αδυναμία δημιουργίας S/MIME certsonly context."
+
+#~ msgid "Could not create a S/MIME encryption context."
+#~ msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων κρυπτογράφηση S/MIME."
+
+#~ msgid "Could not create a S/MIME envelope context."
+#~ msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων φακέλου S/MIME."
+
+#~ msgid "Could not create a S/MIME decode context."
+#~ msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων αποκρυπτογράφηση S/MIME."
+
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Το αρχείο `%s' υπάρχει ήδη\n"
+#~ "Να αντικατασταθεί;"
+
+#~ msgid "Save Attachment"
+#~ msgstr "Αποθήκευση επισύναψης..."
+
+#~ msgid "Could not create temporary file '%s': %s"
+#~ msgstr "Δεν είναι δυνατή η δημιουργία προσωρινού αρχείου '%s': %s"
+
+#~ msgid "Save Attachment..."
+#~ msgstr "Αποθήκευση συνημμένου..."
+
+#~ msgid "View Inline"
+#~ msgstr "Προβολή μέσα στο μήνυμα"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Άνοιγμα με %s..."
+
+#~ msgid "View Inline (via %s)"
+#~ msgstr "Προβολή μέσα στο μήνυμα (μέσω %s)"
+
+#~ msgid "Hide"
+#~ msgstr "Απόκρυψη"
+
+#~ msgid "External Viewer"
+#~ msgstr "Εξωτερικό Πρόγραμμα Προβολής"
+
+#~ msgid "Downloading images"
+#~ msgstr "Μεταφόρτωση εικόνων"
+
+#~ msgid "Loading message content"
+#~ msgstr "Φόρτωμα περιεχόμενα μηνύματος"
+
+#~ msgid "Overdue:"
+#~ msgstr "'Εχουν λήξει:"
+
+#~ msgid "by %B %d, %Y, %l:%M %P"
+#~ msgstr "από %B %d, %Y, %l:%M %P"
+
+#~ msgid "Open Link in Browser"
+#~ msgstr "Άνοιγμα Συνδέσμου στον Περιηγητή"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "Αντιγραφή Θέσης Συντόμευσης"
+
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Αποθήκευση δεσμού ως (FIXME)"
+
+#~ msgid "Save Image as..."
+#~ msgstr "Αποθήκευση εικόνας ως..."
+
+#~ msgid "%s attachment"
+#~ msgstr " %s επισύναψη"
+
+#~ msgid "Could not parse MIME message. Displaying as source."
+#~ msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
+
+#~ msgid "Bad Address"
+#~ msgstr "Εσφαλμένη Διεύθυνση"
+
+#~ msgid "Reply-To"
+#~ msgstr "Απάντηση Σε"
+
+#~ msgid "Cc"
+#~ msgstr "Αντίγραφο:"
+
+#~ msgid "Bcc"
+#~ msgstr "Ιδιαίτερη Κοινοποίηση"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο. Κάντε κλικ στο εικονίδιο με "
+#~ "το λουκέτο για περισσότερες πληροφορίες."
+
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "Δεν ήταν δυνατή η δημιουργία περιεχομένων επαλήθευσης PGP."
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr ""
+#~ "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και βρέθηκε να είναι αυθεντικό."
+
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr ""
+#~ "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και δεν βρέθηκε να είναι "
+#~ "αυθεντικό."
+
+#~ msgid "Pointer to FTP site (%s)"
+#~ msgstr "Δείκτης σε σελίδα FTP (%s)"
+
+#~ msgid "Pointer to local file (%s) valid at site \"%s\""
+#~ msgstr "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στην σελίδα \"%s\""
+
+#~ msgid "Pointer to local file (%s)"
+#~ msgstr "Δείκτης σε τοπικό αρχείο (%s)"
+
+#~ msgid "Pointer to remote data (%s)"
+#~ msgstr "Δείκτης σε απομακρυσμένα δεδομένα (%s)"
+
+#~ msgid "Pointer to unknown external data (\"%s\" type)"
+#~ msgstr "Δείκτης σε άγνωστα εξωτερικά δεδομένα (τύπος \"%s\")"
+
+#~ msgid "Malformed external-body part."
+#~ msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
+
+#~ msgid "However, the message was successfully sent."
+#~ msgstr "Παρ'όλα αυτά το μήνυμα στάλθηκε με επιτυχία."
+
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Μήνυμα Χωρίς Τίτλο)"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Μήνυμα Χωρίς Τίτλο"
+
+#~ msgid "Empty Message"
+#~ msgstr "Κενό Μήνυμα"
+
+#~ msgid "Find in Message"
+#~ msgstr "Εύρεση στο Μήνυμα"
+
+#~ msgid "Case Sensitive"
+#~ msgstr "Διάκριση πεζών κεφαλαίων"
+
+#~ msgid "Search Forward"
+#~ msgstr "Αναζήτηση Προωθημένων"
+
+#~ msgid "Find:"
+#~ msgstr "Εύρεση:"
+
+#~ msgid "Matches:"
+#~ msgstr "Ταιριάζει με:"
+
+#~ msgid "Forwarded Message"
+#~ msgstr "Προωθημένο Μήνυμα"
+
+#~ msgid "(No subject)"
+#~ msgstr "(Χωρίς Θέμα)"
+
+#~ msgid "%s - Message"
+#~ msgstr "%s - Μήνυμα"
+
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "Σάρωση φακέλων κάτω από %s στο \"%s\""
+
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "Σάρωση των ριζικών φακέλων στο \"%s\""
+
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "Συνδρομή στον φάκελο \"%s\""
+
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "Κατάργηση συνδρομής στον φάκελο \"%s\""
+
+#~ msgid "No server has been selected"
+#~ msgstr "Δεν έχει επιλεγεί διακομιστής"
+
+#~ msgid "Please select a server."
+#~ msgstr "Παρακαλώ επιλέξτε διακομιστή."
+
+#, fuzzy
+#~ msgid "Scanning folders ..."
+#~ msgstr "Ανάγνωση φακέλων..."
+
+#~ msgid "Save As..."
+#~ msgstr "Αποθήκευση Ως..."
+
+#~ msgid "Information"
+#~ msgstr "Πληροφορία"
+
+#~ msgid "Question"
+#~ msgstr "Ερώτηση"
+
+#~ msgid "Message"
+#~ msgstr "Μήνυμα"
diff --git a/po/en_AU.po b/po/en_AU.po
index 372376d4b5..b1a8211d56 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2003-06-25 13:24-0400\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -13,66 +13,195 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
-msgid "Evolution VCard importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "Chile"
+
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card.c:1347
+#: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
+#: addressbook/backend/ebook/e-card.c:1354
+#, fuzzy
+msgid "Birth date"
+msgstr "_Other Organiser"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card.c:1374
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1430
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniversary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1436
+msgid "Mailer"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1443
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1471
+#, fuzzy
+msgid "Related Contacts"
+msgstr "_Other Organiser"
+
+#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
+msgid "List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -107,12 +236,6 @@ msgid "Home"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
@@ -231,21 +354,9 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr ""
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -256,12 +367,6 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr ""
 
@@ -270,32 +375,9 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr ""
-
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
@@ -318,11 +400,6 @@ msgid "icsCalendar"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr ""
 
@@ -330,12 +407,6 @@ msgstr ""
 msgid "Birth Date"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr ""
-
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr ""
@@ -350,110 +421,32 @@ msgid "%x"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-destination.c:709
 msgid "Unnamed List"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
-msgid "Address"
-msgstr "Chile"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
-msgid "Birth date"
-msgstr "_Other Organiser"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1374
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Organizational Unit"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
-msgid "Mailer"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr ""
+msgid "Evolution VCard Importer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/backend/ebook/e-card.c:1471
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 #, fuzzy
-msgid "Related Contacts"
-msgstr "_Other Organiser"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1506
-msgid "List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr ""
+msgid "Evolution VCard importer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:171
-msgid "Could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
-
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
 msgid "Searching..."
@@ -509,14 +502,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr ""
 
@@ -525,142 +518,6 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:620
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public Contacts"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "New Contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "_Contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:575
-msgid "Create a new contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "Contact _List"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:579
-msgid "Create a new contact list"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-#, fuzzy
-msgid "Other Contacts"
-msgstr "_Other Organiser"
-
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -769,6 +626,103 @@ msgstr ""
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:628
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public Contacts"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "New Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "_Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "Create a new contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "New Contact List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:587
+msgid "Create a new contact list"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-storage.c:178
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Other Organiser"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -797,33 +751,72 @@ msgstr ""
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:914
+#: addressbook/gui/component/e-address-popup.c:917
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:998
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-popup.c:1001
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1028
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1053
+#: addressbook/gui/component/e-address-popup.c:1056
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -963,10 +956,9 @@ msgstr ""
 msgid "S_earch scope: "
 msgstr ""
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1256
+#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr ""
 
@@ -1149,11 +1141,11 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr ""
 
@@ -1193,20 +1185,24 @@ msgstr ""
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr ""
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
@@ -1230,12 +1226,8 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
@@ -1308,7 +1300,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:197
+#: calendar/gui/dialogs/task-editor.c:200
 msgid "Details"
 msgstr ""
 
@@ -1372,11 +1364,13 @@ msgid "_Categories..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
-#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr ""
 
@@ -1417,15 +1411,15 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
+#: addressbook/gui/widgets/e-minicard.c:183
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 msgid "Editable"
 msgstr ""
 
@@ -2453,17 +2447,17 @@ msgstr ""
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 msgid "Book"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
+#: addressbook/gui/widgets/e-minicard-widget.c:93
 msgid "Card"
 msgstr ""
 
@@ -2680,7 +2674,7 @@ msgstr ""
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2723,7 +2717,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr ""
@@ -2742,10 +2736,10 @@ msgid "%d cards"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 msgid "Query"
 msgstr ""
 
@@ -2753,245 +2747,244 @@ msgstr ""
 msgid "Error getting book view"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 msgid "Model"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1210
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:785
-#: camel/camel-service.c:875 camel/camel-service.c:917
-#: camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
+#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Addressbook does not exist"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 msgid "Copy cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, c-format
 msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.c:398
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-#: addressbook/gui/widgets/e-addressbook-view.c:895
-#: addressbook/gui/widgets/e-addressbook-view.c:1879
+#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1883
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Addressbook Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 msgid "Copy to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 msgid "Move to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:912
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: calendar/gui/e-cal-view.c:1109
 msgid "Current View"
 msgstr ""
 
@@ -2999,7 +2992,7 @@ msgstr ""
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:949
+#: addressbook/gui/widgets/e-addressbook-view.c:953
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3007,11 +3000,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:954
+#: addressbook/gui/widgets/e-addressbook-view.c:958
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1352
+#: addressbook/gui/widgets/e-addressbook-view.c:1356
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3079,6 +3072,29 @@ msgstr ""
 msgid "Primary Phone"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3092,21 +3108,6 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:146
-msgid "Width"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:153
-msgid "Height"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:161
-msgid "Has Focus"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr ""
@@ -3123,10 +3124,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3147,12 +3144,8 @@ msgstr ""
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3163,20 +3156,20 @@ msgstr ""
 msgid "GTK Tree View"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.c:1139
+#: addressbook/printing/e-contact-print.c:1158
 msgid "Print cards"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1204
-#: addressbook/printing/e-contact-print.c:1226
+#: addressbook/printing/e-contact-print.c:1224
+#: addressbook/printing/e-contact-print.c:1250
 msgid "Print card"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr ""
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr ""
@@ -3346,6 +3339,60 @@ msgstr ""
 msgid "_Font..."
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+msgid "List local addressbook folders"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "[vcard|csv]"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+msgid "Impossible internal error."
+msgstr ""
+
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr ""
@@ -3475,28 +3522,30 @@ msgid "31st"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:912
 msgid "High"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
+#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:910
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr ""
 
@@ -3504,13 +3553,13 @@ msgstr ""
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3518,80 +3567,33 @@ msgstr ""
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "C_lose"
 
@@ -3607,16 +3609,25 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3624,7 +3635,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3635,69 +3646,78 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize Bonobo"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:176
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
+#: calendar/gui/alarm-notify/notify-main.c:185
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
+#: calendar/gui/calendar-commands.c:376
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
+#: calendar/gui/calendar-commands.c:382
+msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
-msgid "Unmatched"
+#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
+#: calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%m/%d/%Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:518
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:849
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3716,11 +3736,11 @@ msgstr ""
 msgid "Public folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr ""
@@ -3785,162 +3805,84 @@ msgstr ""
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1204
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
-#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
+#: calendar/gui/calendar-view-factory.c:118
+msgid "Day View"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
+#: calendar/gui/calendar-view-factory.c:121
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
+#: calendar/gui/calendar-view-factory.c:124
+msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
+#: calendar/gui/calendar-view-factory.c:127
+msgid "Month View"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
+#: calendar/gui/calendar-view-factory.c:130
+msgid "List View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:118
-msgid "Day View"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:121
-msgid "Work Week View"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:124
-msgid "Week View"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:127
-msgid "Month View"
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
+msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/comp-editor-factory.c:462
 msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:125
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:420
+#: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:429
+#: calendar/gui/dialogs/alarm-options.c:475
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:438
+#: calendar/gui/dialogs/alarm-options.c:484
 msgid "Email Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:447
+#: calendar/gui/dialogs/alarm-options.c:493
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:456
+#: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -3976,10 +3918,6 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr ""
@@ -3992,7 +3930,8 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
 msgid "minutes"
 msgstr ""
 
@@ -4006,11 +3945,11 @@ msgstr ""
 msgid "Date/Time:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr ""
 
@@ -4018,7 +3957,7 @@ msgstr ""
 msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr ""
 
@@ -4028,7 +3967,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr ""
 
@@ -4111,7 +4051,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr ""
 
@@ -4125,7 +4065,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr ""
 
@@ -4135,7 +4075,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr ""
 
@@ -4149,7 +4089,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr ""
 
@@ -4168,7 +4108,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr ""
 
@@ -4186,7 +4126,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr ""
 
@@ -4196,12 +4136,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr ""
 
@@ -4308,75 +4248,50 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
-msgid " (Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
-msgid "Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
-msgid "Due "
-msgstr ""
-
 #: calendar/gui/dialogs/comp-editor.c:334
 #, fuzzy
 msgid "Could not update invalid object"
@@ -4424,21 +4339,47 @@ msgid "No summary"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
-#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/dialogs/comp-editor.c:1406
-#: calendar/gui/dialogs/comp-editor.c:1432
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1459
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
+msgid " (Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
+msgid "Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
+msgid "Due "
+msgstr ""
+
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4541,31 +4482,31 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
 msgid "Start date is wrong"
 msgstr ""
 
@@ -4601,8 +4542,7 @@ msgid "Classification"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
+msgid "Co_nfidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:7
@@ -4629,7 +4569,6 @@ msgid "Pu_blic"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr ""
 
@@ -4646,74 +4585,34 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:630
 msgid "_Delegate To..."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4724,7 +4623,7 @@ msgid "_Change Organizer"
 msgstr "_Change Organiser"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr ""
 
@@ -4873,7 +4772,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr ""
 
@@ -4897,52 +4796,80 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 msgid "Completed date is wrong"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
-msgid "% Complete"
+msgid "% _Complete"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311
+msgid "Completed"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
+msgid "In Progress"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305
+msgid "Not Started"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
+msgid "_Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Web Page:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:204
-#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:480
+#: calendar/gui/dialogs/task-page.c:482
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.c:542
+msgid "Due date is before start date!"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr ""
@@ -4955,223 +4882,258 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
+msgid "Public"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
+msgid "Private"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
+msgid "Confidential"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1933
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:393
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
-#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Save as..."
+#: calendar/gui/e-calendar-table.c:989
+msgid "Open _Web Page"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
+#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
-#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
+#: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
-#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
+#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
-#: calendar/gui/e-week-view.c:4335
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr ""
 
@@ -5180,11 +5142,11 @@ msgid "Completion Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
+msgid "Description"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
+msgid "Due Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:11
@@ -5195,577 +5157,625 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr "Colours"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+#: calendar/gui/e-calendar-table.etspec.h:20
+msgid "component"
+msgstr ""
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/e-cal-model.c:828
+msgid "Recurring"
 msgstr ""
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
-msgid "%A %d %B"
+#: calendar/gui/e-cal-model.c:830
+msgid "Assigned"
 msgstr ""
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "Yes"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:809
-msgid "am"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "No"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:811
-msgid "pm"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3694
-msgid "New _Appointment"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:550
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+msgid "New _Appointment..."
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
+#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
-#: ui/evolution-calendar.xml.h:34
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
+#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
-#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
+#: calendar/gui/e-cal-view.c:1139
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
+#: calendar/gui/e-cal-view.c:1140
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
+#: calendar/gui/e-cal-view.c:1145
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr ""
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr ""
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
+msgid "%A %d %B"
+msgstr ""
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr ""
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:676
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 msgid "Every day"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, c-format
 msgid "Every %d days"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 msgid "Every week"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, c-format
 msgid "Every %d weeks"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, c-format
 msgid "Every %d weeks on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 msgid "every month"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 msgid "Every year"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1005
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 #, fuzzy
 msgid "Location:"
 msgstr "Organisation"
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
-#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1309
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1381
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1402
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 msgid "Select Calendar Folder"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 msgid "Select Tasks Folder"
 msgstr ""
 
@@ -5806,248 +5816,274 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
+#: calendar/gui/e-meeting-time-sel.c:392
+msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
-msgid "Required Participants"
+#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
+#: calendar/gui/e-meeting-time-sel.c:395
+msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:82
-msgid "Resources"
+#: calendar/gui/e-meeting-time-sel.c:434
+msgid "_Options"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
-msgid "Individual"
+#: calendar/gui/e-meeting-time-sel.c:451
+msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
-msgid "Group"
+#: calendar/gui/e-meeting-time-sel.c:461
+msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
-msgid "Resource"
+#: calendar/gui/e-meeting-time-sel.c:476
+msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
-msgid "Room"
+#: calendar/gui/e-meeting-time-sel.c:491
+msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
-msgid "Chair"
+#: calendar/gui/e-meeting-time-sel.c:509
+msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
-msgid "Required Participant"
+#: calendar/gui/e-meeting-time-sel.c:524
+msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
-msgid "Optional Participant"
+#: calendar/gui/e-meeting-time-sel.c:541
+msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
-msgid "Non-Participant"
+#: calendar/gui/e-meeting-time-sel.c:550
+msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
-msgid "Needs Action"
+#: calendar/gui/e-meeting-time-sel.c:559
+msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
-msgid "Tentative"
+#: calendar/gui/e-meeting-time-sel.c:568
+msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
-msgid "Delegated"
+#: calendar/gui/e-meeting-time-sel.c:587
+msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
+#: calendar/gui/e-meeting-time-sel.c:607
+msgid "Meeting _end time:"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
+#: calendar/gui/e-meeting-time-sel.c:2054
+#: calendar/gui/e-meeting-time-sel-item.c:452
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2087
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
-msgid "Out of Office"
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:408
-msgid "No Information"
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:447
-msgid "_Options"
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:464
-msgid "Show _Only Working Hours"
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:474
-msgid "Show _Zoomed Out"
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:489
-msgid "_Update Free/Busy"
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:504
-msgid "_<<"
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:522
-msgid "_Autopick"
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:537
-msgid ">_>"
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:554
-msgid "_All People and Resources"
-msgstr ""
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:563
-msgid "All _People and One Resource"
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:572
-msgid "_Required People"
-msgstr ""
+#: calendar/gui/e-tasks.c:221
+#, fuzzy
+msgid "Start Date:"
+msgstr "_Other Organiser"
 
-#: calendar/gui/e-meeting-time-sel.c:581
-msgid "Required People and _One Resource"
-msgstr ""
+#: calendar/gui/e-tasks.c:237
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Other Organiser"
 
-#: calendar/gui/e-meeting-time-sel.c:600
-msgid "Meeting _start time:"
+#. write priority
+#: calendar/gui/e-tasks.c:265
+msgid "Priority:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:620
-msgid "Meeting _end time:"
+#. URL
+#: calendar/gui/e-tasks.c:321
+msgid "Web Page:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
-#: calendar/gui/gnome-cal.c:2017
+#: calendar/gui/e-tasks.c:702
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:746
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:899
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:922
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1017
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3581
-msgid "New _Appointment..."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1481
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1556
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid "Adding alarms for %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1748
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1757
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1988
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2028
+#: calendar/gui/gnome-cal.c:2197
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Synchronising folder"
 
+#: calendar/gui/gnome-cal.c:3094
+#, c-format
+msgid "Purging event %s"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:3178
+msgid "Purging"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Cannot initialise Evolution's mail component."
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -6154,7 +6190,7 @@ msgstr ""
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6187,82 +6223,81 @@ msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1882
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1919
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1927
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1934
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2262
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2321
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2338
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2362
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2387
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2559
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2632
 msgid "Print Setup"
 msgstr ""
 
@@ -6270,7 +6305,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:465
+#: calendar/gui/tasks-control.c:448
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6278,11 +6313,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:468
+#: calendar/gui/tasks-control.c:451
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:610
+#: calendar/gui/tasks-control.c:593
 msgid "Print Tasks"
 msgstr ""
 
@@ -7972,27 +8007,27 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:167
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:207
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:251
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:293
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:331
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:363
 msgid "You may not export keys with this cipher"
 msgstr ""
 
@@ -8025,7 +8060,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Synchronising \"%s\""
@@ -8046,57 +8085,57 @@ msgstr "Could not close temporary folder: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 msgid "Syncing folders"
 msgstr "Synchronising folders"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr "Can not open message"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 msgid "Syncing folder"
 msgstr "Synchronising folder"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -8118,7 +8157,36 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:346
+#: camel/camel-folder.c:585
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1163
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1203
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1321
+msgid "Moving messages"
+msgstr ""
+
+#: camel/camel-folder.c:1321
+#, fuzzy
+msgid "Copying messages"
+msgstr "Can not open message"
+
+#: camel/camel-folder.c:1571
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Can not open message"
+
+#: camel/camel-folder-search.c:348
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8127,46 +8195,22 @@ msgstr ""
 "Can not parse search expression: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:356
+#: camel/camel-folder-search.c:358
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:653
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1161
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1201
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1319
-msgid "Moving messages"
-msgstr ""
-
-#: camel/camel-folder.c:1319
-#, fuzzy
-msgid "Copying messages"
-msgstr "Can not open message"
-
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8192,7 +8236,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr ""
 
@@ -8245,26 +8289,6 @@ msgstr ""
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Can not verify this message: could not create temporary file: %s"
 
-#: camel/camel-lock-client.c:111
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Can not build locking helper pipe: %s"
-
-#: camel/camel-lock-client.c:124
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Can not fork locking helper: %s"
-
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr ""
-
-#: camel/camel-lock-client.c:215
-#, c-format
-msgid "Could not lock '%s'"
-msgstr ""
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8285,6 +8309,26 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Can not build locking helper pipe: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Can not fork locking helper: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr ""
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8351,11 +8395,11 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 msgid "parse error"
 msgstr ""
 
@@ -8417,11 +8461,11 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:46
+#: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:50
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8512,7 +8556,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1207
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8566,23 +8610,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
@@ -8591,55 +8635,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:285
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:293
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:738
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:783 camel/camel-service.c:915
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:818
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:880
+#: camel/camel-service.c:860
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:949
+#: camel/camel-service.c:929
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:952
+#: camel/camel-service.c:932
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8651,12 +8695,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8700,132 +8744,132 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:212
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Can not get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Can not create folder: Invalid operation on this store"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8834,15 +8878,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8855,7 +8899,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8865,28 +8909,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -8898,17 +8942,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "You can not copy messages from this rubbish bin."
@@ -8936,12 +8980,12 @@ msgstr "Can not rename folder: %s: No such folder"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2806
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2809
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8978,40 +9022,40 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1883
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9020,24 +9064,24 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1943
-#: camel/providers/imap/camel-imap-folder.c:2539
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2203
-#: camel/providers/imap/camel-imap-folder.c:2273
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2577
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9087,85 +9131,100 @@ msgstr ""
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:63
-msgid "IMAP"
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:65
+msgid "IMAP"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/imap/camel-imap-store.c:589
+#: camel/providers/imap/camel-imap-store.c:821
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:655
+#: camel/providers/imap/camel-imap-store.c:686
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:687
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:824
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap/camel-imap-store.c:1237
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9173,42 +9232,68 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1660
+#: camel/providers/imap/camel-imap-store.c:1802
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2003
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2015
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2051
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+msgid "IMAP+"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/local/camel-local-folder.c:179
+msgid "Index message body data"
+msgstr ""
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:379
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:383
+#: camel/providers/local/camel-local-folder.c:386
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Can not open mailbox: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:390
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -9262,50 +9347,54 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9319,17 +9408,17 @@ msgstr ""
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Can not append message to maildir folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr ""
 
@@ -9343,7 +9432,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9404,29 +9493,29 @@ msgstr ""
 msgid "Storing folder"
 msgstr "Synchronising folder"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Can not create folder lock on %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:289
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Can not open mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:349
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:352
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Can not append message to mbox file: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9435,47 +9524,79 @@ msgstr ""
 "Can not get message: %s from folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Can not create folder lock on %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "Can not create folder lock on %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/local/camel-mbox-store.c:427
+msgid "The new folder name is illegal."
+msgstr ""
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9505,7 +9626,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
@@ -9522,38 +9643,38 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error writing to temporary mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Writing to temporary mailbox failed: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Can not append message to mh folder: %s: %s"
@@ -9631,6 +9752,65 @@ msgid ""
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+#, fuzzy
+msgid "Failed to send username to server"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr ""
+"Can not get message: %s\n"
+"  %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr "Could not close temporary folder: %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
@@ -9639,58 +9819,58 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -9699,13 +9879,6 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-msgid "User cancelled"
-msgstr ""
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
@@ -9715,36 +9888,22 @@ msgstr "Can not get folder: %s: %s"
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-"Can not get message: %s\n"
-"  %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 msgid "Unknown reason"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr ""
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr ""
@@ -9898,140 +10057,140 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:298
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:372
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10039,88 +10198,88 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:714
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10128,67 +10287,66 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -10220,151 +10378,76 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr ""
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr ""
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr ""
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr ""
-
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr ""
-
-#: composer/e-msg-composer.c:535
+#: composer/e-msg-composer.c:562
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Could not close temporary folder: %s"
 
-#: composer/e-msg-composer.c:814
+#: composer/e-msg-composer.c:841
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1177
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1195
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1218
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1287
+#: composer/e-msg-composer.c:1325
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1296
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1594
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10372,34 +10455,34 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1593
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:2017
+#: composer/e-msg-composer.c:2054
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2934
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2962
+#: composer/e-msg-composer.c:3030
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10407,18 +10490,92 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3029
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4045
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
+#: composer/e-msg-composer-hdrs.c:290
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr ""
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr ""
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr ""
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr ""
+
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr ""
+
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10574,7 +10731,7 @@ msgid ""
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr ""
 
@@ -10596,90 +10753,204 @@ msgstr ""
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%H:%M"
 msgstr ""
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr ""
 
+#: executive-summary/component/component-factory.c:151
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Can not initialise Evolution's Executive Summary component."
+
+#: executive-summary/component/e-summary.c:925
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr "Can not get folder: %s: %s"
+
+#: executive-summary/component/e-summary.c:939
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:125
+msgid "Select a service"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Send an email to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "C_lose"
+
+#: executive-summary/component/e-summary-url.c:76
+#, c-format
+msgid "Move %s to the left"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Synchronising \"%s\""
+
+#: executive-summary/component/e-summary-url.c:553
+#, fuzzy
+msgid "page"
+msgstr "Organiser:"
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+msgid "Error"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+msgid "Update now"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:795
+msgid "Update every "
+msgstr ""
+
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr ""
@@ -10796,82 +11067,6 @@ msgstr ""
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
-msgid "Important"
-msgstr ""
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-msgid "Work"
-msgstr ""
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr ""
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr ""
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr ""
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr ""
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr ""
@@ -10966,6 +11161,82 @@ msgstr ""
 msgid "years"
 msgstr ""
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+msgid "Important"
+msgstr ""
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr ""
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1458
+msgid "Later"
+msgstr ""
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr ""
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr ""
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr ""
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr ""
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr ""
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr ""
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -10988,217 +11259,217 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date received"
+msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
+#: filter/libfilter-i18n.h:11
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Deleted"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
+msgid "Follow Up"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "does not start with"
+msgid "Label"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
+msgid "Pipe Message to Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
+msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
+msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
-msgid "is before"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "is Flagged"
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "is greater than"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
+msgid "Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
+msgid "Size (kB)"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
-msgid "Label"
+msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
+#: filter/libfilter-i18n.h:35
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Message Body"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
-msgid "Message Header"
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
+msgid "Unset Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
+msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
-msgid "Read"
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
+msgid "does not return"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
+msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:49
+msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
-msgid "Sender"
+#: filter/libfilter-i18n.h:50
+msgid "is after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
+msgid "is before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
-msgid "Shell Command"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
+msgid "is not Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
+msgid "returns greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:58
+msgid "returns less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
+msgid "returns"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
-msgid "Subject"
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
+msgid "starts with"
 msgstr ""
 
-#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:916
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11266,10 +11537,9 @@ msgid "Scanning %s"
 msgstr ""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr ""
 
@@ -11332,7 +11602,7 @@ msgstr ""
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr ""
 
@@ -11347,7 +11617,7 @@ msgid "Scanning directory"
 msgstr ""
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:541
+#: shell/e-shell-startup-wizard.c:556
 msgid "Starting import"
 msgstr ""
 
@@ -11379,335 +11649,150 @@ msgstr ""
 msgid "Pine"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr ""
-
-#: mail/component-factory.c:117
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:147
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:819
+#: mail/component-factory.c:826
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:1000
+#: mail/component-factory.c:1008
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:1023
+#: mail/component-factory.c:1031
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1064
+#: mail/component-factory.c:1072
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 msgid "New Message Post"
 msgstr ""
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 msgid "_Post Message"
 msgstr ""
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1081
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Can not open message"
 
-#: mail/component-factory.c:1365
+#: mail/component-factory.c:1373
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1376
+#: mail/component-factory.c:1384
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:486
-#, c-format
-msgid "Properties for \"%s\""
-msgstr ""
-
-#: mail/folder-browser-ui.c:488
-msgid "Properties"
-msgstr ""
-
-#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr ""
-
-#: mail/folder-browser.c:782
-#, c-format
-msgid "%d new"
-msgstr ""
-
-#: mail/folder-browser.c:785 mail/folder-browser.c:793
-#: mail/folder-browser.c:796
-msgid ", "
-msgstr ""
-
-#: mail/folder-browser.c:787
-#, c-format
-msgid "%d hidden"
-msgstr ""
-
-#: mail/folder-browser.c:789
-#, c-format
-msgid "%d visible"
-msgstr ""
-
-#: mail/folder-browser.c:794
-#, c-format
-msgid "%d selected"
-msgstr ""
-
-#: mail/folder-browser.c:799
-#, c-format
-msgid "%d unsent"
-msgstr ""
-
-#: mail/folder-browser.c:801
-#, c-format
-msgid "%d sent"
-msgstr ""
-
-#: mail/folder-browser.c:803
-#, c-format
-msgid "%d total"
-msgstr ""
-
-#: mail/folder-browser.c:1182
-msgid "Create _Virtual Folder From Search..."
-msgstr ""
-
-#: mail/folder-browser.c:1736
-msgid "VFolder on _Subject"
-msgstr ""
-
-#: mail/folder-browser.c:1737
-msgid "VFolder on Se_nder"
-msgstr ""
-
-#: mail/folder-browser.c:1738
-msgid "VFolder on _Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:1739
-msgid "VFolder on Mailing _List"
-msgstr ""
-
-#: mail/folder-browser.c:1743
-msgid "Filter on Sub_ject"
-msgstr ""
-
-#: mail/folder-browser.c:1744
-msgid "Filter on Sen_der"
-msgstr ""
-
-#: mail/folder-browser.c:1745
-msgid "Filter on Re_cipients"
-msgstr ""
-
-#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
-msgid "Filter on _Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:1764
-msgid "_Edit as New Message..."
-msgstr ""
-
-#: mail/folder-browser.c:1766
-msgid "_Print"
-msgstr ""
-
-#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
-msgid "_Reply to Sender"
-msgstr ""
-
-#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
-msgid "Reply to _List"
-msgstr ""
-
-#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
-msgid "Reply to _All"
-msgstr ""
-
-#: mail/folder-browser.c:1773
-msgid "_Forward"
-msgstr ""
-
-#: mail/folder-browser.c:1777
-msgid "Follo_w Up..."
-msgstr ""
-
-#: mail/folder-browser.c:1778
-msgid "Fla_g Completed"
-msgstr ""
-
-#: mail/folder-browser.c:1779
-msgid "Cl_ear Flag"
-msgstr ""
-
-#. separator here?
-#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
-msgid "Mar_k as Read"
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
 msgstr ""
 
-#: mail/folder-browser.c:1784
-msgid "Mark as _Unread"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
 msgstr ""
 
-#: mail/folder-browser.c:1785
-msgid "Mark as _Important"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/folder-browser.c:1786
-msgid "_Mark as Unimportant"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/folder-browser.c:1791
-msgid "U_ndelete"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/folder-browser.c:1795
-msgid "Mo_ve to Folder..."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/folder-browser.c:1804
-msgid "Add Sender to Address_book"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/folder-browser.c:1808
-msgid "Appl_y Filters"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/folder-browser.c:1812
-msgid "Crea_te Rule From Message"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/folder-browser.c:2071
-msgid "VFolder on M_ailing List"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/folder-browser.c:2073
-#, c-format
-msgid "Filter on _Mailing List (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
 msgstr ""
 
-#: mail/folder-browser.c:2074
-#, c-format
-msgid "VFolder on M_ailing List (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-msgid "Default"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
 msgstr ""
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -11792,7 +11877,7 @@ msgstr ""
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1886
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11823,16 +11908,16 @@ msgstr ""
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 msgid "Protocol"
 msgstr ""
 
@@ -11872,184 +11957,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr ""
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr ""
-
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr ""
-
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:2344
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:2393
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:2403
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr ""
-
-#: mail/mail-callbacks.c:2465
-#, fuzzy, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"Can not get message: %s\n"
-"  %s"
-
-#: mail/mail-callbacks.c:2470
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:2686
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2781
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr ""
-
-#: mail/mail-callbacks.c:2830
-#, c-format
-msgid "Page %d of %d"
-msgstr ""
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr ""
-
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr ""
-
-#: mail/mail-callbacks.c:3147
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr ""
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12075,46 +11982,54 @@ msgstr ""
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:369
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:377
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:389
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:396
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12123,14 +12038,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr ""
@@ -12247,6 +12154,10 @@ msgstr ""
 msgid "De_fault"
 msgstr ""
 
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr ""
+
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr ""
@@ -12683,497 +12594,292 @@ msgstr ""
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
-#, fuzzy
-msgid "color"
-msgstr "Colours"
-
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr ""
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr ""
-
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
-msgstr ""
-
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
-msgstr ""
-
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr ""
-
-#: mail/mail-display.c:197
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr ""
-
-#: mail/mail-display.c:409
-#, fuzzy, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "Could not close temporary folder: %s"
-
-#: mail/mail-display.c:457
-msgid "Save Attachment..."
-msgstr ""
-
-#: mail/mail-display.c:458
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:459
-#, c-format
-msgid "Open in %s..."
-msgstr ""
-
-#: mail/mail-display.c:515
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:519
-msgid "Hide"
-msgstr ""
-
-#: mail/mail-display.c:539
-msgid "External Viewer"
-msgstr ""
-
-#: mail/mail-display.c:1368
-msgid "Downloading images"
-msgstr ""
-
-#: mail/mail-display.c:1545
-msgid "Loading message content"
-msgstr ""
-
-#: mail/mail-display.c:1887
-msgid "Overdue:"
-msgstr ""
-
-#: mail/mail-display.c:1891
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %P"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#: mail/mail-display.c:2255
-msgid "Open Link in Browser"
-msgstr ""
-
-#: mail/mail-display.c:2256
-msgid "Copy Link Location"
-msgstr ""
-
-#: mail/mail-display.c:2258
-msgid "Save Link as (FIXME)"
-msgstr ""
-
-#: mail/mail-display.c:2260
-msgid "Save Image as..."
-msgstr ""
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-format.c:665
-#, c-format
-msgid "%s attachment"
-msgstr ""
-
-#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
-#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-
-#: mail/mail-format.c:785 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr ""
-
-#: mail/mail-format.c:871
-msgid "Bad Address"
-msgstr ""
-
-#: mail/mail-format.c:912 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr ""
-
-#: mail/mail-format.c:916
-msgid "Reply-To"
-msgstr ""
-
-#: mail/mail-format.c:921 mail/message-list.etspec.h:14
-msgid "To"
-msgstr ""
-
-#: mail/mail-format.c:926
-msgid "Cc"
-msgstr ""
-
-#: mail/mail-format.c:931
-msgid "Bcc"
-msgstr ""
-
-#: mail/mail-format.c:1482
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1510
-#, fuzzy
-msgid "Could not create a PGP verfication context"
-msgstr "Could not close temporary folder: %s"
-
-#: mail/mail-format.c:1518
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1525
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1789
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1800
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1803
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1830
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1836
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1838
-msgid "Malformed external-body part."
-msgstr ""
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:711
 msgid "Reconfiguring folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:792
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:848
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:900
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1323
+#: mail/mail-local.c:1363
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1388
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1448
+#: mail/mail-local.c:1488
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:1512
+#: mail/mail-local.c:1552
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:259
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:262
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:913
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:87
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:550 mail/mail-ops.c:579
-msgid "However, the message was successfully sent."
+#: mail/mail-ops.c:557
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/mail-ops.c:578
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:587
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1666
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr ""
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr ""
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr ""
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr ""
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr ""
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr ""
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr ""
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr ""
-
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:259
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:308
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:390
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:229
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:262
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:264
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:287
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:288
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13218,21 +12924,17 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:438
-msgid "Forwarded Message"
-msgstr ""
-
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:209
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:467
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13241,100 +12943,95 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:776
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:834
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:873
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:965
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr ""
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr ""
-
-#: mail/message-list.c:741
+#: mail/message-list.c:900
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:742
+#: mail/message-list.c:901
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:743
+#: mail/message-list.c:902
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:744
+#: mail/message-list.c:903
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:745
+#: mail/message-list.c:904
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:749
+#: mail/message-list.c:908
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:750
+#: mail/message-list.c:909
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:754
+#: mail/message-list.c:913
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:755
+#: mail/message-list.c:914
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1231
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1238
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1247
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1259
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1267
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1269
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3062
 msgid "Generating message list"
 msgstr ""
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr ""
+
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr ""
@@ -13351,6 +13048,10 @@ msgstr ""
 msgid "Follow Up Flag"
 msgstr ""
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr ""
+
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
@@ -13364,6 +13065,10 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr ""
+
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr ""
@@ -13380,7 +13085,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr ""
 
@@ -13388,11 +13093,11 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
 msgid "Reply to All"
 msgstr ""
 
@@ -13422,62 +13127,132 @@ msgstr ""
 msgid "_Flag:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
+#: mail/subscribe-dialog.glade.h:1
+msgid "Folder Subscriptions"
 msgstr ""
 
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
+#: mail/subscribe-dialog.glade.h:2
+msgid "None Selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
+#: mail/subscribe-dialog.glade.h:3
+msgid "S_erver:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
+#: mail/subscribe-dialog.glade.h:4
+msgid "_Subscribe"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
+#: mail/subscribe-dialog.glade.h:5
+msgid "_Unsubscribe"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Scanning folders ..."
-msgstr "Synchronising folders"
+#: my-evolution/e-summary-calendar.c:384
+msgid "Appointments"
+msgstr ""
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Subscribe"
+#: my-evolution/e-summary-calendar.c:392
+msgid "No appointments."
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:6
-msgid "_Unsubscribe"
+#: my-evolution/e-summary-calendar.c:409
+msgid "%k:%M %d %B"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:411
+msgid "%l:%M%p %d %B"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:429
+msgid "No description"
+msgstr ""
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:349
+msgid "No tasks"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:387
+msgid "blue"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:387
+msgid "(No Description)"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:72
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:261
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr ""
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:582
+msgid "KBOS"
 msgstr ""
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
@@ -23311,110 +23086,6 @@ msgstr ""
 msgid "Zurich"
 msgstr ""
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:389
-msgid "No appointments."
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:408
-msgid "%l:%M%P %d %B"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr ""
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr ""
-
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr ""
-
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr ""
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr ""
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr ""
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr ""
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr ""
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr ""
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr ""
@@ -24676,23 +24347,26 @@ msgstr ""
 msgid "_Show full path for folders"
 msgstr "Could not close temporary folder: %s"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
+#: notes/component-factory.c:27
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Cannot initialise Evolution's mail component."
+#: notes/component-factory.c:27
+msgid "Create a new note"
+msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#: notes/component-factory.c:152
 #, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Cannot initialise Evolution's folder info component."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr ""
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Could not initialise Bonobo.\n"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -24774,6 +24448,43 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr ""
+
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr ""
@@ -24861,27 +24572,32 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:538
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:541
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Synchronising folder"
 
-#: shell/e-shell-folder-commands.c:553
+#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:590
+#: shell/e-shell-folder-commands.c:587
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -24916,115 +24632,123 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
+#: shell/e-shell-importer.c:151
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:317
+#: shell/e-shell-importer.c:323
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:458
+#: shell/e-shell-importer.c:464
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
-#: shell/e-shell-importer.c:518
+#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
+#: shell/e-shell-importer.c:524
 msgid "Evolution Error"
 msgstr ""
 
-#: shell/e-shell-importer.c:475
+#: shell/e-shell-importer.c:481
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:484
+#: shell/e-shell-importer.c:490
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:503
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:523
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:540
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:588
+#: shell/e-shell-importer.c:594
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:637
-msgid "Filename:"
+#: shell/e-shell-importer.c:643
+msgid "_Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:651
-msgid "File type:"
+#: shell/e-shell-importer.c:658
+msgid "File _type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:676
-msgid "Import data and settings from older programs"
+#: shell/e-shell-importer.c:684
+msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:680
-msgid "Import a single file"
+#: shell/e-shell-importer.c:687
+msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
+#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:749
+#: shell/e-shell-importer.c:758
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
+#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1047
+#: shell/e-shell-importer.c:1061
 msgid "Select folder"
 msgstr ""
 
-#: shell/e-shell-importer.c:1048
+#: shell/e-shell-importer.c:1062
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
-msgid "Import"
+#: shell/e-shell-importer.c:1193
+msgid "_Import"
 msgstr ""
 
 #: shell/e-shell-offline-handler.c:592
@@ -25084,10 +24808,17 @@ msgstr "Could not close temporary folder: %s"
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:586
-#: shell/e-shell-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
+#: shell/e-shell-startup-wizard.c:771
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:782
+msgid "Quit Assistant"
 msgstr ""
 
 #: shell/e-shell-utils.c:116
@@ -25110,6 +24841,33 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr ""
+
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr ""
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr ""
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -25160,68 +24918,12 @@ msgstr ""
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr ""
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr ""
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
 msgstr ""
 
 #: shell/e-shortcuts-view.c:80
@@ -25337,18 +25039,6 @@ msgstr ""
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr ""
@@ -25406,6 +25096,14 @@ msgstr "Can not create folder lock on %s: %s"
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
+
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr ""
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25420,92 +25118,92 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1189
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1191
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1190
+#: shell/evolution-shell-component.c:1193
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1195
 msgid "No owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1197
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1199
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1198
+#: shell/evolution-shell-component.c:1201
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1200
+#: shell/evolution-shell-component.c:1203
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1202
+#: shell/evolution-shell-component.c:1205
 msgid "Internal error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1206
+#: shell/evolution-shell-component.c:1209
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1208
+#: shell/evolution-shell-component.c:1211
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1212
+#: shell/evolution-shell-component.c:1215
 msgid "Has subfolders"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1214
+#: shell/evolution-shell-component.c:1217
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1216
+#: shell/evolution-shell-component.c:1219
 msgid "Old owner has died"
 msgstr ""
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr ""
@@ -25605,6 +25303,24 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr ""
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -25640,6 +25356,10 @@ msgstr ""
 msgid "Importers"
 msgstr ""
 
+#: shell/importer/intelligent.c:191
+msgid "Import"
+msgstr ""
+
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr ""
@@ -25807,7 +25527,7 @@ msgstr ""
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr ""
 
@@ -25815,9 +25535,9 @@ msgstr ""
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr ""
 
@@ -25861,17 +25581,21 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr ""
 
@@ -25939,46 +25663,58 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+msgid "Purg_e"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:24
+msgid "Purge old appointments and meetings"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:25
+msgid "Show as list"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr ""
@@ -25987,7 +25723,7 @@ msgstr ""
 msgid "Close this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr ""
 
@@ -26000,47 +25736,57 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr ""
-
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+msgid "Save and _Close"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr ""
 
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr ""
+
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr ""
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr ""
 
@@ -26061,51 +25807,38 @@ msgstr ""
 msgid "Select all text"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr ""
-
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete this list"
-msgstr ""
-
 #: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
+msgid "Delete this list"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
 msgid "Send _message to list..."
 msgstr ""
 
+#: ui/evolution-contact-list-editor.xml.h:12
+msgid "_Delete..."
+msgstr ""
+
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr ""
@@ -26181,7 +25914,7 @@ msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "Post New Message"
+msgid "Post Ne_w Message"
 msgstr "Can not open message"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26218,14 +25951,18 @@ msgstr ""
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:4
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr ""
 
+#: ui/evolution-mail-list.xml.h:4
+msgid "E_xpunge"
+msgstr ""
+
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr ""
@@ -26244,14 +25981,14 @@ msgid ""
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as R_ead"
+msgid "Mark All as _Read"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -26295,26 +26032,37 @@ msgstr ""
 msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:31
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr ""
@@ -26332,402 +26080,410 @@ msgid "Apply filter rules to the selected messages"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:5
-msgid "Compose a reply to all of the recipients of the selected message"
+msgid "Caret _Mode"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:6
-msgid "Compose a reply to the mailing list of the selected message"
+msgid "Compose a reply to all of the recipients of the selected message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:7
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "F_orward"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:37
 msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:38
 msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:45
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:46
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:56
 msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:57
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:62
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:63
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:64
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:65
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:62
-msgid "Post a Reply"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Post a Repl_y"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:69
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:70
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:71
 msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:74
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:75
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:76
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch Message..."
+#: ui/evolution-mail-message.xml.h:82
+msgid "S_earch in Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:85
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:86
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:89
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:90
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Undelete"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr ""
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -26736,7 +26492,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr ""
 
@@ -26752,7 +26508,7 @@ msgstr ""
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr ""
 
@@ -26784,6 +26540,11 @@ msgstr ""
 msgid "S/MIME Sign"
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr ""
@@ -26797,7 +26558,7 @@ msgid "Save in folder..."
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr ""
 
@@ -26814,7 +26575,7 @@ msgid "Send"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr ""
 
@@ -26879,7 +26640,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr ""
 
@@ -26895,11 +26656,11 @@ msgstr ""
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr ""
 
@@ -26975,15 +26736,19 @@ msgstr ""
 msgid "Mar_k as Complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:10
-msgid "Paste task from the clipboard"
+#: ui/evolution-tasks.xml.h:9
+msgid "Mark selected tasks as complete"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:11
+msgid "Paste task from the clipboard"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Previews the list of tasks to be printed"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:14
 msgid "Print the list of tasks"
 msgstr ""
 
@@ -27233,27 +26998,28 @@ msgid "_Work Week View"
 msgstr ""
 
 #: views/mail/galview.xml.h:1
-msgid "As Sent Folder"
-msgstr ""
+#, fuzzy
+msgid "As _Sent Folder"
+msgstr "Synchronising folder"
 
 #: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
+msgid "By S_tatus"
 msgstr ""
 
 #: views/mail/galview.xml.h:3
-msgid "By Sender"
+msgid "By Se_nder"
 msgstr ""
 
 #: views/mail/galview.xml.h:4
-msgid "By Status"
+msgid "By Su_bject"
 msgstr ""
 
 #: views/mail/galview.xml.h:5
-msgid "By Subject"
+msgid "By _Follow Up Flag"
 msgstr ""
 
 #: views/mail/galview.xml.h:6
-msgid "Messages"
+msgid "_Messages"
 msgstr ""
 
 #: views/tasks/galview.xml.h:1
@@ -27308,20 +27074,20 @@ 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:427
+#: widgets/misc/e-calendar-item.c:456
 msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
+#: widgets/misc/e-calendar-item.c:1174
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
 msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
 msgid "Today"
 msgstr ""
 
@@ -27438,22 +27204,6 @@ msgstr ""
 msgid "_Advanced..."
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr ""
-
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr ""
-
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr ""
-
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr ""
-
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr ""
@@ -27500,6 +27250,26 @@ msgid "Evolution Addressbook local file backend"
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Can not get message: %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "by %B %d, %Y, %l:%M %P"
+#~ msgstr "%a %d/%m/%Y %I:%M %p"
+
+#, fuzzy
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "Scanning folders ..."
+#~ msgstr "Synchronising folders"
+
+#, fuzzy
 #~ msgid "Evolution Mail font configuration control"
 #~ msgstr "Cannot initialise Evolution's mail component."
 
@@ -27533,19 +27303,12 @@ msgstr ""
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "Warning: Unsent Messages"
-#~ msgstr "Can not open message"
-
-#, fuzzy
 #~ msgid "Cannot initialize the Evolution mail component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #~ msgid "Cannot initialize Evolution's mail config component."
 #~ msgstr "Cannot initialise Evolution's mail config component."
 
-#~ msgid "Cannot initialize Evolution's folder info component."
-#~ msgstr "Cannot initialise Evolution's folder info component."
-
 #, fuzzy
 #~ msgid "Apri file"
 #~ msgstr "Synchronising folder"
@@ -27554,9 +27317,6 @@ msgstr ""
 #~ msgid "Factory for the Evolution Summary component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
-#~ msgid "Executive summary component could not initialize Bonobo.\n"
-#~ msgstr "Could not initialise Bonobo.\n"
-
 #, fuzzy
 #~ msgid "Configuration control for Evolution folder settings."
 #~ msgstr "Cannot initialise Evolution's mail component."
@@ -27652,9 +27412,6 @@ msgstr ""
 #~ msgid "Summarising folder"
 #~ msgstr "Synchronising folder"
 
-#~ msgid "Cannot initialize Evolution's Executive Summary component."
-#~ msgstr "Can not initialise Evolution's Executive Summary component."
-
 #~ msgid "KBOS:EGAA:RJTT"
 #~ msgstr "YPAD:YBBN:YSCB:YMML:YPPH:YSSY"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 3e2c149b2a..6972c0d61a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2003-06-25 13:24-0400\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -13,67 +13,196 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
-msgid "Evolution VCard importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "Colours"
+
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card.c:1347
+#: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
+#: addressbook/backend/ebook/e-card.c:1354
+#, fuzzy
+msgid "Birth date"
+msgstr "Organisation:"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card.c:1374
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1430
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniversary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1436
+msgid "Mailer"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1443
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1457
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Colours"
+
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1471
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Organisation:"
+
+#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
+msgid "List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -109,12 +238,6 @@ msgid "Home"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
@@ -233,21 +356,9 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr ""
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -258,12 +369,6 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr ""
 
@@ -272,32 +377,9 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr ""
-
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
@@ -321,11 +403,6 @@ msgid "icsCalendar"
 msgstr "Colours"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr ""
 
@@ -333,12 +410,6 @@ msgstr ""
 msgid "Birth Date"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr ""
-
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr ""
@@ -354,111 +425,33 @@ msgid "%x"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-destination.c:709
 msgid "Unnamed List"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
-msgid "Address"
-msgstr "Colours"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
-msgid "Birth date"
-msgstr "Organisation:"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1374
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Organizational Unit"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
-msgid "Mailer"
-msgstr ""
+msgid "Evolution LDIF importer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1457
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 #, fuzzy
-msgid "ICS Calendar"
-msgstr "Colours"
+msgid "Evolution VCard Importer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/backend/ebook/e-card.c:1471
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 #, fuzzy
-msgid "Related Contacts"
-msgstr "Organisation:"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1506
-msgid "List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr ""
+msgid "Evolution VCard importer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:171
-msgid "Could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
-
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
 msgid "Searching..."
@@ -516,14 +509,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr ""
 
@@ -532,142 +525,6 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Cannot initialise the Evolution shell."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:620
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public Contacts"
-msgstr "Organisation:"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "New Contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "_Contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:575
-msgid "Create a new contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "Contact _List"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:579
-msgid "Create a new contact list"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-#, fuzzy
-msgid "Other Contacts"
-msgstr "Organisation:"
-
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -776,6 +633,103 @@ msgstr ""
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:628
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Organisation:"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "New Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "_Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "Create a new contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "New Contact List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:587
+msgid "Create a new contact list"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-storage.c:178
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Organisation:"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -804,33 +758,72 @@ msgstr ""
 msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:914
+#: addressbook/gui/component/e-address-popup.c:917
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:998
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-popup.c:1001
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1028
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1053
+#: addressbook/gui/component/e-address-popup.c:1056
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Cannot initialise the Evolution shell."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -972,10 +965,9 @@ msgstr ""
 msgid "S_earch scope: "
 msgstr ""
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1256
+#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr ""
 
@@ -1161,11 +1153,11 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr ""
 
@@ -1206,20 +1198,24 @@ msgstr ""
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr ""
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
@@ -1243,12 +1239,8 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
@@ -1321,7 +1313,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:197
+#: calendar/gui/dialogs/task-editor.c:200
 msgid "Details"
 msgstr ""
 
@@ -1386,11 +1378,13 @@ msgid "_Categories..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
-#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr ""
 
@@ -1432,15 +1426,15 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
+#: addressbook/gui/widgets/e-minicard.c:183
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #, fuzzy
 msgid "Editable"
 msgstr "Synchronising \"%s\""
@@ -2472,17 +2466,17 @@ msgstr ""
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 msgid "Book"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
+#: addressbook/gui/widgets/e-minicard-widget.c:93
 #, fuzzy
 msgid "Card"
 msgstr "Colours"
@@ -2702,7 +2696,7 @@ msgstr ""
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2745,7 +2739,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr ""
@@ -2764,10 +2758,10 @@ msgid "%d cards"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 msgid "Query"
 msgstr ""
 
@@ -2775,247 +2769,246 @@ msgstr ""
 msgid "Error getting book view"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 msgid "Model"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
 msgid "Unknown error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1210
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:785
-#: camel/camel-service.c:875 camel/camel-service.c:917
-#: camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
+#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Addressbook does not exist"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "_Discard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 msgid "Copy cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, c-format
 msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.c:398
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-#: addressbook/gui/widgets/e-addressbook-view.c:895
-#: addressbook/gui/widgets/e-addressbook-view.c:1879
+#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1883
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Addressbook Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:912
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: calendar/gui/e-cal-view.c:1109
 msgid "Current View"
 msgstr ""
 
@@ -3023,7 +3016,7 @@ msgstr ""
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:949
+#: addressbook/gui/widgets/e-addressbook-view.c:953
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3031,11 +3024,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:954
+#: addressbook/gui/widgets/e-addressbook-view.c:958
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1352
+#: addressbook/gui/widgets/e-addressbook-view.c:1356
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3103,6 +3096,30 @@ msgstr ""
 msgid "Primary Phone"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3116,21 +3133,6 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:146
-msgid "Width"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:153
-msgid "Height"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:161
-msgid "Has Focus"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr ""
@@ -3147,10 +3149,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3171,13 +3169,8 @@ msgstr ""
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:169
-#, fuzzy
-msgid "Selected"
-msgstr "Synchronising \"%s\""
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3188,20 +3181,20 @@ msgstr ""
 msgid "GTK Tree View"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.c:1139
+#: addressbook/printing/e-contact-print.c:1158
 msgid "Print cards"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1204
-#: addressbook/printing/e-contact-print.c:1226
+#: addressbook/printing/e-contact-print.c:1224
+#: addressbook/printing/e-contact-print.c:1250
 msgid "Print card"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr ""
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr ""
@@ -3372,6 +3365,60 @@ msgstr ""
 msgid "_Font..."
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+msgid "List local addressbook folders"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "[vcard|csv]"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+msgid "Impossible internal error."
+msgstr ""
+
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr ""
@@ -3501,28 +3548,30 @@ msgid "31st"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:912
 msgid "High"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
+#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:910
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr ""
 
@@ -3530,13 +3579,13 @@ msgstr ""
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3544,82 +3593,34 @@ msgstr ""
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Cannot initialise the Evolution shell."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks component"
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Cannot initialise the Evolution shell."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Cannot initialise the Evolution shell."
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 #, fuzzy
 msgid "Starting:"
 msgstr "Synchronise \"%s\""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Cannot initialise the Evolution shell."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 #, fuzzy
 msgid "C_lose"
 msgstr "Colours"
@@ -3636,16 +3637,25 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3653,7 +3663,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3664,53 +3674,63 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize Bonobo"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:176
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
+#: calendar/gui/alarm-notify/notify-main.c:185
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
+#: calendar/gui/calendar-commands.c:376
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
+#: calendar/gui/calendar-commands.c:382
+msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
-msgid "Unmatched"
+#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
+#: calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%m/%d/%Y"
@@ -3718,17 +3738,17 @@ msgstr "%m/%d/%Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:518
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:849
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3748,11 +3768,11 @@ msgstr "Colours"
 msgid "Public folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr ""
@@ -3818,163 +3838,86 @@ msgstr ""
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1204
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
-#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
+#: calendar/gui/calendar-view-factory.c:118
+msgid "Day View"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
+#: calendar/gui/calendar-view-factory.c:121
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
+#: calendar/gui/calendar-view-factory.c:124
+msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
+#: calendar/gui/calendar-view-factory.c:127
+msgid "Month View"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
-msgstr ""
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Synchronising \"%s\""
 
-#: calendar/gui/calendar-view-factory.c:118
-msgid "Day View"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:121
-msgid "Work Week View"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:124
-msgid "Week View"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:127
-msgid "Month View"
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
+msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/comp-editor-factory.c:462
 msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:125
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:420
+#: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:429
+#: calendar/gui/dialogs/alarm-options.c:475
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:438
+#: calendar/gui/dialogs/alarm-options.c:484
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/dialogs/alarm-options.c:447
+#: calendar/gui/dialogs/alarm-options.c:493
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:456
+#: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -4012,10 +3955,6 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr ""
@@ -4028,7 +3967,8 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
 msgid "minutes"
 msgstr ""
 
@@ -4042,11 +3982,11 @@ msgstr ""
 msgid "Date/Time:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr ""
 
@@ -4054,7 +3994,7 @@ msgstr ""
 msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr ""
 
@@ -4064,7 +4004,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr ""
 
@@ -4148,7 +4089,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr ""
 
@@ -4162,7 +4103,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr ""
 
@@ -4172,7 +4113,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr ""
 
@@ -4186,7 +4127,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr ""
 
@@ -4205,7 +4146,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr ""
 
@@ -4223,7 +4164,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr ""
 
@@ -4233,12 +4174,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr ""
 
@@ -4345,75 +4286,50 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
-msgid " (Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
-msgid "Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
-msgid "Due "
-msgstr ""
-
 #: calendar/gui/dialogs/comp-editor.c:334
 #, fuzzy
 msgid "Could not update invalid object"
@@ -4461,21 +4377,47 @@ msgid "No summary"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
-#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/dialogs/comp-editor.c:1406
-#: calendar/gui/dialogs/comp-editor.c:1432
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1459
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
+msgid " (Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
+msgid "Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
+msgid "Due "
+msgstr ""
+
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4578,31 +4520,31 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
 msgid "Start date is wrong"
 msgstr ""
 
@@ -4638,8 +4580,7 @@ msgid "Classification"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
+msgid "Co_nfidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:7
@@ -4666,7 +4607,6 @@ msgid "Pu_blic"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr ""
 
@@ -4683,74 +4623,34 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:630
 msgid "_Delegate To..."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
@@ -4763,7 +4663,7 @@ msgid "_Change Organizer"
 msgstr "Organisation:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr ""
 
@@ -4912,7 +4812,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr ""
 
@@ -4937,52 +4837,80 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 msgid "Completed date is wrong"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
-msgid "% Complete"
+msgid "% _Complete"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311
+msgid "Completed"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
+msgid "In Progress"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305
+msgid "Not Started"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
+msgid "_Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Web Page:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:204
-#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:480
+#: calendar/gui/dialogs/task-page.c:482
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.c:542
+msgid "Due date is before start date!"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr ""
@@ -4995,223 +4923,258 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
+msgid "Public"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
+msgid "Private"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
+msgid "Confidential"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1933
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:393
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
-#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Save as..."
+#: calendar/gui/e-calendar-table.c:989
+msgid "Open _Web Page"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Save As..."
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
+#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
-#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
+#: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
-#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
+#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
-#: calendar/gui/e-week-view.c:4335
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr ""
 
@@ -5220,11 +5183,12 @@ msgid "Completion Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr ""
+#, fuzzy
+msgid "Description"
+msgstr "Synchronising \"%s\""
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
+msgid "Due Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:11
@@ -5235,579 +5199,627 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr "Colours"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+#: calendar/gui/e-calendar-table.etspec.h:20
+msgid "component"
+msgstr ""
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/e-cal-model.c:828
+msgid "Recurring"
 msgstr ""
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
-msgid "%A %d %B"
+#: calendar/gui/e-cal-model.c:830
+msgid "Assigned"
 msgstr ""
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "Yes"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:809
-msgid "am"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "No"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:811
-msgid "pm"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3694
-msgid "New _Appointment"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:550
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+msgid "New _Appointment..."
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
+#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
-#: ui/evolution-calendar.xml.h:34
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
+#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
 #: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "Cannot initialise the Evolution shell."
 
-#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
-#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
+#: calendar/gui/e-cal-view.c:1139
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
+#: calendar/gui/e-cal-view.c:1140
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
+#: calendar/gui/e-cal-view.c:1145
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr ""
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr ""
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
+msgid "%A %d %B"
+msgstr ""
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr ""
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:676
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 msgid "Every day"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, c-format
 msgid "Every %d days"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 msgid "Every week"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, c-format
 msgid "Every %d weeks"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, c-format
 msgid "Every %d weeks on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 msgid "every month"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 msgid "Every year"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1005
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 #, fuzzy
 msgid "Location:"
 msgstr "Organisation"
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
-#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1309
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1381
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1402
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Synchronising \"%s\""
@@ -5849,248 +5861,274 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
+#: calendar/gui/e-meeting-time-sel.c:392
+msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
-msgid "Required Participants"
+#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
+#: calendar/gui/e-meeting-time-sel.c:395
+msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:82
-msgid "Resources"
+#: calendar/gui/e-meeting-time-sel.c:434
+msgid "_Options"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
-msgid "Individual"
+#: calendar/gui/e-meeting-time-sel.c:451
+msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
-msgid "Group"
+#: calendar/gui/e-meeting-time-sel.c:461
+msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
-msgid "Resource"
+#: calendar/gui/e-meeting-time-sel.c:476
+msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
-msgid "Room"
+#: calendar/gui/e-meeting-time-sel.c:491
+msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
-msgid "Chair"
+#: calendar/gui/e-meeting-time-sel.c:509
+msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
-msgid "Required Participant"
+#: calendar/gui/e-meeting-time-sel.c:524
+msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
-msgid "Optional Participant"
+#: calendar/gui/e-meeting-time-sel.c:541
+msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
-msgid "Non-Participant"
+#: calendar/gui/e-meeting-time-sel.c:550
+msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
-msgid "Needs Action"
+#: calendar/gui/e-meeting-time-sel.c:559
+msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
-msgid "Tentative"
+#: calendar/gui/e-meeting-time-sel.c:568
+msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
-msgid "Delegated"
+#: calendar/gui/e-meeting-time-sel.c:587
+msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
+#: calendar/gui/e-meeting-time-sel.c:607
+msgid "Meeting _end time:"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
+#: calendar/gui/e-meeting-time-sel.c:2054
+#: calendar/gui/e-meeting-time-sel-item.c:452
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2087
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
-msgid "Out of Office"
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:408
-msgid "No Information"
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:447
-msgid "_Options"
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:464
-msgid "Show _Only Working Hours"
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:474
-msgid "Show _Zoomed Out"
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:489
-msgid "_Update Free/Busy"
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:504
-msgid "_<<"
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:522
-msgid "_Autopick"
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:537
-msgid ">_>"
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:554
-msgid "_All People and Resources"
-msgstr ""
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:563
-msgid "All _People and One Resource"
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:572
-msgid "_Required People"
-msgstr ""
+#: calendar/gui/e-tasks.c:221
+#, fuzzy
+msgid "Start Date:"
+msgstr "Organisation:"
 
-#: calendar/gui/e-meeting-time-sel.c:581
-msgid "Required People and _One Resource"
-msgstr ""
+#: calendar/gui/e-tasks.c:237
+#, fuzzy
+msgid "Due Date:"
+msgstr "Organisation:"
 
-#: calendar/gui/e-meeting-time-sel.c:600
-msgid "Meeting _start time:"
+#. write priority
+#: calendar/gui/e-tasks.c:265
+msgid "Priority:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:620
-msgid "Meeting _end time:"
+#. URL
+#: calendar/gui/e-tasks.c:321
+msgid "Web Page:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
-#: calendar/gui/gnome-cal.c:2017
+#: calendar/gui/e-tasks.c:702
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:746
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:899
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:922
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1017
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3581
-msgid "New _Appointment..."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1481
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1556
+#: calendar/gui/gnome-cal.c:1772
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/gnome-cal.c:1748
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1757
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1988
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2028
+#: calendar/gui/gnome-cal.c:2197
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Synchronising \"%s\""
 
+#: calendar/gui/gnome-cal.c:3094
+#, fuzzy, c-format
+msgid "Purging event %s"
+msgstr "Synchronise \"%s\""
+
+#: calendar/gui/gnome-cal.c:3178
+msgid "Purging"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Cannot initialise the Evolution shell."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Cannot initialise the Evolution shell."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Cannot initialise the Evolution shell."
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -6197,7 +6235,7 @@ msgstr ""
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6230,82 +6268,81 @@ msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1882
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1919
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1927
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1934
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2262
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2321
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2338
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2362
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2387
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2559
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2632
 msgid "Print Setup"
 msgstr ""
 
@@ -6313,7 +6350,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:465
+#: calendar/gui/tasks-control.c:448
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6321,11 +6358,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:468
+#: calendar/gui/tasks-control.c:451
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:610
+#: calendar/gui/tasks-control.c:593
 msgid "Print Tasks"
 msgstr ""
 
@@ -8016,27 +8053,27 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:167
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:207
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:251
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:293
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:331
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:363
 msgid "You may not export keys with this cipher"
 msgstr ""
 
@@ -8069,7 +8106,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Synchronising \"%s\""
@@ -8090,59 +8131,59 @@ msgstr "Synchronising \"%s\""
 msgid "Failed to create create child process '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -8164,50 +8205,54 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:346
+#: camel/camel-folder.c:585
 #, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
+msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:356
+#: camel/camel-folder.c:1163
 #, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
+msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
-msgid "(match-all) requires a single bool result"
+#: camel/camel-folder.c:1203
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:653
-#, c-format
-msgid "Performing query on unknown header: %s"
+#: camel/camel-folder.c:1321
+msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
+#: camel/camel-folder.c:1321
+msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-folder.c:1161
+#: camel/camel-folder.c:1571
+msgid "Filtering new message(s)"
+msgstr ""
+
+#: camel/camel-folder-search.c:348
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
 msgstr ""
 
-#: camel/camel-folder.c:1201
+#: camel/camel-folder-search.c:358
 #, c-format
-msgid "Unsupported operation: search by uids: for %s"
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
 msgstr ""
 
-#: camel/camel-folder.c:1319
-msgid "Moving messages"
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder.c:1319
-msgid "Copying messages"
+#: camel/camel-folder-search.c:650
+#, c-format
+msgid "Performing query on unknown header: %s"
 msgstr ""
 
 #: camel/camel-gpg-context.c:762
@@ -8235,7 +8280,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr ""
 
@@ -8287,44 +8332,44 @@ msgstr ""
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:111
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:124
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:215
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
 #: camel/camel-movemail.c:107
@@ -8393,11 +8438,11 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 msgid "parse error"
 msgstr ""
 
@@ -8459,11 +8504,11 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:46
+#: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:50
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8554,7 +8599,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1207
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8608,23 +8653,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
@@ -8633,56 +8678,56 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:285
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:293
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:738
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:783 camel/camel-service.c:915
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:818
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:880
+#: camel/camel-service.c:860
 #, fuzzy
 msgid "Resolving address"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-service.c:949
+#: camel/camel-service.c:929
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:952
+#: camel/camel-service.c:932
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8694,12 +8739,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8743,132 +8788,132 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:212
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8877,15 +8922,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8898,7 +8943,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8908,28 +8953,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -8941,17 +8986,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
@@ -8978,12 +9023,12 @@ msgstr "Synchronising \"%s\""
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2806
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2809
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9020,62 +9065,62 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1883
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1943
-#: camel/providers/imap/camel-imap-folder.c:2539
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2203
-#: camel/providers/imap/camel-imap-folder.c:2273
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2577
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9125,85 +9170,100 @@ msgstr ""
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:63
-msgid "IMAP"
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:65
+msgid "IMAP"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/imap/camel-imap-store.c:589
+#: camel/providers/imap/camel-imap-store.c:821
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:655
+#: camel/providers/imap/camel-imap-store.c:686
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:687
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:824
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/imap/camel-imap-store.c:1237
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9211,42 +9271,68 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1660
+#: camel/providers/imap/camel-imap-store.c:1802
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2003
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2015
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2051
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+msgid "IMAP+"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-local-folder.c:179
+msgid "Index message body data"
+msgstr ""
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:379
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:383
+#: camel/providers/local/camel-local-folder.c:386
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:390
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -9300,50 +9386,54 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9357,17 +9447,17 @@ msgstr ""
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr ""
 
@@ -9381,7 +9471,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9443,76 +9533,108 @@ msgstr ""
 msgid "Storing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:289
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:349
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:352
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-mbox-store.c:427
+msgid "The new folder name is illegal."
+msgstr ""
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9542,7 +9664,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
@@ -9559,38 +9681,38 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
@@ -9668,6 +9790,63 @@ msgid ""
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+#, fuzzy
+msgid "Failed to send username to server"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr "Synchronising \"%s\""
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
@@ -9676,58 +9855,58 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, c-format
 msgid "Could not get group: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -9736,13 +9915,6 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-msgid "User cancelled"
-msgstr ""
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
@@ -9752,34 +9924,22 @@ msgstr "Synchronising \"%s\""
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 msgid "Unknown reason"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr ""
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr ""
@@ -9933,140 +10093,140 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:298
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:372
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10074,87 +10234,87 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10162,67 +10322,66 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -10254,151 +10413,76 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr ""
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr ""
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr ""
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr ""
-
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr ""
-
-#: composer/e-msg-composer.c:535
+#: composer/e-msg-composer.c:562
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Synchronising \"%s\""
 
-#: composer/e-msg-composer.c:814
+#: composer/e-msg-composer.c:841
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1177
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1195
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1218
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1287
+#: composer/e-msg-composer.c:1325
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1296
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1594
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10406,34 +10490,34 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1593
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:2017
+#: composer/e-msg-composer.c:2054
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2934
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2962
+#: composer/e-msg-composer.c:3030
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10441,18 +10525,92 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3029
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4045
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
+#: composer/e-msg-composer-hdrs.c:290
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr ""
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr ""
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr ""
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr ""
+
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr ""
+
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10609,7 +10767,7 @@ msgid ""
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr ""
 
@@ -10631,98 +10789,214 @@ msgstr ""
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 #, fuzzy
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 #, fuzzy
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 #, fuzzy
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 #, fuzzy
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 #, fuzzy
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 #, fuzzy
 msgid "%m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 #, fuzzy
 msgid "%m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 #, fuzzy
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%H:%M"
 msgstr ""
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr ""
 
+#: executive-summary/component/component-factory.c:151
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: executive-summary/component/e-summary.c:925
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr "Synchronising \"%s\""
+
+#: executive-summary/component/e-summary.c:939
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:125
+#, fuzzy
+msgid "Select a service"
+msgstr "Synchronising \"%s\""
+
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Send an email to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Colours"
+
+#: executive-summary/component/e-summary-url.c:76
+#, c-format
+msgid "Move %s to the left"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Synchronising \"%s\""
+
+#: executive-summary/component/e-summary-url.c:553
+#, fuzzy
+msgid "page"
+msgstr "Organisation:"
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+msgid "Error"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+msgid "Update now"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:795
+msgid "Update every "
+msgstr ""
+
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr ""
@@ -10842,82 +11116,6 @@ msgstr "Synchronising \"%s\""
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
-msgid "Important"
-msgstr ""
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-msgid "Work"
-msgstr ""
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr ""
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr ""
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr ""
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr ""
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr ""
@@ -11012,6 +11210,82 @@ msgstr ""
 msgid "years"
 msgstr ""
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+msgid "Important"
+msgstr ""
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr ""
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1458
+msgid "Later"
+msgstr ""
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr ""
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr ""
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr ""
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr ""
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr ""
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr ""
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11034,218 +11308,218 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date received"
+msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
+#: filter/libfilter-i18n.h:11
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Deleted"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
+msgid "Follow Up"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "does not start with"
+msgid "Label"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
+msgid "Pipe Message to Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
+msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
+msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
-msgid "is before"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "is Flagged"
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "is greater than"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr ""
+#, fuzzy
+msgid "Shell Command"
+msgstr "Colours"
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
+msgid "Size (kB)"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
-msgid "Label"
+msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
+#: filter/libfilter-i18n.h:35
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Message Body"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
-msgid "Message Header"
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
+msgid "Unset Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
+msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
-msgid "Read"
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
+msgid "does not return"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
+msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:49
+msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
-msgid "Sender"
+#: filter/libfilter-i18n.h:50
+msgid "is after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
+msgid "is before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "Shell Command"
-msgstr "Colours"
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
+msgid "is not Flagged"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
+msgid "returns greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:58
+msgid "returns less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
+msgid "returns"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
-msgid "Subject"
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
+msgid "starts with"
 msgstr ""
 
-#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:916
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11315,10 +11589,9 @@ msgid "Scanning %s"
 msgstr "Synchronise \"%s\""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr ""
 
@@ -11381,7 +11654,7 @@ msgstr ""
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr ""
 
@@ -11397,7 +11670,7 @@ msgid "Scanning directory"
 msgstr "Synchronising \"%s\""
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:541
+#: shell/e-shell-startup-wizard.c:556
 msgid "Starting import"
 msgstr ""
 
@@ -11429,339 +11702,152 @@ msgstr ""
 msgid "Pine"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Cannot initialise the Evolution shell."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr ""
-
-#: mail/component-factory.c:117
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:147
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:819
+#: mail/component-factory.c:826
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:1000
+#: mail/component-factory.c:1008
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:1023
+#: mail/component-factory.c:1031
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1064
+#: mail/component-factory.c:1072
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 #, fuzzy
 msgid "New Message Post"
 msgstr "Colours"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 msgid "_Post Message"
 msgstr ""
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1081
 msgid "Post a new mail message"
 msgstr ""
 
-#: mail/component-factory.c:1365
+#: mail/component-factory.c:1373
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1376
+#: mail/component-factory.c:1384
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:486
-#, c-format
-msgid "Properties for \"%s\""
-msgstr ""
-
-#: mail/folder-browser-ui.c:488
-msgid "Properties"
-msgstr ""
-
-#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr ""
-
-#: mail/folder-browser.c:782
-#, c-format
-msgid "%d new"
-msgstr ""
-
-#: mail/folder-browser.c:785 mail/folder-browser.c:793
-#: mail/folder-browser.c:796
-msgid ", "
-msgstr ""
-
-#: mail/folder-browser.c:787
-#, c-format
-msgid "%d hidden"
-msgstr ""
-
-#: mail/folder-browser.c:789
-#, c-format
-msgid "%d visible"
-msgstr ""
-
-#: mail/folder-browser.c:794
-#, c-format
-msgid "%d selected"
-msgstr ""
-
-#: mail/folder-browser.c:799
-#, c-format
-msgid "%d unsent"
-msgstr ""
-
-#: mail/folder-browser.c:801
-#, c-format
-msgid "%d sent"
-msgstr ""
-
-#: mail/folder-browser.c:803
-#, c-format
-msgid "%d total"
-msgstr ""
-
-#: mail/folder-browser.c:1182
-msgid "Create _Virtual Folder From Search..."
-msgstr ""
-
-#: mail/folder-browser.c:1736
-msgid "VFolder on _Subject"
-msgstr ""
-
-#: mail/folder-browser.c:1737
-msgid "VFolder on Se_nder"
-msgstr ""
-
-#: mail/folder-browser.c:1738
-msgid "VFolder on _Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:1739
-msgid "VFolder on Mailing _List"
-msgstr ""
-
-#: mail/folder-browser.c:1743
-msgid "Filter on Sub_ject"
-msgstr ""
-
-#: mail/folder-browser.c:1744
-msgid "Filter on Sen_der"
-msgstr ""
-
-#: mail/folder-browser.c:1745
-msgid "Filter on Re_cipients"
-msgstr ""
-
-#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
-msgid "Filter on _Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:1764
-msgid "_Edit as New Message..."
-msgstr ""
-
-#: mail/folder-browser.c:1766
-msgid "_Print"
-msgstr ""
-
-#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
-msgid "_Reply to Sender"
-msgstr ""
-
-#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
-msgid "Reply to _List"
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
 msgstr ""
 
-#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
-msgid "Reply to _All"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
 msgstr ""
 
-#: mail/folder-browser.c:1773
-msgid "_Forward"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/folder-browser.c:1777
-msgid "Follo_w Up..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/folder-browser.c:1778
-msgid "Fla_g Completed"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/folder-browser.c:1779
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Cl_ear Flag"
-msgstr "Colours"
-
-#. separator here?
-#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
-msgid "Mar_k as Read"
-msgstr ""
-
-#: mail/folder-browser.c:1784
-msgid "Mark as _Unread"
-msgstr ""
-
-#: mail/folder-browser.c:1785
-msgid "Mark as _Important"
-msgstr ""
-
-#: mail/folder-browser.c:1786
-msgid "_Mark as Unimportant"
-msgstr ""
-
-#: mail/folder-browser.c:1791
-msgid "U_ndelete"
-msgstr ""
+msgid "Evolution Mail"
+msgstr "Cannot initialise the Evolution shell."
 
-#: mail/folder-browser.c:1795
-msgid "Mo_ve to Folder..."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/folder-browser.c:1804
-msgid "Add Sender to Address_book"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/folder-browser.c:1808
-msgid "Appl_y Filters"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/folder-browser.c:1812
-msgid "Crea_te Rule From Message"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/folder-browser.c:2071
-msgid "VFolder on M_ailing List"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Cannot initialise Evolution's mail summary component."
 
-#: mail/folder-browser.c:2073
-#, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Cannot initialise Evolution's mail summary component."
 
-#: mail/folder-browser.c:2074
-#, c-format
-msgid "VFolder on M_ailing List (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
 msgstr ""
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-#, fuzzy
-msgid "Default"
-msgstr "Synchronising \"%s\""
-
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -11848,7 +11934,7 @@ msgstr ""
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1886
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11880,16 +11966,16 @@ msgstr "Synchronising \"%s\""
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 msgid "Protocol"
 msgstr ""
 
@@ -11929,182 +12015,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr ""
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr ""
-
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr ""
-
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:2344
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:2393
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:2403
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr ""
-
-#: mail/mail-callbacks.c:2465
-#, fuzzy, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-callbacks.c:2470
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:2686
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2781
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr ""
-
-#: mail/mail-callbacks.c:2830
-#, c-format
-msgid "Page %d of %d"
-msgstr ""
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr ""
-
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr ""
-
-#: mail/mail-callbacks.c:3147
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr ""
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12131,47 +12041,55 @@ msgstr ""
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:369
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:377
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:389
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:396
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12180,14 +12098,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr ""
@@ -12304,6 +12214,11 @@ msgstr ""
 msgid "De_fault"
 msgstr ""
 
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Synchronising \"%s\""
+
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr ""
@@ -12744,500 +12659,295 @@ msgstr ""
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
-#, fuzzy
-msgid "color"
-msgstr "Colours"
-
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr ""
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr ""
-
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
-msgstr ""
-
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
-msgstr ""
-
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr ""
-
-#: mail/mail-display.c:197
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr ""
-
-#: mail/mail-display.c:409
-#, fuzzy, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-display.c:457
-msgid "Save Attachment..."
-msgstr ""
-
-#: mail/mail-display.c:458
-msgid "View Inline"
-msgstr ""
-
-#: mail/mail-display.c:459
-#, c-format
-msgid "Open in %s..."
-msgstr ""
-
-#: mail/mail-display.c:515
-#, c-format
-msgid "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:519
-msgid "Hide"
-msgstr ""
-
-#: mail/mail-display.c:539
-msgid "External Viewer"
-msgstr ""
-
-#: mail/mail-display.c:1368
-msgid "Downloading images"
-msgstr ""
-
-#: mail/mail-display.c:1545
-msgid "Loading message content"
-msgstr ""
-
-#: mail/mail-display.c:1887
-msgid "Overdue:"
-msgstr ""
-
-#: mail/mail-display.c:1891
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %P"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#: mail/mail-display.c:2255
-msgid "Open Link in Browser"
-msgstr ""
-
-#: mail/mail-display.c:2256
-msgid "Copy Link Location"
-msgstr ""
-
-#: mail/mail-display.c:2258
-msgid "Save Link as (FIXME)"
-msgstr ""
-
-#: mail/mail-display.c:2260
-msgid "Save Image as..."
-msgstr ""
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:832
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-format.c:665
-#, c-format
-msgid "%s attachment"
-msgstr ""
-
-#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
-#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-
-#: mail/mail-format.c:785 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr ""
-
-#: mail/mail-format.c:871
-msgid "Bad Address"
-msgstr ""
-
-#: mail/mail-format.c:912 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr ""
-
-#: mail/mail-format.c:916
-msgid "Reply-To"
-msgstr ""
-
-#: mail/mail-format.c:921 mail/message-list.etspec.h:14
-msgid "To"
-msgstr ""
-
-#: mail/mail-format.c:926
-msgid "Cc"
-msgstr ""
-
-#: mail/mail-format.c:931
-msgid "Bcc"
-msgstr ""
-
-#: mail/mail-format.c:1482
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1510
-#, fuzzy
-msgid "Could not create a PGP verfication context"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-format.c:1518
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1525
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1789
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1800
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1803
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1830
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1836
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1838
-msgid "Malformed external-body part."
-msgstr ""
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:711
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:792
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:848
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:900
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1323
+#: mail/mail-local.c:1363
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1388
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1448
+#: mail/mail-local.c:1488
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:1512
+#: mail/mail-local.c:1552
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:259
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:262
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:913
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:87
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:550 mail/mail-ops.c:579
-msgid "However, the message was successfully sent."
+#: mail/mail-ops.c:557
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:578
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:587
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1437
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1531
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1582
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1666
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr ""
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr ""
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr ""
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr ""
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr ""
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr ""
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr ""
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr ""
-
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:259
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:308
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:390
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:229
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:262
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:264
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:287
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:288
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13282,21 +12992,17 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:438
-msgid "Forwarded Message"
-msgstr ""
-
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:91
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:209
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:467
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13305,102 +13011,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:776
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:834
 #, fuzzy
 msgid "vFolders"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:873
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:965
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr ""
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr ""
-
-#: mail/message-list.c:741
+#: mail/message-list.c:900
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:742
+#: mail/message-list.c:901
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:743
+#: mail/message-list.c:902
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:744
+#: mail/message-list.c:903
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:745
+#: mail/message-list.c:904
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:749
+#: mail/message-list.c:908
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:750
+#: mail/message-list.c:909
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:754
+#: mail/message-list.c:913
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:755
+#: mail/message-list.c:914
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1231
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1238
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1247
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1259
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1267
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1269
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3062
 msgid "Generating message list"
 msgstr ""
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr ""
+
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr ""
@@ -13417,6 +13118,10 @@ msgstr ""
 msgid "Follow Up Flag"
 msgstr ""
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr ""
+
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
@@ -13430,6 +13135,10 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr ""
+
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr ""
@@ -13446,7 +13155,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr ""
 
@@ -13454,11 +13163,11 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
 msgid "Reply to All"
 msgstr ""
 
@@ -13488,39 +13197,6 @@ msgstr ""
 msgid "_Flag:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr ""
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr ""
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr ""
-
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -13537,18 +13213,121 @@ msgid "S_erver:"
 msgstr "Synchronising \"%s\""
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Scanning folders ..."
-msgstr "Synchronising \"%s\""
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
 msgstr ""
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr ""
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr ""
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr ""
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:384
+msgid "Appointments"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:392
+msgid "No appointments."
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:409
+msgid "%k:%M %d %B"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:411
+msgid "%l:%M%p %d %B"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:429
+msgid "No description"
+msgstr ""
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:349
+msgid "No tasks"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:387
+msgid "blue"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:387
+msgid "(No Description)"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:72
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:261
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr ""
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:582
+msgid "KBOS"
+msgstr ""
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
@@ -23411,110 +23190,6 @@ msgstr ""
 msgid "Zurich"
 msgstr ""
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:389
-msgid "No appointments."
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:408
-msgid "%l:%M%P %d %B"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr ""
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr ""
-
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr ""
-
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr ""
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr ""
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr ""
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr ""
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr ""
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr ""
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr ""
@@ -24778,24 +24453,27 @@ msgstr ""
 msgid "_Show full path for folders"
 msgstr "Synchronising \"%s\""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
+#: notes/component-factory.c:27
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#: notes/component-factory.c:27
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "Cannot initialise the Evolution shell."
+msgid "Create a new note"
+msgstr "Synchronising \"%s\""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#: notes/component-factory.c:152
 #, fuzzy
-msgid "Evolution folder settings configuration control"
+msgid "Cannot initialize Evolution's notes component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#: notes/main.c:30
 #, fuzzy
-msgid "Folder Settings"
-msgstr "Synchronising \"%s\""
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Could not initialise Bonobo"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -24879,6 +24557,43 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr ""
+
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
@@ -24970,27 +24685,32 @@ msgid ""
 "%s"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:538
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:541
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:553
+#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:590
+#: shell/e-shell-folder-commands.c:587
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25026,118 +24746,127 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
+#: shell/e-shell-importer.c:151
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:317
+#: shell/e-shell-importer.c:323
 #, fuzzy
 msgid "Select importer"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:458
+#: shell/e-shell-importer.c:464
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
-#: shell/e-shell-importer.c:518
+#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
+#: shell/e-shell-importer.c:524
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-importer.c:475
+#: shell/e-shell-importer.c:481
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:484
+#: shell/e-shell-importer.c:490
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:503
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:523
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:540
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:588
+#: shell/e-shell-importer.c:594
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:637
-msgid "Filename:"
-msgstr ""
+#: shell/e-shell-importer.c:643
+#, fuzzy
+msgid "_Filename:"
+msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:651
-msgid "File type:"
+#: shell/e-shell-importer.c:658
+msgid "File _type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:676
-msgid "Import data and settings from older programs"
+#: shell/e-shell-importer.c:684
+msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:680
-msgid "Import a single file"
+#: shell/e-shell-importer.c:687
+msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
+#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:749
+#: shell/e-shell-importer.c:758
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
+#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1047
+#: shell/e-shell-importer.c:1061
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:1048
+#: shell/e-shell-importer.c:1062
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
-msgid "Import"
+#: shell/e-shell-importer.c:1193
+msgid "_Import"
 msgstr ""
 
 #: shell/e-shell-offline-handler.c:592
@@ -25198,12 +24927,20 @@ msgstr "Synchronising \"%s\""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:586
-#: shell/e-shell-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
+#: shell/e-shell-startup-wizard.c:771
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
 msgstr ""
 
+#: shell/e-shell-startup-wizard.c:782
+#, fuzzy
+msgid "Quit Assistant"
+msgstr "Cannot initialise the Evolution shell."
+
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr ""
@@ -25224,6 +24961,33 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr ""
+
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr ""
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr ""
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -25274,68 +25038,12 @@ msgstr ""
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr ""
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr ""
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
 msgstr ""
 
 #: shell/e-shortcuts-view.c:80
@@ -25453,18 +25161,6 @@ msgstr ""
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr ""
@@ -25522,6 +25218,14 @@ msgstr "Synchronising \"%s\""
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
+
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr ""
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25536,93 +25240,93 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1189
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1191
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1190
+#: shell/evolution-shell-component.c:1193
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1195
 msgid "No owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1197
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1199
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1198
+#: shell/evolution-shell-component.c:1201
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1200
+#: shell/evolution-shell-component.c:1203
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1202
+#: shell/evolution-shell-component.c:1205
 msgid "Internal error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1206
+#: shell/evolution-shell-component.c:1209
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1208
+#: shell/evolution-shell-component.c:1211
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1212
+#: shell/evolution-shell-component.c:1215
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Synchronising \"%s\""
 
-#: shell/evolution-shell-component.c:1214
+#: shell/evolution-shell-component.c:1217
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1216
+#: shell/evolution-shell-component.c:1219
 msgid "Old owner has died"
 msgstr ""
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr ""
@@ -25725,6 +25429,25 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Synchronising \"%s\""
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -25760,6 +25483,10 @@ msgstr ""
 msgid "Importers"
 msgstr ""
 
+#: shell/importer/intelligent.c:191
+msgid "Import"
+msgstr ""
+
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr ""
@@ -25929,7 +25656,7 @@ msgstr ""
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr ""
 
@@ -25937,9 +25664,9 @@ msgstr ""
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr ""
 
@@ -25983,17 +25710,21 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr ""
 
@@ -26061,46 +25792,58 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+msgid "Purg_e"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:24
+msgid "Purge old appointments and meetings"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:25
+msgid "Show as list"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close"
@@ -26111,7 +25854,7 @@ msgstr "Colours"
 msgid "Close this item"
 msgstr "Colours"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr ""
 
@@ -26124,47 +25867,57 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr ""
-
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+msgid "Save and _Close"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr ""
 
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr ""
+
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr ""
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr ""
 
@@ -26186,51 +25939,39 @@ msgstr ""
 msgid "Select all text"
 msgstr "Synchronising \"%s\""
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr ""
-
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete this list"
-msgstr ""
-
 #: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
+msgid "Delete this list"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
 msgid "Send _message to list..."
 msgstr ""
 
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Synchronising \"%s\""
+
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr ""
@@ -26305,8 +26046,9 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
-msgid "Post New Message"
-msgstr ""
+#, fuzzy
+msgid "Post Ne_w Message"
+msgstr "Colours"
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Post a message to a Public folder"
@@ -26341,14 +26083,18 @@ msgstr ""
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:4
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr ""
 
+#: ui/evolution-mail-list.xml.h:4
+msgid "E_xpunge"
+msgstr ""
+
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr ""
@@ -26367,14 +26113,14 @@ msgid ""
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as R_ead"
+msgid "Mark All as _Read"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -26418,26 +26164,38 @@ msgstr ""
 msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:31
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+#, fuzzy
+msgid "_Close"
+msgstr "Colours"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr ""
@@ -26455,402 +26213,409 @@ msgid "Apply filter rules to the selected messages"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:5
-msgid "Compose a reply to all of the recipients of the selected message"
+msgid "Caret _Mode"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:6
-msgid "Compose a reply to the mailing list of the selected message"
+msgid "Compose a reply to all of the recipients of the selected message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:7
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "F_orward"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:37
 msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:38
 msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:45
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:46
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:56
 msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:57
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:62
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:63
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:64
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:65
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:62
-msgid "Post a Reply"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Post a Repl_y"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:68
 msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:69
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:70
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:71
 msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:74
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:75
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:76
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch Message..."
+#: ui/evolution-mail-message.xml.h:82
+msgid "S_earch in Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:85
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:86
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:89
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:90
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Undelete"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-#, fuzzy
-msgid "_Close"
-msgstr "Colours"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr ""
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -26859,7 +26624,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr ""
 
@@ -26875,7 +26640,7 @@ msgstr ""
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr ""
 
@@ -26907,6 +26672,11 @@ msgstr ""
 msgid "S/MIME Sign"
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr ""
@@ -26920,7 +26690,7 @@ msgid "Save in folder..."
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr ""
 
@@ -26937,7 +26707,7 @@ msgid "Send"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr ""
 
@@ -27003,7 +26773,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr ""
 
@@ -27019,11 +26789,11 @@ msgstr ""
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr ""
 
@@ -27099,15 +26869,19 @@ msgstr ""
 msgid "Mar_k as Complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:10
-msgid "Paste task from the clipboard"
+#: ui/evolution-tasks.xml.h:9
+msgid "Mark selected tasks as complete"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:11
+msgid "Paste task from the clipboard"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Previews the list of tasks to be printed"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:14
 msgid "Print the list of tasks"
 msgstr ""
 
@@ -27363,28 +27137,29 @@ msgstr ""
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
-msgid "As Sent Folder"
+msgid "As _Sent Folder"
 msgstr "Synchronising \"%s\""
 
 #: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
+msgid "By S_tatus"
 msgstr ""
 
 #: views/mail/galview.xml.h:3
-msgid "By Sender"
+msgid "By Se_nder"
 msgstr ""
 
 #: views/mail/galview.xml.h:4
-msgid "By Status"
+msgid "By Su_bject"
 msgstr ""
 
 #: views/mail/galview.xml.h:5
-msgid "By Subject"
+msgid "By _Follow Up Flag"
 msgstr ""
 
 #: views/mail/galview.xml.h:6
-msgid "Messages"
-msgstr ""
+#, fuzzy
+msgid "_Messages"
+msgstr "Colours"
 
 #: views/tasks/galview.xml.h:1
 msgid "With _Category"
@@ -27438,20 +27213,20 @@ 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:427
+#: widgets/misc/e-calendar-item.c:456
 msgid "MTWTFSS"
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
+#: widgets/misc/e-calendar-item.c:1174
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
 msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
 msgid "Today"
 msgstr ""
 
@@ -27569,22 +27344,6 @@ msgstr ""
 msgid "_Advanced..."
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr ""
-
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr ""
-
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr ""
-
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr ""
-
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr ""
@@ -27634,6 +27393,22 @@ msgid "Evolution Addressbook local file backend"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Colours"
+
+#, fuzzy
+#~ msgid "by %B %d, %Y, %l:%M %P"
+#~ msgstr "%a %d/%m/%Y %I:%M %p"
+
+#, fuzzy
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Scanning folders ..."
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
 #~ msgid "Configure the fonts used by Evolution here"
 #~ msgstr "Cannot initialise Evolution's mail component."
 
@@ -27767,10 +27542,6 @@ msgstr ""
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "Cannot initialize Evolution's folder info component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "Factory to import mbox into Evolution"
 #~ msgstr "Cannot initialise Evolution's mail component."
 
@@ -27791,10 +27562,6 @@ msgstr ""
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "Executive summary component could not initialize Bonobo.\n"
-#~ msgstr "Could not initialise Bonobo"
-
-#, fuzzy
 #~ msgid "Configuration control for Evolution folder settings."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
@@ -27863,10 +27630,6 @@ msgstr ""
 #~ msgid "Summarising folder"
 #~ msgstr "Synchronising \"%s\""
 
-#, fuzzy
-#~ msgid "Cannot initialize Evolution's Executive Summary component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
 #~ msgid "%d/%m/%Y"
 #~ msgstr "%m/%d/%Y"
 
diff --git a/po/es.po b/po/es.po
index 4c7b2ccf1a..431ab18d34 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,74 +14,201 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.evolution-1-4-branch.es\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 19:27+0200\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2003-08-01 03:05+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@arrakis.es>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Importador de LDIF de Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "Formato de intercambio de datos LDAP (.ldif)"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Importador de VCard de Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Importador de VCard de Evolution"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
-
-#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Archivar como"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Nombre completo"
+
 #: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nombre"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Dirección"
+
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Etiqueta de dirección"
+
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Teléfono"
+
 #: addressbook/backend/ebook/e-card.c:1347
+#: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr "Principal"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Cumpleaños"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "Pral"
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organización"
 
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Unidad de organización"
+
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Oficina"
+
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Titulación"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Papel"
+
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Jefe"
+
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Secretario"
 
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Apodo"
+
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Cónyuge"
+
+#: addressbook/backend/ebook/e-card.c:1430
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniversary"
+msgstr "Aniversario"
+
+#: addressbook/backend/ebook/e-card.c:1436
+msgid "Mailer"
+msgstr "Transporte"
+
+#: addressbook/backend/ebook/e-card.c:1443
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr "URI de calendario"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "URL de disponibilidad:"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "Calendario ICS"
+
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Contactos relacionados:"
+
+#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorías"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Lista de categorías"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Desea HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Desea página de códigos HTML"
+
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
+msgid "List"
+msgstr "Lista"
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Mostrar direcciones de la lista"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Arbitrario"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Último uso"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Usar puntuación"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
+msgstr "Principal"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr "Pral"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -116,12 +243,6 @@ msgid "Home"
 msgstr "Domicilio"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organización"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
@@ -240,21 +361,9 @@ msgid "Dep"
 msgstr "Dep"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Oficina"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Ofic"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Titulación"
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -265,12 +374,6 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Jefe"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Jefe"
 
@@ -279,32 +382,9 @@ msgid "Ass"
 msgstr "Asist"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Apodo"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Apodo"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Cónyuge"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr "URI de calendario"
-
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "CALUri"
@@ -327,11 +407,6 @@ msgid "icsCalendar"
 msgstr "icsCalendar"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr "Aniversario"
-
-#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Aniv"
 
@@ -339,12 +414,6 @@ msgstr "Aniv"
 msgid "Birth Date"
 msgstr "Fecha de nacimiento"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categorías"
-
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Apellido"
@@ -359,105 +428,29 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-destination.c:709
 msgid "Unnamed List"
 msgstr "Lista de anónimos"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Nombre completo"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Dirección"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Etiqueta de dirección"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Teléfono"
-
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Cumpleaños"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Unidad de organización"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Papel"
-
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
-msgid "Mailer"
-msgstr "Transporte"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "URL de disponibilidad:"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "Calendario ICS"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Contactos relacionados:"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Lista de categorías"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Desea HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Desea página de códigos HTML"
-
-#: addressbook/backend/ebook/e-card.c:1506
-msgid "List"
-msgstr "Lista"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Mostrar direcciones de la lista"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Arbitrario"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Importador de LDIF de Evolution."
 
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "ID"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Último uso"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Importador de VCard de Evolution."
 
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Usar puntuación"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Importador de VCard de Evolution"
 
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:172
-msgid "Could not initialize Bonobo"
-msgstr "No se pudo inicializar Bonobo"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -514,14 +507,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook no cargado\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr "No se pudo inicializar wombat"
 
@@ -530,137 +523,6 @@ msgstr "No se pudo inicializar wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "No se pudo leer el bloque de la aplicación de la Agenda del Pilot"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configurar aquí el acceso a los servidores de directorios LDAP"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Servidores de directorio"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Control de configuración de la libreta de direcciones LDAP de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Direcciones emergentes en la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Visor de minitarjetas de la libreta de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Componente de libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visor de carpetas de la libreta de Evolution"
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:625
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Contactos"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "La carpeta contiene información de contacto"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "Servidor LDAP"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "El servidor LDAP contiene información de contacto"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Contactos públicos"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Carpeta pública conteniendo información de contactos"
-
-#: addressbook/gui/component/addressbook-component.c:579
-msgid "New Contact"
-msgstr "Contacto nuevo"
-
-#: addressbook/gui/component/addressbook-component.c:579
-msgid "_Contact"
-msgstr "_Contacto"
-
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "Create a new contact"
-msgstr "Crea un contacto nuevo"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "New Contact List"
-msgstr "Lista de contactos nueva"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Contact _List"
-msgstr "_Lista de contactos"
-
-#: addressbook/gui/component/addressbook-component.c:584
-msgid "Create a new contact list"
-msgstr "Crea una lista de contactos nueva"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Falló al conectarse al servidor LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Falló al autenticarse con el servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "No se pudo efectuar la consulta en la raíz DSE"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "El servidor respondió con bases de búsqueda no soportadas"
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Este servidor no soporta el esquema de información LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Error al obtener información del esquema"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "El servidor no respondió con una información del esquema válida"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Nombre de la cuenta"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Nombre del servidor"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP no fue activado en la compilación de Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Otros contactos"
-
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -772,11 +634,13 @@ msgstr ""
 
 #: addressbook/gui/component/addressbook.c:967
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "El soporte de esta libreta de direcciones no pudo analizar esta consulta"
+msgstr ""
+"El soporte de esta libreta de direcciones no pudo analizar esta consulta"
 
 #: addressbook/gui/component/addressbook.c:970
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "El soporte para esta libreta de direcciones rehusó a efectuar esta consulta"
+msgstr ""
+"El soporte para esta libreta de direcciones rehusó a efectuar esta consulta"
 
 #: addressbook/gui/component/addressbook.c:974
 msgid "This query did not complete successfully."
@@ -792,6 +656,101 @@ msgstr "Cualquier categoría"
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrará el visor de carpetas"
 
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:628
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "La carpeta contiene información de contacto"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "Servidor LDAP"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "El servidor LDAP contiene información de contacto"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Contactos públicos"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Carpeta pública conteniendo información de contactos"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "New Contact"
+msgstr "Contacto nuevo"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "Create a new contact"
+msgstr "Crea un contacto nuevo"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "New Contact List"
+msgstr "Lista de contactos nueva"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "Contact _List"
+msgstr "_Lista de contactos"
+
+#: addressbook/gui/component/addressbook-component.c:587
+msgid "Create a new contact list"
+msgstr "Crea una lista de contactos nueva"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Falló al conectarse al servidor LDAP."
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Falló al autenticarse con el servidor LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "No se pudo efectuar la consulta en la raíz DSE"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "El servidor respondió con bases de búsqueda no soportadas"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Este servidor no soporta el esquema de información LDAPv3"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Error al obtener información del esquema"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "El servidor no respondió con una información del esquema válida"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Nombre de la cuenta"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Nombre del servidor"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP no fue activado en la compilación de Evolution"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Otros contactos"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -825,12 +784,12 @@ msgid "Querying Addressbook..."
 msgstr "Consultando la libreta de direcciones..."
 
 #: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr "Editar información del contacto"
 
 #: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Añadir a contactos"
@@ -839,14 +798,51 @@ msgstr "Añadir a contactos"
 msgid "Merge E-Mail Address"
 msgstr "Combinar direcciones de correo"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Disable Queries"
 msgstr "Deshabilitar consultas"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr "Habilitar consultas (¡Peligroso!)"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Configurar aquí el acceso a los servidores de directorios LDAP"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Servidores de directorio"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr ""
+"Control de configuración de la libreta de direcciones LDAP de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Direcciones emergentes en la libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Visor de minitarjetas de la libreta de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Componente de libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visor de carpetas de la libreta de Evolution"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -947,11 +943,14 @@ msgstr "Dirección de correo:"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution usará este Nombre Distintivo para autenticarle con el servidor"
+msgstr ""
+"Evolution usará este Nombre Distintivo para autenticarle con el servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution usará esta dirección de correo para autenticarle con el servidor"
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution usará esta dirección de correo para autenticarle con el servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Finished"
@@ -994,10 +993,9 @@ msgstr "Uno"
 msgid "S_earch scope: "
 msgstr "Ámbito de bú_squeda: "
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1714
-#: calendar/gui/e-week-view.c:1344
+#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr "Búsqueda"
 
@@ -1207,7 +1205,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:78
 msgid "This option controls how long a search will be run."
-msgstr "Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
+msgstr ""
+"Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
 
 #: addressbook/gui/component/ldap-config.glade.h:79
 msgid "U_se SSL/TLS:"
@@ -1236,11 +1235,11 @@ msgstr "Límite de _descarga:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -1280,20 +1279,24 @@ msgstr "General"
 msgid "searching-tab"
 msgstr "búsqueda"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interfaz de selección de nombre de la agenda de Evolution"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Seleccionas contactos de la Agenda"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Eliminar todo"
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Buscar contacto en"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:450
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Eliminar"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Eliminar todo"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Ver lista de contactos"
@@ -1316,13 +1319,9 @@ msgstr "Contacto anónimo"
 msgid "Source"
 msgstr "Fuente"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Seleccionas contactos de la Agenda"
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Buscar contacto en"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interfaz de selección de nombre de la agenda de Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1395,7 +1394,7 @@ msgid "D_epartment:"
 msgstr "D_epartamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:199
+#: calendar/gui/dialogs/task-editor.c:200
 msgid "Details"
 msgstr "Detalles"
 
@@ -1462,11 +1461,13 @@ msgid "_Categories..."
 msgstr "_Categorías..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3725
-#: mail/folder-browser.c:1812 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -1507,15 +1508,15 @@ msgid "_Web page address:"
 msgstr "Dirección de la página _web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
+#: addressbook/gui/widgets/e-minicard.c:183
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 msgid "Editable"
 msgstr "Editable"
 
@@ -2543,17 +2544,17 @@ msgstr "Zimbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 msgid "Book"
 msgstr "Libro"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
+#: addressbook/gui/widgets/e-minicard-widget.c:93
 msgid "Card"
 msgstr "Tarjeta"
 
@@ -2759,7 +2760,8 @@ msgstr "_Nombre de la lista:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
+msgstr ""
+"_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
@@ -2774,7 +2776,7 @@ msgstr "Es una lista nueva"
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 msgid "Save List as VCard"
 msgstr "Guardar lista como VCard"
 
@@ -2820,7 +2822,7 @@ msgstr ""
 "ya existen en esta carpeta.  ¿Quiere añadirlo de todos modos?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
@@ -2839,10 +2841,10 @@ msgid "%d cards"
 msgstr "%d tarjetas"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 msgid "Query"
 msgstr "Consulta"
 
@@ -2850,22 +2852,22 @@ msgstr "Consulta"
 msgid "Error getting book view"
 msgstr "Error al obtener la vista de libro"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 msgid "Model"
 msgstr "Modelo"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr "Éxito"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
@@ -2874,89 +2876,89 @@ msgstr "Éxito"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
 #: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card not found"
 msgstr "Tarjeta no encontrada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr "Ya existe el ID de la tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:785
-#: camel/camel-service.c:875 camel/camel-service.c:917
-#: camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
+#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Failed"
 msgstr "Falló en la autenticación"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Authentication Required"
 msgstr "Autenticación Requerida"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr "TLS no Disponible"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Addressbook does not exist"
 msgstr "La libreta de direcciones no existe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 msgid "Other error"
 msgstr "Otro error"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr "¿Desea guardar los cambios?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error adding list"
 msgstr "Error añadiendo lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 msgid "Error adding card"
 msgstr "Error añadiendo tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 msgid "Error modifying list"
 msgstr "Error modificando lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 msgid "Error removing list"
 msgstr "Error eliminando lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2965,34 +2967,33 @@ msgstr ""
 "Abrir %d tarjetas abrirá %d ventanas nuevas también.\n"
 "¿Quiere realmente mostrar todas estas tarjetas?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 msgid "Move card to"
 msgstr "Mover tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 msgid "Copy card to"
 msgstr "Copiar tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 msgid "Move cards to"
 msgstr "Mover tarjetas a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 msgid "Copy cards to"
 msgstr "Copiar tarjetas a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 msgid "Multiple VCards"
 msgstr "VCards múltiples"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipo"
@@ -3047,9 +3048,9 @@ msgstr "Reenviar contacto"
 msgid "Send Message to Contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
@@ -3072,7 +3073,7 @@ msgid "Cut"
 msgstr "Cortar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
@@ -3082,15 +3083,15 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Borrar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3690
+#: calendar/gui/e-cal-view.c:1109
 msgid "Current View"
 msgstr "Vista actual"
 
@@ -3181,6 +3182,29 @@ msgstr "Otro teléfono"
 msgid "Primary Phone"
 msgstr "Teléfono principal"
 
+#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "Ancho:"
+
+#: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "Alto:"
+
+#: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr "Tiene el foco"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Seleccionado"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Tiene el cursor"
+
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3194,21 +3218,6 @@ msgstr "y una tarjeta más."
 msgid "Save in addressbook"
 msgstr "Guardar en la agenda de direcciones"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:146
-msgid "Width"
-msgstr "Ancho:"
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:153
-msgid "Height"
-msgstr "Alto:"
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:161
-msgid "Has Focus"
-msgstr "Tiene el foco"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Campo"
@@ -3225,10 +3234,6 @@ msgstr "Modelo del texto"
 msgid "Max field name length"
 msgstr "Longitud máx. del campo"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr "Ancho de columna"
-
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3257,13 +3262,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Seleccionado"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Tiene el cursor"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr "Ancho de columna"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3273,11 +3274,6 @@ msgstr "Vista de la tarjeta"
 msgid "GTK Tree View"
 msgstr "Vista de árbol GTK"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Imprimir sobre"
-
 #: addressbook/printing/e-contact-print.c:1158
 msgid "Print cards"
 msgstr "Imprimir tarjetas"
@@ -3287,6 +3283,11 @@ msgstr "Imprimir tarjetas"
 msgid "Print card"
 msgstr "Imprimir tarjeta"
 
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Imprimir sobre"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "Tahoma de 10 pt."
@@ -3456,6 +3457,63 @@ msgstr "Ancho:"
 msgid "_Font..."
 msgstr "_Tipografía..."
 
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "con todas las carpetas locales y remotas activas"
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "tarjetas"
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Error interno"
+
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Cita sin título"
@@ -3585,28 +3643,30 @@ msgid "31st"
 msgstr "31"
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:912
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
+#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:910
 msgid "Low"
 msgstr "Baja"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -3614,13 +3674,13 @@ msgstr "Sin definir"
 msgid "Split Multi-Day Events:"
 msgstr "Dividir eventos de días múltiples:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr "Error mientras me comunicaba con el servidor de agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 msgid "Could not read pilot's Calendar application block"
 msgstr "No se pudo leer información de la aplicación de calendario del Pilot"
 
@@ -3628,74 +3688,32 @@ msgstr "No se pudo leer información de la aplicación de calendario del Pilot"
 msgid "Default Priority:"
 msgstr "Prioridad predeterminada:"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
 msgstr "No se pudo leer los datos de la aplicación ToDo del Pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Calendario y tareas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure su zona horaria, Calendario y Lista de Tareas aquí"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Calendario y tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Componente calendario y tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Control de configuración del Calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visor de menajes de horario del calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Visor del calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de calendario/tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Visor de tareas de Evolution"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Servicio de notificación por alarma del Calendario de Evolution"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Comenzando:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Finalizando:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr "tiempo no válido"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 msgid "Evolution Alarm"
 msgstr "Alarma de Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:366
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarmas en %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Cerrar"
 
@@ -3711,16 +3729,25 @@ msgstr "Tiempo de alarma zumbadora (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3732,7 +3759,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo.  En su lugar\n"
 "Evolution mostrará un diálogo de recordatorio normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3749,68 +3776,84 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Servicio de notificación por alarma del Calendario de Evolution"
+
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize Bonobo"
+msgstr "No se pudo inicializar Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:176
 msgid "Could not initialize gnome-vfs"
 msgstr "No se pudo inicializar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:185
 msgid "Could not create the alarm notify service factory"
 msgstr "No se pudo crear la fábrica del servicio de la alarma de notificación"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "El resumen contiene"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "La descripción contiene"
+#: calendar/gui/calendar-commands.c:376
+#, fuzzy
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Esta operación borrará permanentemente todos las tareas marcados como "
+"terminadas. Si continúa, no podrá recuperar esas tareas.\n"
+"\n"
+"¿Borrar realmente esas tareas?"
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "El comentario contiene"
+#: calendar/gui/calendar-commands.c:382
+#, fuzzy
+msgid "Purge events older than"
+msgstr "devuelve menor que"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
-msgid "Unmatched"
-msgstr "No coincidente"
+#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "días"
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1440 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
+#: calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:518
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/calendar-commands.c:834
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:918
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "No se pudo mostrar el agenda.  Por favor compruebe su ORBit y su OAF."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1543
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3829,11 +3872,11 @@ msgstr "Calendario público:"
 msgid "Public folder containing appointments and events"
 msgstr "Carpeta pública conteniendo citas y eventos"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:487
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Tareas"
@@ -3898,107 +3941,6 @@ msgstr "Cita de todo el _día"
 msgid "Create a new all-day appointment"
 msgstr "Crear una nueva cita para todo el día"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr "Privado"
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Público"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Ocupado"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr "Sin comenzar"
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr "En proceso"
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr "Terminado"
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"La posición geográfica debe ser escrita en la forma: \n"
-"\n"
-"45.436845,125.862501"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2065
-#: mail/folder-browser.c:1774 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
-msgstr "Ninguno"
-
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr "Repetición"
-
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr "Asignado"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
-msgstr "Sí"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
-msgstr "No"
-
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Vista diaria"
@@ -4015,28 +3957,49 @@ msgstr "Vista semanal"
 msgid "Month View"
 msgstr "Vista mensual"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Vista personalizada"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "El resumen contiene"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "La descripción contiene"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "El comentario contiene"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
+msgid "Unmatched"
+msgstr "No coincidente"
+
+#: calendar/gui/comp-editor-factory.c:462
 msgid "Error while opening the calendar"
 msgstr "Error al abrir el calendario"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr "Método no soportado al abrir el calendario"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado para abrir el calendario"
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:125
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "No se pudo abrir la carpeta en «%s»"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrará la agenda"
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr "El tipo de vista a mostrar"
 
@@ -4092,10 +4055,6 @@ msgstr "Enviar a:"
 msgid "With these arguments:"
 msgstr "Con estos argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "días"
-
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr "diálogo1"
@@ -4108,7 +4067,8 @@ msgstr "extra tiempo cada"
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minutos"
 
@@ -4122,11 +4082,11 @@ msgstr "Bases"
 msgid "Date/Time:"
 msgstr "Fecha/Hora:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr "Mostrar un mensaje"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr "Reproducir un sonido"
 
@@ -4134,7 +4094,7 @@ msgstr "Reproducir un sonido"
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
@@ -4144,7 +4104,8 @@ msgstr "Envía un correo"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4227,7 +4188,7 @@ msgstr "días"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr "Viernes"
 
@@ -4241,7 +4202,7 @@ msgstr "minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr "Lunes"
 
@@ -4251,7 +4212,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -4265,7 +4226,7 @@ msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4283,7 +4244,7 @@ msgstr "Lista de tareas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -4301,7 +4262,7 @@ msgstr "Formato de la hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -4311,12 +4272,12 @@ msgstr "La _semana empieza en:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr "Miércoles"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr "Semana laboral"
 
@@ -4375,7 +4336,8 @@ msgstr "_Sáb"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Show appointment end times in week and month views"
-msgstr "Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
+msgstr ""
+"Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Time divisions:"
@@ -4473,31 +4435,6 @@ msgstr "%s  Ha realizado cambios. ¿Olvido estos cambios y actualizo el editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Error de validación: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
-msgid " to "
-msgstr " a "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
-msgid " (Completed "
-msgstr "(Completado "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
-msgid "Completed "
-msgstr "Completado "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
-msgid " (Due "
-msgstr " (Vence "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
-msgid "Due "
-msgstr "Vence "
-
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "No se pudo actualizar el objeto inválido"
@@ -4543,23 +4480,49 @@ msgid "No summary"
 msgstr "Sin resumen"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3995
-#: calendar/gui/e-week-view.c:3934 composer/e-msg-composer.c:1169
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1383
-#: calendar/gui/dialogs/comp-editor.c:1407
-#: calendar/gui/dialogs/comp-editor.c:1433
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: calendar/gui/dialogs/comp-editor.c:1460
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr "Imposible obtener versión actual."
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Error de validación: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
+msgid " to "
+msgstr " a "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
+msgid " (Completed "
+msgstr "(Completado "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
+msgid "Completed "
+msgstr "Completado "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
+msgid " (Due "
+msgstr " (Vence "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
+msgid "Due "
+msgstr "Vence "
+
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4628,7 +4591,8 @@ msgstr "La tarea no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:72
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr "La entrada del diario no pudo ser borrada porque el permiso fue denegado"
+msgstr ""
+"La entrada del diario no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:75
 msgid "The item could not be deleted because permission was denied"
@@ -4662,27 +4626,27 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Escribir delegado"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Planificación"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reunión"
 
@@ -4722,9 +4686,9 @@ msgid "Classification"
 msgstr "Clasificación"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Con_fidencial"
+#, fuzzy
+msgid "Co_nfidential"
+msgstr "Confidencial"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4750,7 +4714,6 @@ msgid "Pu_blic"
 msgstr "Pú_blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Mostrar hora como"
 
@@ -4767,74 +4730,34 @@ msgstr "Hora de _fin:"
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr "Ninguno"
+
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta por más tiempo."
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un asistente."
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr "¡Esa persona ya está participando en la reunión!"
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:630
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Participantes"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Pulse aquí para añadir un contacto"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Nombre común"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegado por"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegado a"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Idioma"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Miembro"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Estado"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4845,7 +4768,7 @@ msgid "_Change Organizer"
 msgstr "_Cambiar organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Invitar a otros..."
 
@@ -4858,8 +4781,10 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Está modificando una tarea que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -4995,7 +4920,7 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1566
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
@@ -5013,49 +4938,72 @@ msgstr "La información de la reunión ha cambiado. ¿Enviar versión actualizad
 
 #: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
-msgstr "La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
+msgstr ""
+"La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
 
 #: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr "La información de la tarea ha cambiado. ¿Enviar versión actualizada?"
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 msgid "Completed date is wrong"
 msgstr "La fecha de terminación es errónea"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#, fuzzy, no-c-format
+msgid "% _Complete"
 msgstr "% Terminado"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
-msgstr "Fecha de terminación:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311
+msgid "Completed"
+msgstr "Terminado"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
+msgid "In Progress"
+msgstr "En proceso"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305
+msgid "Not Started"
+msgstr "Sin comenzar"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Date Completed:"
+msgstr "Fecha de terminación:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Prioridad:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/dialogs/task-editor.c:192
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "Dirección de la página _web:"
+
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
-#: calendar/gui/dialogs/task-editor.c:206
-#: calendar/gui/dialogs/task-editor.c:269
-#: calendar/gui/dialogs/task-editor.c:406
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Asignación"
 
@@ -5067,8 +5015,12 @@ msgstr "La fecha de vencimiento es errónea"
 msgid "Due date is before start date!"
 msgstr "La fecha de vencimiento es anterior a la fecha de inicio."
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "Con_fidencial"
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Descripción:"
@@ -5081,223 +5033,259 @@ msgstr "Fecha de ini_cio:"
 msgid "_Due Date:"
 msgstr "Fecha de _vencimiento:"
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr "%d días"
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr "1 día"
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr "1 semana"
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr "1 hora"
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr "1 segundo"
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr "Enviar un correo"
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr "Acción a realizar desconocida"
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes de comenzar la cita"
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s tras el comienzo de la cita"
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s al comienzo de la cita"
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes de terminar a cita"
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s tras finalizar la cita"
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s al finalizar la cita"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
+msgid "Public"
+msgstr "Público"
+
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
+msgid "Private"
+msgstr "Privado"
+
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2869
-#: calendar/gui/e-week-view.c:2021
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:393
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Ocupado"
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3707 mail/folder-browser.c:1785
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Save as..."
-msgstr "_Guardar como..."
+#: calendar/gui/e-calendar-table.c:989
+#, fuzzy
+msgid "Open _Web Page"
+msgstr "_Abrir mensaje"
+
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Save As..."
+msgstr "Guardar _como..."
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3741
-#: calendar/gui/e-week-view.c:3682 calendar/gui/e-week-view.c:3709
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
+#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3746
-#: calendar/gui/e-week-view.c:3714 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3715 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
+#: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3712
-#: calendar/gui/e-day-view.c:3748 calendar/gui/e-week-view.c:3686
-#: calendar/gui/e-week-view.c:3716 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
+#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Forward as iCalendar"
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:8018
-#: calendar/gui/e-week-view.c:4431
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Terminado"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr "Completo"
 
@@ -5306,12 +5294,13 @@ msgid "Completion Date"
 msgstr "Fecha de terminación"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr "Fecha de vencimiento"
+#, fuzzy
+msgid "Description"
+msgstr "Descripción:"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
-msgstr "Fecha final"
+msgid "Due Date"
+msgstr "Fecha de vencimiento"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
@@ -5321,242 +5310,299 @@ msgstr "Posición geográfica"
 msgid "Priority"
 msgstr "Prioridad"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Estado"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Resumen"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+msgid "color"
+msgstr " "
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
+#: calendar/gui/e-calendar-table.etspec.h:20
+#, fuzzy
+msgid "component"
+msgstr "Cita"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"La fecha debe ser introducida con el formato: \n"
-"\n"
-"%s"
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Desconocido"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisiones por minuto"
+#: calendar/gui/e-cal-model.c:828
+msgid "Recurring"
+msgstr "Repetición"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1423
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
-msgid "%A %d %B"
-msgstr "%A %d de %B"
+#: calendar/gui/e-cal-model.c:830
+msgid "Assigned"
+msgstr "Asignado"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1456
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d de %b"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "Yes"
+msgstr "Sí"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:359
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "No"
+msgstr "No"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:362
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "S"
 
-#: calendar/gui/e-day-view.c:3696
-msgid "New _Appointment"
-msgstr "Nueva cit_a"
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr "E"
 
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3676
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:550
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"La posición geográfica debe ser escrita en la forma: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+msgid "New _Appointment..."
+msgstr "Nueva cit_a..."
+
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el día"
 
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3677
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
 msgid "New Meeting"
 msgstr "Nueva reunión"
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3678
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
 msgid "New Task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/e-day-view.c:3707 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3692
+#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3693
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3697
-#: ui/evolution-calendar.xml.h:34
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la información de disponibilidad"
 
-#: calendar/gui/e-day-view.c:3731 calendar/gui/e-week-view.c:3701
+#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Configuración..."
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3708
-#: mail/folder-browser.c:1787 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr "Guardar _como..."
-
-#: calendar/gui/e-day-view.c:3752 calendar/gui/e-week-view.c:3720
+#: calendar/gui/e-cal-view.c:1139
 msgid "_Schedule Meeting..."
 msgstr "Concertar una _reunión"
 
-#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3721
+#: calendar/gui/e-cal-view.c:1140
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3726
+#: calendar/gui/e-cal-view.c:1145
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3727
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _ocurrencia"
 
-#: calendar/gui/e-day-view.c:3760 calendar/gui/e-week-view.c:3728
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
-#: calendar/gui/e-itip-control.c:706
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"La fecha debe ser introducida con el formato: \n"
+"\n"
+"%s"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
+msgid "%A %d %B"
+msgstr "%A %d de %B"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d de %b"
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisiones por minuto"
+
+#: calendar/gui/e-itip-control.c:676
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetición compuesta)"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 msgid "Every day"
 msgstr "Cada día"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, c-format
 msgid "Every %d days"
 msgstr "Cada %d días"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 msgid "Every week"
 msgstr "Cada semana"
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, c-format
 msgid "Every %d weeks"
 msgstr "Cada %d semanas"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 msgid "Every week on "
 msgstr "Cada semana en"
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Cada %d semanas en"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 msgid " and "
 msgstr " y "
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr "El %s día de "
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de"
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 msgid "every month"
 msgstr "cada mes"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr "Cada %d meses"
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 msgid "Every year"
 msgstr "Cada año"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr "Cada %d años"
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr " un total de %d veces"
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ", terminando en "
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr "<b>Empieza con:</b>"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 msgid "<b>Ends:</b> "
 msgstr "<b>Termina: </b>"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Completed:</b> "
 msgstr "<b>Completado:</b> "
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Due:</b> "
 msgstr "<b>Vencimiento:</b>"
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 msgid "iCalendar Information"
 msgstr "Información del agenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1005
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5564,338 +5610,333 @@ msgstr ""
 "<br> Por favor revise la siguiente información, y seleccione una acción del "
 "menú de abajo."
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr "<i>Ninguna<i>"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 msgid "Location:"
 msgstr "Lugar:"
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 msgid "Status:"
 msgstr "Estado:"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:419
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:425 calendar/gui/itip-utils.c:451
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Rechazado"
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:347
-#: mail/mail-display.c:928 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1185 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado información de reunión."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 msgid "Meeting Information"
 msgstr "Información de reunió"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita la presencia de %s en una reunión."
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> solicita su presencia en una reunión."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1309
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reunión existente."
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 msgid "Meeting Update"
 msgstr "Actualización de reunión"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la última información de la reunión."
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 msgid "Meeting Update Request"
 msgstr "Petición de actualización de la reunión"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ha contestado a la petición de reunión."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha cancelado una reunión."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 msgid "Meeting Cancellation"
 msgstr "Cancelación de reunión"
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ha publicado la información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pide a %s que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> le pide que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea añadirse a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1381
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quiere recibir la última información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 msgid "Task Update Request"
 msgstr "Petición de actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ha contestado a una asignación de tarea."
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1402
 msgid "Task Cancellation"
 msgstr "Cancelación de tarea"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ha publicado la información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pide su información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 msgid "Free/Busy Request"
 msgstr "Petición de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ha contestado a una petición de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sólo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de calendario válido"
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr "El objeto es inválido y no puede ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 msgid "There was an error on the CORBA system\n"
 msgstr "Hubo un error en el sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 msgid "Object could not be found\n"
 msgstr "El objeto no pudo encontrarse\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "No tiene permiso para actualizar el calendario\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr "El archivo del calendario no pudo ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "El estado de asistencia no puede ser actualizado porque no existe el elemento"
+msgstr ""
+"El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "El estado de asistencia no pudo ser actualizado a causa de un estado "
 "inválido\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "No tiene permiso para actualizar el calendario\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 msgid "Attendee status could not be updated!\n"
 msgstr "El estado de asistencia no pudo ser actualizado.\n"
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 msgid "Removal Complete"
 msgstr "Eliminación terminada"
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo ser enviado.\n"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 msgid "Select Calendar Folder"
 msgstr "Seleccionar carpeta de Calendario"
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 msgid "Select Tasks Folder"
 msgstr "Seleccionar carpeta de Tareas"
 
@@ -5936,185 +5977,167 @@ msgstr "fecha de fin"
 msgid "date-start"
 msgstr "fecha de inicio"
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr "Presidencia"
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
-msgid "Required Participants"
-msgstr "Participantes requeridos"
-
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
-msgstr "Participantes opcionales"
-
-#: calendar/gui/e-meeting-model.c:82
-msgid "Resources"
-msgstr "Recursos"
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
-msgid "Individual"
-msgstr "Individual"
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
-msgid "Group"
-msgstr "Grupo"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
-msgid "Resource"
-msgstr "Recurso"
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
-msgid "Room"
-msgstr "Sala"
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
-msgid "Chair"
-msgstr "Presidente"
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
-msgid "Required Participant"
-msgstr "Participantes requeridos"
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
-msgid "Optional Participant"
-msgstr "Participante opcional"
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
-msgid "Non-Participant"
-msgstr "No participan"
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
-msgid "Needs Action"
-msgstr "Necesita acción"
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
-msgid "Delegated"
-msgstr "Delegado"
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
-msgstr "En proceso"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Sin información"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "_Options"
 msgstr "_Opciones"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _Only Working Hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Mostrar quitando _ampliación"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update Free/Busy"
 msgstr "_Actualizar Libre/Ocupado"
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "_Autoseleccionar"
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
+#: calendar/gui/e-meeting-time-sel.c:541
 msgid "_All People and Resources"
 msgstr "_Todas las personas y los recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:563
+#: calendar/gui/e-meeting-time-sel.c:550
 msgid "All _People and One Resource"
 msgstr "Todas las _personas y un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:572
+#: calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required People"
 msgstr "Personas _requeridas"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "Required People and _One Resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "Meeting _start time:"
 msgstr "Hora de _inicio de la reunión:"
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Meeting _end time:"
 msgstr "Hora de _fin de la reunión:"
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2196
-#: calendar/gui/gnome-cal.c:2207
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2054
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2087
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Participantes"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Pulse aquí para añadir un contacto"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Nombre común"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegado por"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegado a"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Idioma"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Miembro"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
+msgstr "tiempo no válido"
+
+#: calendar/gui/e-tasks.c:221
+#, fuzzy
+msgid "Start Date:"
+msgstr "Fecha de ini_cio:"
+
+#: calendar/gui/e-tasks.c:237
+#, fuzzy
+msgid "Due Date:"
+msgstr "Fecha de _vencimiento:"
+
+#. write priority
+#: calendar/gui/e-tasks.c:265
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioridad:"
+
+#. URL
+#: calendar/gui/e-tasks.c:321
+#, fuzzy
+msgid "Web Page:"
+msgstr "Página"
+
+#: calendar/gui/e-tasks.c:702
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No se pudo cargar las tareas en «%s»"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:746
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El método necesario para cargar «%s» no está implementado"
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1699
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "No tiene permiso para abrir la carpeta en «%s»"
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1918
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6123,68 +6146,110 @@ msgstr ""
 "Error en %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:899
 msgid "Completing tasks..."
 msgstr "Completando tareas..."
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:922
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados..."
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1017
 msgid "Expunging"
 msgstr "Purgando"
 
-#: calendar/gui/e-week-view.c:3675
-msgid "New _Appointment..."
-msgstr "Nueva cit_a..."
-
-#: calendar/gui/gnome-cal.c:1671
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No se pudo abrir la carpeta en «%s»"
 
-#: calendar/gui/gnome-cal.c:1685
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El método necesario para abrir «%s» no está implementado"
 
-#: calendar/gui/gnome-cal.c:1746
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Añadir alarmas para %s"
 
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"El soporte de calendario para\n"
+"El soporte de tareas para \n"
 "%s\n"
-"se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo."
+"se ha bloqueado. Tendrá que reiniciar Evolution para usarlo otra vez."
 
-#: calendar/gui/gnome-cal.c:1947
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"El soporte de tareas para \n"
+"El soporte de calendario para\n"
 "%s\n"
-"se ha bloqueado. Tendrá que reiniciar Evolution para usarlo otra vez."
+"se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo."
 
-#: calendar/gui/gnome-cal.c:2178
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abriendo calendario en %s"
 
-#: calendar/gui/gnome-cal.c:2218
+#: calendar/gui/gnome-cal.c:2197
 msgid "Opening default tasks folder"
 msgstr "Abriendo carpeta de tareas predeterminada"
 
+#: calendar/gui/gnome-cal.c:3094
+#, fuzzy, c-format
+msgid "Purging event %s"
+msgstr "Haciendo ping a %s"
+
+#: calendar/gui/gnome-cal.c:3178
+#, fuzzy
+msgid "Purging"
+msgstr "Turín"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Calendario y tareas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure su zona horaria, Calendario y Lista de Tareas aquí"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Calendario y tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Componente calendario y tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Control de configuración del Calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor de menajes de horario del calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Visor del calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de calendario/tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Visor de tareas de Evolution"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -6241,57 +6306,57 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un asistente"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Información del evento"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Información de la entrada de diario"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:517
 msgid "Free/Busy information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Información de calendario"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Actualizado"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Regenerar"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Contrapropuesta"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de disponibilidad (de %s a %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:523
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un asistente del evento."
 
@@ -6324,82 +6389,81 @@ msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1882
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Día seleccionado (%a %d de %b de %Y)"
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr "%a %d de %b"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr "%a %d de %b de %Y"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1919
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1927
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1934
 msgid "Selected year (%Y)"
 msgstr "Año seleccionado (%Y)"
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2262
 msgid "Task"
 msgstr "Tarea"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2321
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2338
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2362
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2387
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2559
 msgid "Print Item"
 msgstr "Imprimir elemento"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2632
 msgid "Print Setup"
 msgstr "Configurar impresión"
 
@@ -6489,7 +6553,8 @@ msgstr "make-time espera que el argumento 1 sea una cadena"
 
 #: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "el argumento 1 de make-time debe ser una cadena tipo ISO 8601 hora/fecha"
+msgstr ""
+"el argumento 1 de make-time debe ser una cadena tipo ISO 8601 hora/fecha"
 
 #: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
@@ -6551,7 +6616,8 @@ msgstr "contains? espera que el argumento 2 sea una cadena"
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
-msgstr "contains? espera que el argumento 1 sea «any», «summary» ó «description»"
+msgstr ""
+"contains? espera que el argumento 1 sea «any», «summary» ó «description»"
 
 #: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
@@ -6579,7 +6645,8 @@ msgstr "completed-before? espera que el argumento 1 sea un time_t"
 
 #: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr "La evaluación de la expresión de búsqueda no ha devuelto un valor booleano"
+msgstr ""
+"La evaluación de la expresión de búsqueda no ha devuelto un valor booleano"
 
 #: calendar/pcs/query.c:1483
 msgid "Parse error"
@@ -8114,27 +8181,27 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:167
 msgid "Signing is not supported by this cipher"
 msgstr "Este método de encriptación no soporta firmas"
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:207
 msgid "Verifying is not supported by this cipher"
 msgstr "Este método de encriptación no soporta verificación"
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:251
 msgid "Encryption is not supported by this cipher"
 msgstr "Este método de encriptación no soporta cifrado"
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:293
 msgid "Decryption is not supported by this cipher"
 msgstr "La desencriptación no está soportada por este método de cifrado"
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:331
 msgid "You may not import keys with this cipher"
 msgstr "No puede importar claves con este método de cifrado"
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:363
 msgid "You may not export keys with this cipher"
 msgstr "No puede exportar claves con este método de cifrado"
 
@@ -8173,7 +8240,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resincronizando con el servidor"
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparando carpeta «%s» para desconexión"
@@ -8194,57 +8265,57 @@ msgstr "Falló al crear pipe a «%s»: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Error al crear proceso hijo «%s»: %s"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Flujo de mensaje inválido recibido desde %s: %s"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 msgid "Unable to open spool folder"
 msgstr "No se pudo abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 msgid "Unable to process spool folder"
 msgstr "No se pudo procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr "No se pudo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falló en el mensaje %d de %d"
@@ -8266,6 +8337,34 @@ msgstr "Argumentos inválidos a (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
 
+#: camel/camel-folder.c:585
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Operación no implementada: añadir mensaje: para %s"
+
+#: camel/camel-folder.c:1163
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Operación no implementada: búsqueda según la expresión %s"
+
+#: camel/camel-folder.c:1203
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Operación no implementada: búsqueda por uids: para %s"
+
+#: camel/camel-folder.c:1321
+msgid "Moving messages"
+msgstr "Moviendo mensajes"
+
+#: camel/camel-folder.c:1321
+msgid "Copying messages"
+msgstr "Copiando mensajes"
+
+#: camel/camel-folder.c:1571
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Obteniendo %d mensajes(s)"
+
 #: camel/camel-folder-search.c:348
 #, c-format
 msgid ""
@@ -8284,38 +8383,15 @@ msgstr ""
 "Error ejecutando la búsqueda según la expresión %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:575 camel/camel-folder-search.c:603
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(coincidir con todas) requiere un único resultado booleano"
 
-#: camel/camel-folder-search.c:655
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Realizando búsqueda en cabecera desconocida: %s"
 
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Operación no implementada: añadir mensaje: para %s"
-
-#: camel/camel-folder.c:1161
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Operación no implementada: búsqueda según la expresión %s"
-
-#: camel/camel-folder.c:1201
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Operación no implementada: búsqueda por uids: para %s"
-
-#: camel/camel-folder.c:1319
-msgid "Moving messages"
-msgstr "Moviendo mensajes"
-
-#: camel/camel-folder.c:1319
-msgid "Copying messages"
-msgstr "Copiando mensajes"
-
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8346,7 +8422,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr "Cancelado"
 
@@ -8403,26 +8479,6 @@ msgstr ""
 "No se pudo verificar la firma del mensaje: no pude crear un archivo "
 "temporal: %s"
 
-#: camel/camel-lock-client.c:111
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "No se pudo crear un conducto(pipe) para la ayuda: %s"
-
-#: camel/camel-lock-client.c:124
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "No se pudo hacer un bifurcar del ayudante de bloqueo: %s"
-
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "No se pudo bloquear «%s»: error del protocolo con lock-helper"
-
-#: camel/camel-lock-client.c:215
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "No se pudo bloquear «%s»"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8431,7 +8487,8 @@ msgstr "No se pudo bloquear el archivo para %s: %s"
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
+msgstr ""
+"Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -8443,6 +8500,26 @@ msgstr "Fallo al hacer un bloqueo usando fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fallo al hacer un bloqueo usando flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "No se pudo crear un conducto(pipe) para la ayuda: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "No se pudo hacer un bifurcar del ayudante de bloqueo: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "No se pudo bloquear «%s»: error del protocolo con lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "No se pudo bloquear «%s»"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8509,11 +8586,11 @@ msgstr "Falló al descifrar la parte MIME: estructura inválida"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Falló al descifrar la parte MIME: error de análisis"
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr "Esta parte del mensaje está firmada digitalmente"
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 msgid "parse error"
 msgstr "error de análisis"
 
@@ -8607,7 +8684,8 @@ msgstr "Reto del servidor no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
+msgstr ""
+"El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -8615,7 +8693,8 @@ msgstr "La respuesta del servidor no contenía información de autorización\n"
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr "La respuesta del servidor contenía información de autorización incompleta\n"
+msgstr ""
+"La respuesta del servidor contenía información de autorización incompleta\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -8676,7 +8755,8 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "El manipulador de contexto suministrado no se refiere a un contexto válido."
+msgstr ""
+"El manipulador de contexto suministrado no se refiere a un contexto válido."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
@@ -8693,7 +8773,7 @@ msgstr "Las credenciales referenciadas han expirado."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1207
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
@@ -8751,23 +8831,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr "POP antes de SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Esta opción autorizará conexiones POP antes de intentar SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
 msgstr "URI de la fuente POP"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "Autenticación POP antes de SMTP usando un transporte desconocido"
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Autenticación POP antes de SMTP usando una fuente no POP"
 
@@ -8776,55 +8856,55 @@ msgstr "Autenticación POP antes de SMTP usando una fuente no POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Falló la compilación de la expresión regular: %s: %s"
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "La URL «%s» necesita un componente de nombre de usuario"
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:285
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "La URL «%s» necesita un componente hospedador"
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:293
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "La URL «%s» necesita un componente de ruta"
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:738
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:783 camel/camel-service.c:915
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Error al resolver: %s"
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "La resolución del host ha fallado: no se puede crear el thread: %s"
 
-#: camel/camel-service.c:818
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Error al resolver: %s: servidor no encontrado"
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Error al resolver: %s: razón desconocida"
 
-#: camel/camel-service.c:880
+#: camel/camel-service.c:860
 msgid "Resolving address"
 msgstr "Resolviendo dirección"
 
-#: camel/camel-service.c:949
+#: camel/camel-service.c:929
 msgid "Host lookup failed: host not found"
 msgstr "Error al resolver: servidor no encontrado"
 
-#: camel/camel-service.c:952
+#: camel/camel-service.c:932
 msgid "Host lookup failed: unknown reason"
 msgstr "Error al resolver: razón desconocida"
 
@@ -8836,12 +8916,12 @@ msgstr "Proveedor de correo de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para leer correo como una búsqueda de otras carpetas"
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hay proveedor para el protocolo «%s»"
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8887,131 +8967,132 @@ msgstr "Error al decodificar el mensaje."
 msgid "Failed to verify certificates."
 msgstr "Error al verificar el certificado."
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:212
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No se pudo obtener la carpeta: Operación no válida"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No se pudo crear la carpeta: Operación no válida"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "No se pudo obtener el certificado del emisor."
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr "No se pudo obtener la Lista de Revocación de Certificados"
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr "No se pudo descifrar la firma del certificado"
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "No se pudo descifrar la firma de la Lista de Revocación de Certificados"
+msgstr ""
+"No se pudo descifrar la firma de la Lista de Revocación de Certificados"
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr "No se pudo decodificar la clave pública del emisor"
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
 msgstr "Falló en la firma del certificado"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr "Fallo en la firma de la lista de revocación de certificados"
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr "Certificado aún no válido"
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr "El certificado ha caducado"
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr "CRL todavía no válido"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr "La CRL ha caducado"
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr "Error en CRL"
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr "Fuera de memoria"
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr "Certificado de profundidad cero autofirmado"
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr "Certificado autofirmado en cadena"
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr "No se pudo obtener el certificado del emisor localmente"
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr "No se pudo verificar la hoja de la firma."
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr "Cadena de certificados demasiado larga"
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr "Certificado revocado"
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Autoridad certificadora inválida (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr "Longitud de ruta excedida"
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr "Propósito inválido"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr "Certificado sin confianza"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr "Certificado rechazado"
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr "Incoherencia Asunto/Emisor"
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr "No coincide AKID/SKID "
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr "Las series AKID/Issuer no coinciden"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr "El uso de la clave no soporta firmado de certificados"
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr "Error en la verificación de la aplicación"
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9024,15 +9105,15 @@ msgstr ""
 "Huella:        %s\n"
 "Firma:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr "BAD"
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9052,7 +9133,7 @@ msgstr ""
 "¿Quiere aceptarlo de todos modos?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9067,7 +9148,7 @@ msgstr ""
 "\n"
 "¿Quiere aceptar?"
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9076,7 +9157,7 @@ msgstr ""
 "Problema del certificado: %s\n"
 "Emisor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9085,7 +9166,7 @@ msgstr ""
 "Dominio del certificado erróneo: %s\n"
 "Emisor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9094,7 +9175,7 @@ msgstr ""
 "Certificado caducado: %s\n"
 "Emisor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9108,17 +9189,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "No se pudo analizar la URL «%s»"
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Error guardando «%s»: %s"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No existe el mensaje %s en %s"
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "No se pudo copiar o mover mensajes a una Carpeta Virtual"
 
@@ -9145,12 +9226,12 @@ msgstr "No se pudo cambiarle el nombre a la carpeta: %s: No existe"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2806
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2809
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconectó inesperadamente: %s"
@@ -9189,38 +9270,38 @@ msgstr "La respuesta del servidor IMAP no contenía información de %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente ha respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No se pudo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No se pudo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr "La carpeta fue destruida y recreada en el servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1885
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "No se pudo descargar el mensaje: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1922
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9229,24 +9310,24 @@ msgstr ""
 "No se pudo obtener el mensaje; %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1922
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "No existe ese mensaje"
 
-#: camel/providers/imap/camel-imap-folder.c:1945
-#: camel/providers/imap/camel-imap-folder.c:2541
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:2205
-#: camel/providers/imap/camel-imap-folder.c:2275
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo información de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:2579
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr "No se pudo encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -9294,87 +9375,105 @@ msgstr "Espacio de nombres"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Aplicar filtros a los mensajes nuevos en el buzón de entrada de este servidor"
+msgstr ""
+"Aplicar filtros a los mensajes nuevos en el buzón de entrada de este servidor"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "Comprobar el correo _automáticamente cada"
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para leer y guardar correo en los servidores IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Contraseña"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Conectará con el servidor IMAP usando una contraseña de texto plano"
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servicio IMAP para %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/imap/camel-imap-store.c:589
+#: camel/providers/imap/camel-imap-store.c:821
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Conexión cancelada"
 
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No se pudo conectar con %s (puerto %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:655
+#: camel/providers/imap/camel-imap-store.c:686
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Falló al conectar al servidor IMAP %s en modo seguro: %s"
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "Extensión SSL/TLS no implementada"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:687
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "Falló la negociación SSL"
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:824
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "No se pudo conectar con %s (puerto %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:1237
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "El servidor IMAP %s no implementa el método de autenticación requerido %s"
+msgstr ""
+"El servidor IMAP %s no implementa el método de autenticación requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "El tipo de autenticación %s no está implementado"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s Por favor escriba la contraseña IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr "No escribió una clave."
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9385,43 +9484,72 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1660
+#: camel/providers/imap/camel-imap-store.c:1802
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2003
 #, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 "El nombre de la carpeta «%s» es inválido porque no puede contener el "
 "carácter de retorno de carro «%c»."
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2015
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Carpeta padre desconocida: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2051
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Almacenamiento del mensaje"
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "No se pudo conectar con el servidor POP: %s"
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "Envía un mensaje al contacto"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:379
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:383
+#: camel/providers/local/camel-local-folder.c:386
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "buzón: %s: (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:390
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9477,50 +9605,54 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "Para leer y guardar el correo local en directorios estándar mbox."
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La dirección %s no es absoluta"
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s no es un directorio normal"
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No se pudo acceder a la carpeta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Los almacenes locales no tienen una carpeta de entrada"
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No se pudo cambiarle el nombre de la carpeta %s a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No se pudo renombrar: «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No se pudo borrar el resumen la carpeta «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No se pudo borrar el índice de la carpeta «%s»: %s"
@@ -9534,18 +9666,18 @@ msgstr "No se pudo guardar el resumen: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No se pudo añadir mensajes al resumen: razón desconocida"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
 msgstr "Mensaje añadido al Maildir cancelado"
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No se pudo añadir el mensaje a la carpeta tipo maildir: %s: %s"
 
 #
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr "Contenido inválido en el mensaje"
 
@@ -9561,7 +9693,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9624,29 +9756,29 @@ msgstr "Comprobando si hay mensajes nuevos"
 msgid "Storing folder"
 msgstr "Guardando carpeta"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No se pudo crear un bloqueo de carpetas en %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:289
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No se pudo abrir el buzón: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:349
 msgid "Mail append cancelled"
 msgstr "Adición de mensaje cancelada"
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:352
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No se pudo añadir el mensaje al archivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9655,15 +9787,15 @@ msgstr ""
 "No se pudo obtener el mensaje; %s de la carpeta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La carpeta parece estar corrompida e irrecuperable."
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falló la construcción del mensaje: ¿Buzón corrompido?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9672,7 +9804,16 @@ msgstr ""
 "No se pudo abrir el archivo «%s»:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr ""
+"No se pudo crear el directorio %s:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9681,14 +9822,15 @@ msgstr ""
 "No se pudo crear el archivo «%s»:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "«%s» no es un archivo normal."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9697,11 +9839,36 @@ msgstr ""
 "No se pudo borrar la carpeta «%s»:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta «%s» no esta vacía. No fue borrada."
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "No se pudo crear una carpeta con ese nombre"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "No se pudo crear el directorio %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "No se pudo acceder a la carpeta: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "No se pudo cambiarle el nombre de la carpeta %s a %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:427
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "El nombre de carpeta especificado no es valido: %s"
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9731,7 +9898,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "No se pudo abrir el archivo de correo temporal: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No se pudo cerrar la carpeta origen %s: %s"
@@ -9748,39 +9915,39 @@ msgstr "No se pudo cambiar el nombre a la carpeta: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Resumen y carpeta no concuerdan, incluso después de una sincronización"
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "No se pudo almacenar carpeta:: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error la escribir al archivo de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error la escribir al archivo temporal: %s: %s"
 
 #
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
 msgstr "Adición de mensaje en el MH cancelada"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No se pudo añadir el mensaje a la carpeta mh: %s: %s"
@@ -9860,6 +10027,67 @@ msgstr ""
 "No se pudo sincronizar la carpeta de correo %s: %s\n"
 "La carpeta puede estar corrupta, copia guardada en «%s»"
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, fuzzy, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "%s Por favor escriba la contraseña SMTP para %s@%s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+#, fuzzy
+msgid "Failed to send username to server"
+msgstr "Falló al conectarse al servidor LDAP."
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "No se pudo obtener mensaje %s: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Usuario cancelado"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "No se pudo obtener grupo: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, fuzzy, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+"No se pudo crear el archivo de salida: %s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+"No se pudo crear el archivo de salida: %s\n"
+" %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Noticias USENET"
@@ -9868,22 +10096,22 @@ msgstr "Noticias USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Este es un proveedor para leer y enviar noticias a grupos de USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "No se pudo leer saludo desde %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "El servidor NNTP %s devolvió un código de error %d %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr "Noticias USENET vía %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9891,37 +10119,37 @@ msgstr ""
 "Esta opción es para autenticarse con el servidor NNTP usando una contraseña "
 "de texto."
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, c-format
 msgid "No such folder: %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, c-format
 msgid "Could not get group: %s"
 msgstr "No se pudo obtener grupo: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "El comando NNTP ha fallado: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Buscando mensajes nuevos"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Respuesta del servidor desconocida: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 msgid "Use cancel"
 msgstr "Usar cancelar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operación falló: %s"
@@ -9930,13 +10158,6 @@ msgstr "Operación falló: %s"
 msgid "Retrieving POP summary"
 msgstr "Obteniendo resumen POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-msgid "User cancelled"
-msgstr "Usuario cancelado"
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -9946,34 +10167,22 @@ msgstr "No se pudo obtener el sumario POP: %s"
 msgid "Expunging deleted messages"
 msgstr "Eliminando los mensajes borrados"
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hay mensajes con uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Obteniendo mensaje POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "No se pudo obtener mensaje %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Almacenamiento del mensaje"
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Dejar mensajes en el servidor"
@@ -10048,7 +10257,8 @@ msgstr "SASL «%s» Falló el inicio de sesión para servidor POP %s: %s"
 #: camel/providers/pop3/camel-pop3-store.c:427
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
+msgstr ""
+"No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
 
 #: camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
@@ -10084,7 +10294,8 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
+msgstr ""
+"Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -10136,140 +10347,143 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Para enviar correo conectándose a un servidor de correo usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Error de sintaxis, comando no reconocido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Error de sintaxis en los parámetros o los argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Parámetro del comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Mensaje de ayuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Servicio cerrando los canales de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio no disponible, cerrando los canales de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Acción de correo requerida en orden, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "El usuario no es local: lo reenviaré a <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Acción solicitada del correo no realizada: el mailbox no está disponible"
+msgstr ""
+"Acción solicitada del correo no realizada: el mailbox no está disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Acción solicitada no realizada: el mailbox no está disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Acción solicitada abortada: error en procesamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "El usuario no es local: por favor pruebe con <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
-msgstr "Acción solicitada no realizada: la capacidad del sistema es insuficiente"
+msgstr ""
+"Acción solicitada no realizada: la capacidad del sistema es insuficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Acción solicitada no realizada: excedió la capacidad de almacenamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Acción solicitada no realizada: nombre no permitido para mailbox"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Falló en la transacción"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Es necesaria una transición de contraseña"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "El método de autenticación es demasiado débil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Cifrado requerida por el mecanismo de autenticación pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Falló temporal en la autenticación"
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autenticación requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:298
 msgid "Welcome response error"
 msgstr "Error en la respuesta de bienvenida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Falló al conectar al servidor SMTP %s en modo seguro: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid "server does not appear to support SSL"
 msgstr "el servidor no parece soportar SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Petición STARTTLS expiró: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:372
 msgid "STARTTLS response error"
 msgstr "Error de respuesta en STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "El servidor SMTP %s no implementa el método de autenticación requerido %s"
+msgstr ""
+"El servidor SMTP %s no implementa el método de autenticación requerido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s Por favor escriba la contraseña SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10280,87 +10494,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Envío de correo SMTP vía %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr "No se pudo enviar el mensaje: dirección del remitente no válida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr "No se pudo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "No se pudo enviar el mensaje: uno o más destinatarios inválidos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr "Saludo del SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Expiró el tiempo para la petición HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 msgid "HELO response error"
 msgstr "Error en la respuesta a HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "Autenticación SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticación SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Expiró el tiempo para la petición AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "Error en la petición de AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Respuesta de autenticación errónea desde el servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para la petición MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr "Respuesta de error a MAIL FROM:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para la petición RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Falló RCPT TO <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para DATA: %s: correo no enviado"
@@ -10368,37 +10582,37 @@ msgstr "Expiró el tiempo para DATA: %s: correo no enviado"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 msgid "DATA response error"
 msgstr "DATA respondió con un error"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Expiró el tiempo para el envío de DATA: terminación del mensaje: %s: correo "
 "no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 msgid "DATA termination response error"
 msgstr "Error de respuesta en la terminación DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Expiró el tiempo para la petición RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "RSET response error"
 msgstr "Error en respuesta RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Expiró el tiempo para la petición QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "QUIT response error"
 msgstr "Respuesta de error a QUIT"
 
@@ -10417,20 +10631,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:313 mail/mail-display.c:226
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar los elementos seleccionados de la lista de adjuntos"
 
-#: composer/e-msg-composer-attachment-bar.c:481
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:482
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Adjuntar un archivo al mensaje"
 
@@ -10462,88 +10675,11 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr "Necesita una cuenta para enviar correo."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Pulse aquí para acceder a la agenda"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Responder a:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "De:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "A:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Escriba los destinatarios del mensaje"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Escriba las direcciones que recibirán una copia del mensaje"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Cco:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
-"la lista de destinatarios del mensaje."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Publicar A:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Publicar destino"
-
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Adjuntar archivo(s)"
-
-#: composer/e-msg-composer.c:540
+#: composer/e-msg-composer.c:562
 msgid "Could not create a PGP signature context"
 msgstr "No se pudo crear un contexto de firma PGP."
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:841
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10552,30 +10688,30 @@ msgstr ""
 "Error leyendo el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1182
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, ¿quiere sobreescribirlo?"
 
-#: composer/e-msg-composer.c:1200
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:1223
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1261
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1269
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "No se pudo obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1276
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10584,7 +10720,7 @@ msgstr ""
 "No se pudo buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10593,7 +10729,7 @@ msgstr ""
 "No se pudo truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1325
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10602,7 +10738,7 @@ msgstr ""
 "No se pudo copiar el descriptor de archivo:  %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1301
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10611,7 +10747,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1398
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10619,7 +10755,7 @@ msgstr ""
 "Ximian Evolution ha encontrado archivos no guardados de una sesión previa.\n"
 "¿Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1594
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10630,28 +10766,28 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1570
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:2026
+#: composer/e-msg-composer.c:2054
 msgid "Signature:"
 msgstr "Firma"
 
-#: composer/e-msg-composer.c:2066 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
-#: composer/e-msg-composer.c:2242 composer/e-msg-composer.c:2911
-#: composer/e-msg-composer.c:2912
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Redactar un mensaje"
 
-#: composer/e-msg-composer.c:2943
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10659,7 +10795,7 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudoactivar el control de selección de direcciones."
 
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:3030
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10671,7 +10807,7 @@ msgstr ""
 "Por favor, asegúrese de que tiene la versión \n"
 "correcta de gtkhtml y libgtkthml instalada.\n"
 
-#: composer/e-msg-composer.c:3038
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10679,11 +10815,91 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudoactivar el componente del editor HTML."
 
-#: composer/e-msg-composer.c:4064
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+msgstr ""
+"<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+
+#: composer/e-msg-composer-hdrs.c:290
+#, fuzzy
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+"Necesita configurar una cuenta para\n"
+"antes de poder escribir mensajes de correo."
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Pulse aquí para acceder a la agenda"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Responder a:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "De:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "A:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Escriba los destinatarios del mensaje"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Escriba las direcciones que recibirán una copia del mensaje"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Cco:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
+"la lista de destinatarios del mensaje."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Publicar A:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Publicar destino"
+
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Adjuntar archivo(s)"
 
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
@@ -10854,7 +11070,7 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Quiere sobreescribirlo?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:199
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
@@ -10876,90 +11092,211 @@ msgstr "Sincronizando categorías:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%I %p"
 
+#: executive-summary/component/component-factory.c:151
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+"No se pudo inicializar el componente de configuración de correo de Evolution."
+
+#: executive-summary/component/e-summary.c:925
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"No se pudo renombrar la carpeta:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:939
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Error cargando %s"
+
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:125
+#, fuzzy
+msgid "Select a service"
+msgstr "Elija un archivo"
+
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Enviar un correo"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Change the view to %s"
+msgstr "El tipo de vista a mostrar"
+
+#: executive-summary/component/e-summary-url.c:73
+#, fuzzy, c-format
+msgid "Run %s"
+msgstr "URL: %s"
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Cerrar"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Mueve esta carpeta a otro sitio"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Reconfigurar /%s"
+
+#: executive-summary/component/e-summary-url.c:553
+#, fuzzy
+msgid "page"
+msgstr "Página"
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+msgid "Error"
+msgstr "Error"
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update now"
+msgstr "Actualizar"
+
+#: executive-summary/test-service/rdf-summary.c:795
+#, fuzzy
+msgid "Update every "
+msgstr "_Actualizar Libre/Ocupado"
+
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr "hace un segundo"
@@ -11075,84 +11412,6 @@ msgstr "Debe especificar una carpeta."
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Error en la expresión regular «%s»:\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
-msgid "Important"
-msgstr "Importante"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-msgid "Work"
-msgstr "Trabajo"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-msgid "Personal"
-msgstr "Privado"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
-msgid "To Do"
-msgstr "Tareas pendientes"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
-msgid "Later"
-msgstr "Más tarde"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Prueba"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Debes dar un nombre a este filtro."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Nombre de la regla:"
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Sin título"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Si"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Ejecutar acciones"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "si se cumplen todos los criterios"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "si se cumple algún criterio"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "entrante"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "saliente"
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Comparar con"
@@ -11254,6 +11513,84 @@ msgstr "con todas las carpetas locales"
 msgid "years"
 msgstr "años"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Error en la expresión regular «%s»:\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+msgid "Important"
+msgstr "Importante"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Trabajo"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Privado"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+msgid "To Do"
+msgstr "Tareas pendientes"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1458
+msgid "Later"
+msgstr "Más tarde"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Prueba"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Debes dar un nombre a este filtro."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Nombre de la regla:"
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Sin título"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Si"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Ejecutar acciones"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "si se cumplen todos los criterios"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "si se cumple algún criterio"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "entrante"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "saliente"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11276,217 +11613,217 @@ msgid "Beep"
 msgstr "Pitar"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Fecha de recepción"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Fecha de envío"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Borrado"
 
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr "No Existe"
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "no contiene"
+msgid "Draft"
+msgstr "Borrador"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "no acaba en"
+msgid "Exist"
+msgstr "Salir"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "no existe"
+msgid "Expression"
+msgstr "Expresión"
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "no devuelve"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "no suena como"
+msgid "Follow Up"
+msgstr "Seguimiento"
 
 #: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "no comienza por"
+msgid "Label"
+msgstr "Etiquetar"
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "No Existe"
+msgid "Mailing list"
+msgstr "Lista de correo"
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Borrador"
+msgid "Message Body"
+msgstr "Cuerpo del mensaje"
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "acaba en"
+msgid "Message Header"
+msgstr "Cabecera del mensaje"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Salir"
+msgid "Move to Folder"
+msgstr "Mover a la carpeta"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existe"
+msgid "Pipe Message to Shell Command"
+msgstr "Redirigir mensaje a Orden de Shell"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expresión"
+msgid "Play Sound"
+msgstr "Reproducir un sonido:"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Seguimiento"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Leído"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Destinatarios"
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "es"
+msgid "Regex Match"
+msgstr "Expresión regular"
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "está después de"
+msgid "Replied to"
+msgstr "Respondió a"
 
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "está antes de"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puntuación"
 
 #: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "está marcado"
+msgid "Sender"
+msgstr "Remitente"
 
 #: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "es mayor que"
+msgid "Set Status"
+msgstr "Poner estado"
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "es menor que"
+msgid "Shell Command"
+msgstr "Comando de shell"
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "no es"
+msgid "Size (kB)"
+msgstr "Tamaño (Kb)"
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "no está marcado"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1822
-msgid "Label"
-msgstr "Etiquetar"
+msgid "Source Account"
+msgstr "Cuenta origen"
 
-#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr "Lista de correo"
+#: filter/libfilter-i18n.h:35
+msgid "Specific header"
+msgstr "Cabecera específica"
 
 #: filter/libfilter-i18n.h:37
-msgid "Message Body"
-msgstr "Cuerpo del mensaje"
+msgid "Stop Processing"
+msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:38
-msgid "Message Header"
-msgstr "Cabecera del mensaje"
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Asunto"
 
 #: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
-msgstr "Mover a la carpeta"
+msgid "Unset Status"
+msgstr "Sin estado"
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
-msgstr "Redirigir mensaje a Orden de Shell"
+msgid "contains"
+msgstr "contiene"
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
-msgstr "Reproducir un sonido:"
+msgid "does not contain"
+msgstr "no contiene"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Leído"
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
+msgstr "no acaba en"
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
-msgstr "Destinatarios"
+msgid "does not exist"
+msgstr "no existe"
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
-msgstr "Expresión regular"
+msgid "does not return"
+msgstr "no devuelve"
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
-msgstr "Respondió a"
+msgid "does not sound like"
+msgstr "no suena como"
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
-msgstr "devuelve"
+msgid "does not start with"
+msgstr "no comienza por"
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
-msgstr "devuelve mayor que"
+msgid "ends with"
+msgstr "acaba en"
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
-msgstr "devuelve menor que"
+msgid "exists"
+msgstr "existe"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puntuación"
+#: filter/libfilter-i18n.h:49
+msgid "is Flagged"
+msgstr "está marcado"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
-msgid "Sender"
-msgstr "Remitente"
+#: filter/libfilter-i18n.h:50
+msgid "is after"
+msgstr "está después de"
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
-msgstr "Poner estado"
+msgid "is before"
+msgstr "está antes de"
 
 #: filter/libfilter-i18n.h:52
-msgid "Shell Command"
-msgstr "Comando de shell"
+msgid "is greater than"
+msgstr "es mayor que"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "Tamaño (Kb)"
+msgid "is less than"
+msgstr "es menor que"
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "suena como"
+msgid "is not Flagged"
+msgstr "no está marcado"
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
-msgstr "Cuenta origen"
+msgid "is not"
+msgstr "no es"
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
-msgstr "Cabecera específica"
+msgid "is"
+msgstr "es"
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "comienza por"
+msgid "returns greater than"
+msgstr "devuelve mayor que"
+
+#: filter/libfilter-i18n.h:58
+msgid "returns less than"
+msgstr "devuelve menor que"
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
-msgstr "Parar el proceso"
+msgid "returns"
+msgstr "devuelve"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Asunto"
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
+msgstr "suena como"
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
-msgstr "Sin estado"
+msgid "starts with"
+msgstr "comienza por"
 
-#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:916
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "El nombre de la regla «%s» no es único, elija otro"
@@ -11554,10 +11891,9 @@ msgid "Scanning %s"
 msgstr "Guardando %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Correo"
 
@@ -11644,7 +11980,7 @@ msgstr "Evolution está importando su información antigua de Netscape"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Papelera"
 
@@ -11694,97 +12030,39 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferencias del editor"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr ""
-"Configure las preferencias de correo incluyendo seguridad y visualización de "
-"mensajes, aquí"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure aquí la ortografía, firmas y la composición de mensajes."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure sus cuentas de correo aquí"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Control de configuración de cuentas de correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Componente de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Redactor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Control de configuración del redactor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Interfaz de configuración del correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr "Componente del visor de carpetas de correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr "Control de preferencias de Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Cuentas de correo"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "Opciones de correo"
-
-#: mail/component-factory.c:117
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Carpeta conteniendo correo"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Correo público"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Carpeta pública conteniendo correo"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Papelera virtual"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Carpetas de papelera virtuales"
 
-#: mail/component-factory.c:147
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Esta carpeta no contiene mensajes."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Change this folder's properties"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: mail/component-factory.c:823
+#: mail/component-factory.c:826
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11792,234 +12070,108 @@ msgstr ""
 "Algunas de tus opciones de correo parece que están corruptas, por favor "
 "comprueba que todo está en orden."
 
-#: mail/component-factory.c:1004
+#: mail/component-factory.c:1008
 msgid "You have not set a mail transport method"
 msgstr "No ha definido un sistema para enviar el correo"
 
-#: mail/component-factory.c:1027
+#: mail/component-factory.c:1031
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1071
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1071
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/component-factory.c:1068
+#: mail/component-factory.c:1072
 msgid "Compose a new mail message"
 msgstr "Redactar mensaje nuevo"
 
-#: mail/component-factory.c:1076
+#: mail/component-factory.c:1080
 msgid "New Message Post"
 msgstr "Publicar anuncio nuevo"
 
-#: mail/component-factory.c:1076
+#: mail/component-factory.c:1080
 msgid "_Post Message"
 msgstr "_Publicar mensaje"
 
-#: mail/component-factory.c:1077
+#: mail/component-factory.c:1081
 msgid "Post a new mail message"
 msgstr "Publicar un mensaje nuevo"
 
-#: mail/component-factory.c:1369
+#: mail/component-factory.c:1373
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: mail/component-factory.c:1380
+#: mail/component-factory.c:1384
 msgid "Cannot register storage with shell"
 msgstr "No se pudo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-ui.c:486
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Propiedades para «%s»"
-
-#: mail/folder-browser-ui.c:488
-msgid "Properties"
-msgstr "Propiedades"
-
-#: mail/folder-browser.c:329 mail/mail-display.c:393 mail/mail-display.c:917
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "No se pudo crear el directorio temporal: %s"
-
-#: mail/folder-browser.c:804
-#, c-format
-msgid "%d new"
-msgstr "%d nuevos"
-
-#: mail/folder-browser.c:807 mail/folder-browser.c:815
-#: mail/folder-browser.c:818
-msgid ", "
-msgstr ", "
-
-#: mail/folder-browser.c:809
-#, c-format
-msgid "%d hidden"
-msgstr "%d ocultos"
-
-#: mail/folder-browser.c:811
-#, c-format
-msgid "%d visible"
-msgstr "%d visibles"
-
-#: mail/folder-browser.c:816
-#, c-format
-msgid "%d selected"
-msgstr "%d seleccionado"
-
-#: mail/folder-browser.c:821
-#, c-format
-msgid "%d unsent"
-msgstr "%d sin enviar"
-
-#: mail/folder-browser.c:823
-#, c-format
-msgid "%d sent"
-msgstr "%d enviar"
-
-#: mail/folder-browser.c:825
-#, c-format
-msgid "%d total"
-msgstr "%d total"
-
-#: mail/folder-browser.c:1204
-msgid "Create _Virtual Folder From Search..."
-msgstr "Crear una carpeta _virtual de la búsqueda..."
-
-#: mail/folder-browser.c:1758
-msgid "VFolder on _Subject"
-msgstr "Carpeta virtual según el a_sunto"
-
-#: mail/folder-browser.c:1759
-msgid "VFolder on Se_nder"
-msgstr "Carpeta virtual según el re_mitente"
-
-#: mail/folder-browser.c:1760
-msgid "VFolder on _Recipients"
-msgstr "Carpeta virtual según los des_tinatarios"
-
-#: mail/folder-browser.c:1761
-msgid "VFolder on Mailing _List"
-msgstr "Carpeta virtual según la li_sta de correo"
-
-#: mail/folder-browser.c:1765
-msgid "Filter on Sub_ject"
-msgstr "Filtro según el _asunto"
-
-#: mail/folder-browser.c:1766
-msgid "Filter on Sen_der"
-msgstr "Filtro según el _remitente"
-
-#: mail/folder-browser.c:1767
-msgid "Filter on Re_cipients"
-msgstr "Filtro según los _destinatarios"
-
-#: mail/folder-browser.c:1768 mail/folder-browser.c:2092
-msgid "Filter on _Mailing List"
-msgstr "Filtro según la lista de _correo"
-
-#: mail/folder-browser.c:1786
-msgid "_Edit as New Message..."
-msgstr "_Editar como un mensaje nuevo..."
-
-#: mail/folder-browser.c:1788
-msgid "_Print"
-msgstr "Im_primir"
-
-#: mail/folder-browser.c:1792 ui/evolution-mail-message.xml.h:110
-msgid "_Reply to Sender"
-msgstr "Responder al _remitente"
-
-#: mail/folder-browser.c:1793 ui/evolution-mail-message.xml.h:75
-msgid "Reply to _List"
-msgstr "Responder a la _lista"
-
-#: mail/folder-browser.c:1794 ui/evolution-mail-message.xml.h:74
-msgid "Reply to _All"
-msgstr "Responder a _todos"
-
-#: mail/folder-browser.c:1795
-msgid "_Forward"
-msgstr "Reen_viar"
-
-#: mail/folder-browser.c:1799
-msgid "Follo_w Up..."
-msgstr "_Seguimiento..."
-
-#: mail/folder-browser.c:1800
-msgid "Fla_g Completed"
-msgstr "Ma_rcar como terminado"
-
-#: mail/folder-browser.c:1801
-msgid "Cl_ear Flag"
-msgstr "_Quitar marca"
-
-#. separator here?
-#: mail/folder-browser.c:1805 ui/evolution-mail-message.xml.h:43
-msgid "Mar_k as Read"
-msgstr "Mar_car como leído"
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Obteniendo información de la carpeta"
 
-#: mail/folder-browser.c:1806
-msgid "Mark as _Unread"
-msgstr "Marcar como _no leído"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Preferencias del editor"
 
-#: mail/folder-browser.c:1807
-msgid "Mark as _Important"
-msgstr "Marcar como _importante"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure las preferencias de correo incluyendo seguridad y visualización de "
+"mensajes, aquí"
 
-#: mail/folder-browser.c:1808
-msgid "_Mark as Unimportant"
-msgstr "Marcar como no im_portante"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure aquí la ortografía, firmas y la composición de mensajes."
 
-#: mail/folder-browser.c:1813
-msgid "U_ndelete"
-msgstr "_Recuperar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Configure sus cuentas de correo aquí"
 
-#: mail/folder-browser.c:1817
-msgid "Mo_ve to Folder..."
-msgstr "Mo_ver a la carpeta..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Correo de Evolution"
 
-#: mail/folder-browser.c:1818 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "_Copiar a la carpeta..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Control de configuración de cuentas de correo de Evolution"
 
-#: mail/folder-browser.c:1826
-msgid "Add Sender to Address_book"
-msgstr "Añadir remitente a la li_breta de direcciones"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Componente de correo de Evolution."
 
-#: mail/folder-browser.c:1830
-msgid "Appl_y Filters"
-msgstr "Aplicar _filtros"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Redactor de correo de Evolution."
 
-#: mail/folder-browser.c:1834
-msgid "Crea_te Rule From Message"
-msgstr "Crear re_gla desde el mensaje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Control de configuración del redactor de correo de Evolution."
 
-#: mail/folder-browser.c:2093
-msgid "VFolder on M_ailing List"
-msgstr "Carpeta virtual según la _lista de correo"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail configuration interface"
+msgstr "Interfaz de configuración del correo de Evolution"
 
-#: mail/folder-browser.c:2095
-#, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Filtrar según la _lista de correo (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
+msgstr "Componente del visor de carpetas de correo de Evolution"
 
-#: mail/folder-browser.c:2096
-#, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "Carpeta virtual según la li_sta de correo (%s)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
+msgstr "Control de preferencias de Evolution"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Predeterminado"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Cuentas de correo"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Obteniendo información de la carpeta"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "Opciones de correo"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -12105,7 +12257,7 @@ msgstr "_Nombre de usuario:"
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1886
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
@@ -12136,16 +12288,16 @@ msgstr "[Predeterminada]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Habilitada"
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 msgid "Account name"
 msgstr "Nombre de la cuenta"
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -12188,219 +12340,6 @@ msgstr ""
 "    «%s»\n"
 "Y han sido actualizadas."
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "No mostrar otra vez este mensaje."
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"No ha configurado el cliente de correo.\n"
-"Necesita hacerlo para poder enviar,\n"
-"recibir o escribir mensajes.\n"
-"¿Querría configurarlo ahora?"
-
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-"Necesita configurar una cuenta para\n"
-"antes de poder escribir mensajes de correo."
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Necesita configurar una identidad para\n"
-"poder escribir mensajes de correo."
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Necesita configurar un transporte de\n"
-"correo para poder enviarlo."
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-"Está enviando un mensaje formateado en HTML. Por favor, asegúrese de que los "
-"siguientes destinatarios desean y son capaces de recibir  mensajes "
-"formateados en HTML:\n"
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "¿Enviar de todos modos?"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Este mensaje no tiene asunto.\n"
-"¿Quiere enviarlo?"
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-"Dado que la lista de contactos a la que estas enviado está configurada para "
-"esconder la lista de direcciones, este mensaje sólo contendrá destinatarios "
-"Cco."
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "Este mensaje solo contiene destinatarios Cco."
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-"Es posible que el servidor de correo revele los destinatarios añadiendo una "
-"cabecera Apparently-To.\n"
-"¿Enviar de todos modos?"
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Debes especificar destinatarios para poder enviar el mensaje."
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"No se pudo abrir la carpeta de borradores para esta cuenta.\n"
-"¿Quiere usar la carpeta de borradores predeterminada?"
-
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr "un remitente desconocido"
-
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "El %a, %d-%m-%Y a las %H:%M, %%s escribió:"
-
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "Mover mensaje(s) a"
-
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "Copiar mensaje(s) a"
-
-#: mail/mail-callbacks.c:2344
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "¿Seguro que quiere editar los %d mensajes?"
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Solo puede editar mensajes guardados\n"
-"en la carpeta Borradores."
-
-#: mail/mail-callbacks.c:2393
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Sólo puede reenviar mensajes\n"
-"de la carpeta Enviados."
-
-#: mail/mail-callbacks.c:2403
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "¿Seguro que quiere reenviar todos los %d mensajes?"
-
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr "Se hay mensajes seleccionados"
-
-#: mail/mail-callbacks.c:2465
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"No se pudo obtener el mensaje; «%s»\n"
-"  %s"
-
-#: mail/mail-callbacks.c:2470
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"«%s» ya existe\n"
-"¿Quiere sobreescribirlo?"
-
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr "Guardar mensaje como..."
-
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr "Guardar mensajes como..."
-
-#: mail/mail-callbacks.c:2686
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"Esta operación borrará permanentemente todos los mensajes marcados como "
-"borrados. Si continuas, no podrás recuperar esos mensajes.\n"
-"\n"
-"¿Borrar realmente esos mensajes?"
-
-#: mail/mail-callbacks.c:2781
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Error cargando la información del filtro:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr "Filtros"
-
-#: mail/mail-callbacks.c:2830
-#, c-format
-msgid "Page %d of %d"
-msgstr "Página %d de %d"
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr "Imprimir mensaje"
-
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr "Ha fallado la impresión del mensaje"
-
-#: mail/mail-callbacks.c:3147
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "¿Seguro que quiere abrir %d mensajes en ventanas separadas?"
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12426,11 +12365,19 @@ msgstr "Añadir script de firma"
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Comprobando el servicio"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Conectando al servidor..."
+
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:369
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12440,11 +12387,11 @@ msgstr ""
 "«opcionales» no hace falta que los rellene,\n"
 "a menos que quiera incluir esta información en las cartas que envíe."
 
-#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 msgid "Receiving Mail"
 msgstr "Recibiendo correo"
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:377
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12453,15 +12400,15 @@ msgstr ""
 "Si no está seguro, pregúntele a su\n"
 "administrador de sistemas o a su Proveedor de Servicios de Internet."
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr "Por favor selecciona entre las siguientes opciones"
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:389
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12470,11 +12417,11 @@ msgstr ""
 "no está seguro, pregúntele\n"
 "a su administrador de sistemas o a su Proveedor de Servicios de Internet."
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:396
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12488,14 +12435,6 @@ msgstr ""
 "Por favor escriba un nombre para esta cuenta en el espacio de abajo.Este "
 "nombre sólo se usará para mostrar información."
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Comprobando el servicio"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Conectando al servidor..."
-
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Comprobar tipos soportados "
@@ -12616,6 +12555,10 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Predeterminada"
 
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Predeterminado"
+
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Comportamiento predefinido"
@@ -13060,213 +13003,25 @@ msgstr "U_sar conexiones seguras (SSL)"
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: mail/mail-config.glade.h:171
-msgid "color"
-msgstr " "
-
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "descripción"
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr "No se pudo crear un contexto de firma S/MIME."
-
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
-msgstr "No se pudo crear un contexto de certificado S/MIME."
-
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr "No se pudo crear un contexto de cifrado S/MIME."
-
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
-msgstr "No se pudo crear un contexto sobre tipo S/MIME."
-
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr "No se pudo crear un contexto de decodificación S/MIME."
-
-#: mail/mail-display.c:196
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"El archivo «%s» ya existe.\n"
-"¿Quiere que lo sobreescriba?"
-
-#: mail/mail-display.c:335
-msgid "Save Attachment"
-msgstr "Guardar adjunto"
-
-#: mail/mail-display.c:408
-#, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "No se pudo crear el archivo temporal: «%s»: %s"
-
-#: mail/mail-display.c:476
-msgid "Save Attachment..."
-msgstr "Guardar adjunto"
-
-#: mail/mail-display.c:477
-msgid "View Inline"
-msgstr "Ver incluido"
-
-#: mail/mail-display.c:478
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %s..."
-
-#: mail/mail-display.c:538
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Ver incluido (vía %s)"
-
-#: mail/mail-display.c:542
-msgid "Hide"
-msgstr "Ocultar"
-
-#: mail/mail-display.c:562
-msgid "External Viewer"
-msgstr "Visores externos"
-
-#: mail/mail-display.c:1348
-msgid "Downloading images"
-msgstr "Descargando imágenes"
-
-#: mail/mail-display.c:1525
-msgid "Loading message content"
-msgstr "Cargando el contenido del mensaje"
-
-#: mail/mail-display.c:1867
-msgid "Overdue:"
-msgstr "Retrasadas:"
-
-#: mail/mail-display.c:1871
-msgid "by %B %d, %Y, %l:%M %P"
-msgstr "por %B %d, %Y, %l:%M %P"
-
-#: mail/mail-display.c:2235
-msgid "Open Link in Browser"
-msgstr "Abrir enlace en el Navegador"
-
-#: mail/mail-display.c:2236
-msgid "Copy Link Location"
-msgstr "Copiar dirección del enlace"
-
-#: mail/mail-display.c:2238
-msgid "Save Link as (FIXME)"
-msgstr "Guardar enlace como (ARRÉGLAME)"
-
-#: mail/mail-display.c:2240
-msgid "Save Image as..."
-msgstr "Guardar imagen como..."
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: mail/mail-format.c:665
-#, c-format
-msgid "%s attachment"
-msgstr "%s adjunto"
-
-#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
-#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
-
-#: mail/mail-format.c:785 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Fecha"
-
-#: mail/mail-format.c:871
-msgid "Bad Address"
-msgstr "Dirección errónea"
-
-#: mail/mail-format.c:912 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "De"
-
-#: mail/mail-format.c:916
-msgid "Reply-To"
-msgstr "Responder a"
-
-#: mail/mail-format.c:921 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "A"
-
-#: mail/mail-format.c:926
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/mail-format.c:931
-msgid "Bcc"
-msgstr "Cco"
-
-#: mail/mail-format.c:1482
-msgid "This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Este mensaje está firmado digitalmente. Pulsa en el icono del candado para "
-"más información."
-
-#: mail/mail-format.c:1510
-msgid "Could not create a PGP verfication context"
-msgstr "No se pudo crear un contexto de verificación PGP."
-
-#: mail/mail-format.c:1518
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Este mensaje está firmado digitalmente y es auténtico."
-
-#: mail/mail-format.c:1525
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Este mensaje está firmado digitalmente pero no se puede verificar su "
-"autenticidad."
-
-#: mail/mail-format.c:1789
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Puntero a sitio FTP (%s)"
-
-#: mail/mail-format.c:1800
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Puntero a archivo local (%s) valido en «%s»"
-
-#: mail/mail-format.c:1803
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Puntero a archivo local (%s)"
-
-#: mail/mail-format.c:1830
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Puntero a sitio FTP (%s)"
-
-#: mail/mail-format.c:1836
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
-
-#: mail/mail-format.c:1838
-msgid "Malformed external-body part."
-msgstr "Parte externa al cuerpo del mensaje mal escrita."
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Carpetas locales/%s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:711
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando carpeta"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:792
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13275,22 +13030,22 @@ msgstr ""
 "No se pudo guardar la meta información de la carpeta: probablemente\n"
 "no puedas volver a abrir esta carpeta: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:848
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No se pudo guardar la meta información de la carpeta en %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:900
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "No se pudo borrar la metainformación de la carpeta %s: %s"
 
-#: mail/mail-local.c:1323
+#: mail/mail-local.c:1363
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta «%s» al formato «%s»"
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1388
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13298,16 +13053,16 @@ msgstr ""
 "Si no puede volver a abrir este buzón, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1448
+#: mail/mail-local.c:1488
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
 
-#: mail/mail-local.c:1512
+#: mail/mail-local.c:1552
 msgid "You cannot change the format of a non-local folder."
 msgstr "No puede cambiar el formato de una carpeta no local."
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:259
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13316,7 +13071,7 @@ msgstr ""
 "Error mientras «%s»':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:262
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13325,118 +13080,131 @@ msgstr ""
 "Error al efectuar operación:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:913
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:87
 msgid "Filtering Folder"
 msgstr "Filtrando carpeta"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:550 mail/mail-ops.c:579
-msgid "However, the message was successfully sent."
-msgstr "Aun así, este mensaje fue enviado correctamente."
+#: mail/mail-ops.c:557
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Falló al guardar el correo en al archivo temporal %s: %s"
+
+#: mail/mail-ops.c:578
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: mail/mail-ops.c:587
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Falló al guardar el correo en al archivo temporal %s: %s"
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando «%s»"
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr "Purgando carpeta"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1666
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13445,7 +13213,7 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13454,11 +13222,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13467,106 +13235,74 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Mensaje sin título)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Mensaje sin título"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Mensaje vacío"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "Buscar en mensaje"
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr "Sensible a mayúsculas"
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "Buscar hacia adelante"
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr "Buscar:"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Coincide:"
-
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ruta: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:259
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:308
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:390
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:229
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:262
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:264
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:287
 msgid "_Remember this password"
 msgstr "_Recuerda esta contraseña"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:288
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recordar esta clave durante el resto de esta sesión"
 
@@ -13614,21 +13350,17 @@ msgstr "Reenviado mensaje - %s"
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:459 mail/mail-tools.c:466
-msgid "Forwarded Message"
-msgstr "Mensaje reenviado"
-
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Configurando carpeta virtual: %s"
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:209
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualizando carpetas virtuales para la uri: %s"
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:467
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13641,100 +13373,95 @@ msgstr ""
 "    «%s»\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:776
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:834
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:873
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tratando de editar una carpeta virtual «%s» que no existe."
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:965
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Sin asunto)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - Mensaje"
-
-#: mail/message-list.c:741
+#: mail/message-list.c:900
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:742
+#: mail/message-list.c:901
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:743
+#: mail/message-list.c:902
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:903
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:904
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:908
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:909
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:754
+#: mail/message-list.c:913
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:755
+#: mail/message-list.c:914
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1231
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1238
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1247
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1259
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1267
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1269
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3062
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Fecha"
+
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Vence en"
@@ -13751,6 +13478,10 @@ msgstr "Marcado"
 msgid "Follow Up Flag"
 msgstr "Marca de seguimiento"
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "De"
+
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Ubicación original"
@@ -13763,6 +13494,10 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "A"
+
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Llamada"
@@ -13779,7 +13514,7 @@ msgstr "Seguimiento"
 msgid "For Your Information"
 msgstr "Para su información"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr "Reenviar"
 
@@ -13787,11 +13522,11 @@ msgstr "Reenviar"
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
 msgid "Reply to All"
 msgstr "Responder a todos"
 
@@ -13823,39 +13558,6 @@ msgstr "_Vence el:"
 msgid "_Flag:"
 msgstr "_Marca"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "Analizando carpetas bajo %s en «%s»"
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "Analizando carpetas de nivel superior en «%s»"
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Suscribiendo a carpeta «%s»"
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Desuscribiendo la carpeta «%s»"
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Carpeta"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "No se ha seleccionado ningún servidor"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Por favor seleccione un servidor."
-
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Suscripciones de carpetas"
@@ -13869,17 +13571,123 @@ msgid "S_erver:"
 msgstr "S_ervidor:"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Scanning folders ..."
-msgstr "Analizando carpetas..."
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Suscribir"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "La carpeta contiene el resumen de Evolution"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %e de %B de %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Por favor espere..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Imprimir resumen"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Ha fallado la impresión del resumen"
+
+#: my-evolution/e-summary-calendar.c:384
+msgid "Appointments"
+msgstr "Citas"
+
+#: my-evolution/e-summary-calendar.c:392
+msgid "No appointments."
+msgstr "No tiene citas."
+
+#: my-evolution/e-summary-calendar.c:409
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:411
+#, fuzzy
+msgid "%l:%M%p %d %B"
+msgstr "%l:%M%P %d %B"
+
+#: my-evolution/e-summary-calendar.c:429
+msgid "No description"
+msgstr "Sin descripción"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Resumen de correo"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Palabra del día de Dictionary.com"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Frase célebre del día"
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr "Nueva fuente de noticias"
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr "_URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Error al descargar RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Fuente de noticias"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Todo"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Mostrados"
+
+#: my-evolution/e-summary-tasks.c:349
+msgid "No tasks"
+msgstr "No hay tareas"
+
+#: my-evolution/e-summary-tasks.c:387
+#, fuzzy
+msgid "blue"
+msgstr "Ambler"
+
+#: my-evolution/e-summary-tasks.c:387
+msgid "(No Description)"
+msgstr "(Sin descripción)"
+
+#: my-evolution/e-summary-weather.c:72
+msgid "My Weather"
+msgstr "Mi meteorología"
+
+#: my-evolution/e-summary-weather.c:261
+msgid "There was an error downloading data for"
+msgstr "Hubo un error descargando datos para"
+
+#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Meteorología"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:582
+msgid "KBOS"
+msgstr "LEMD:LEVS:LEVC"
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Configure la apariencia del Resumen de Evolution aquí"
@@ -23685,110 +23493,6 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "La carpeta contiene el resumen de Evolution"
-
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr "Citas"
-
-#: my-evolution/e-summary-calendar.c:389
-msgid "No appointments."
-msgstr "No tiene citas."
-
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:408
-msgid "%l:%M%P %d %B"
-msgstr "%l:%M%P %d %B"
-
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr "Sin descripción"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Resumen de correo"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Palabra del día de Dictionary.com"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Frase célebre del día"
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr "Nueva fuente de noticias"
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "_URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Error al descargar RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Fuente de noticias"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Todo"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Mostrados"
-
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr "No hay tareas"
-
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr "(Sin descripción)"
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Mi meteorología"
-
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr "Hubo un error descargando datos para"
-
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Meteorología"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr "LEMD:LEVS:LEVC"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %e de %B de %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Por favor espere..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Imprimir resumen"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Ha fallado la impresión del resumen"
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -25047,23 +24751,29 @@ msgstr "_Un día"
 msgid "_Show full path for folders"
 msgstr "Mo_strar ruta completa para las carpetas"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-"Configure carpetas especiales y el comportamiento de las carpetas fuera de "
-"línea aquí"
+#: notes/component-factory.c:27
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Nuevo"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Intérprete de Evolution."
+#: notes/component-factory.c:27
+#, fuzzy
+msgid "Create a new note"
+msgstr "Crear una nueva carpeta"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Control de configuración de preferencias de carpetas de Evolution"
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr ""
+"No se pudo inicializar el componente de información sobre carpetas de "
+"Evolution."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Configuración de carpetas"
+#: notes/main.c:30
+#, fuzzy
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "No se pudo inicializar Bonobo"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25158,6 +24868,49 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Producido por"
 
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"No se pudo activar el componente %s :\n"
+"El error del sistema de activación es:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "No se pudo configurar almacenamiento local -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"El componente de Evolution que se ocupa de las carpetas de tipo\n"
+"«%s» ha fallado inesperadamente. Deberá salir de Evolution y volver\n"
+"a entrar para poder acceder otra vez a esa información."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Argumentos inválidos"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "No se pudo registrar en OAF"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "No se encontró la base de datos de configuración"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Error genérico"
+
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Carpetas adicionales para autocompletar direcciones"
@@ -25264,7 +25017,8 @@ msgstr "El nombre de carpeta especificado no es valido: %s"
 #: shell/e-shell-folder-commands.c:554
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
+msgstr ""
+"Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -25398,23 +25152,27 @@ msgid "Automatic"
 msgstr "Automático"
 
 #: shell/e-shell-importer.c:643
-msgid "Filename:"
+#, fuzzy
+msgid "_Filename:"
 msgstr "Nombre de archivo:"
 
 #: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: shell/e-shell-importer.c:657
-msgid "File type:"
+#: shell/e-shell-importer.c:658
+#, fuzzy
+msgid "File _type:"
 msgstr "Tipo de archivo:"
 
-#: shell/e-shell-importer.c:682
-msgid "Import data and settings from older programs"
+#: shell/e-shell-importer.c:684
+#, fuzzy
+msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuración de programas antiguos"
 
-#: shell/e-shell-importer.c:686
-msgid "Import a single file"
+#: shell/e-shell-importer.c:687
+#, fuzzy
+msgid "Import a _single file"
 msgstr "Importar un único archivo"
 
 #: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
@@ -25442,8 +25200,9 @@ msgstr "Seleccionar carpeta"
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
-#: shell/e-shell-importer.c:1192 shell/importer/intelligent.c:191
-msgid "Import"
+#: shell/e-shell-importer.c:1193
+#, fuzzy
+msgid "_Import"
 msgstr "Importar"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25503,11 +25262,19 @@ msgstr "No se pudo abrir la carpeta compartida: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "No se pudo encontrar la carpeta compartida especificada"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Nuevo"
+#: shell/e-shell-startup-wizard.c:771
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:782
+#, fuzzy
+msgid "Quit Assistant"
+msgstr "Secretario"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25515,7 +25282,8 @@ msgstr "No ha especificado un nombre de carpeta."
 
 #: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
-msgstr "El nombre de la carpeta no puede contener el carácter de retorno de carro."
+msgstr ""
+"El nombre de la carpeta no puede contener el carácter de retorno de carro."
 
 #: shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
@@ -25529,9 +25297,41 @@ msgstr "El nombre de la carpeta no puede contener el carácter «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' y '..' son nombres reservados de carpetas."
 
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(No hay carpetas mostrándose)"
+
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(nada)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution está conectado.  Pulse este botón para trabajar "
+"desconectado."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution está en proceso de desconectarse."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution está desconectado.  Pulse este botón para trabajar "
+"conectado."
+
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+msgstr ""
+"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
 #: shell/e-shell-view-menu.c:97
 #, c-format
@@ -25578,77 +25378,13 @@ msgstr "_Trabajar desconectado"
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(No hay carpetas mostrándose)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(nada)"
-
-#: shell/e-shell-view.c:2083
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution está conectado.  Pulse este botón para trabajar "
-"desconectado."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution está en proceso de desconectarse."
-
-#: shell/e-shell-view.c:2096
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution está desconectado.  Pulse este botón para trabajar "
-"conectado."
-
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"No se pudo activar el componente %s :\n"
-"El error del sistema de activación es:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "No se pudo configurar almacenamiento local -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"El componente de Evolution que se ocupa de las carpetas de tipo\n"
-"«%s» ha fallado inesperadamente. Deberá salir de Evolution y volver\n"
-"a entrar para poder acceder otra vez a esa información."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Argumentos inválidos"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "No se pudo registrar en OAF"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "No se encontró la base de datos de configuración"
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Error guardando atajos."
 
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Error genérico"
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Atajos"
 
 #: shell/e-shortcuts-view.c:80
 msgid "Create New Shortcut Group"
@@ -25763,18 +25499,6 @@ msgstr "Qui_tar"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Error guardando atajos."
-
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Atajos"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Activar"
-
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Sin errores"
@@ -25831,6 +25555,14 @@ msgstr "No se pudo crear una carpeta con ese nombre"
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Esta operación no puede efectuarse en modo desconectado"
 
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Activar"
+
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Carpeta"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25845,43 +25577,6 @@ msgstr "%s (%d%% completado)"
 msgid "<click here to select a folder>"
 msgstr "<pinche aquí para seleccionar una carpeta>"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Error desconocido."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"El error del sistema de componentes es:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"El error del sistema de activación es:\n"
-"%s"
-
 #: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr "Error CORBA"
@@ -25942,6 +25637,43 @@ msgstr "No queda sitio"
 msgid "Old owner has died"
 msgstr "El antiguo dueño a muerto"
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Error desconocido."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"El error del sistema de componentes es:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"El error del sistema de activación es:\n"
+"%s"
+
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Tipo de pruebas"
@@ -26048,6 +25780,24 @@ msgstr ""
 "\n"
 "Pulse el botón «Aplicar» para guardar su configuración. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+"Configure carpetas especiales y el comportamiento de las carpetas fuera de "
+"línea aquí"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Intérprete de Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Control de configuración de preferencias de carpetas de Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Configuración de carpetas"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Pulse «Importar» para comenzar a importar el archivo en Evolution. "
@@ -26086,6 +25836,10 @@ msgstr ""
 msgid "Importers"
 msgstr "Importadores"
 
+#: shell/importer/intelligent.c:191
+msgid "Import"
+msgstr "Importar"
+
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "No importar"
@@ -26274,7 +26028,7 @@ msgstr "Mover contact(os) a otra carpeta..."
 msgid "Move to Folder..."
 msgstr "Mover a la carpeta..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "Pega el contenido del porta papeles"
 
@@ -26282,8 +26036,8 @@ msgstr "Pega el contenido del porta papeles"
 msgid "Previews the contacts to be printed"
 msgstr "Previsualiza los contactos a imprimir"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Pre_visualizar la impresión"
@@ -26328,17 +26082,21 @@ msgstr "Parar la carga"
 msgid "View the current contact"
 msgstr "Ver el contacto actual"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "A_cciones"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "_Copiar a la carpeta..."
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Reenviar contactos..."
 
@@ -26406,46 +26164,61 @@ msgstr "Ir a una fecha específica"
 msgid "Go to today"
 msgstr "Ir a hoy"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza el calendario a imprimir"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Imprime este calendario"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publica información de disponibilidad para este calendario"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#, fuzzy
+msgid "Purg_e"
+msgstr "Bourges"
+
+#: ui/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Purge old appointments and meetings"
+msgstr "Carpeta pública conteniendo citas y eventos"
+
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Show as list"
+msgstr "Mostrar detalles"
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr "Mostrar un día"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr "Mostrar una semana"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Mostrar la semana laboral"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Cerrar"
@@ -26454,7 +26227,7 @@ msgstr "Cerrar"
 msgid "Close this item"
 msgstr "Cerrar este elemento"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
@@ -26467,47 +26240,58 @@ msgstr "Barra de herramientas principal"
 msgid "Preview the printed item"
 msgstr "Previsualizar el elemento que va a ser impreso"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Imprime este elemento"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Guardar"
-
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
-msgstr "Guardar como..."
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Guardar _como..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Guardar y cerrar"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save and _Close"
+msgstr "Guardar y cerrar"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
 msgstr "Guarda el elemento y cierra la ventana de diálogo"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr "Guarda este elemento a disco"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Archivo"
 
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Guardar"
+
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Copia el texto seleccionado al portapapeles"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Cor_tar"
 
@@ -26528,51 +26312,39 @@ msgstr "Seleccionar _todo"
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr "Imprimir so_bre..."
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Guardar _como..."
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
 msgstr "Guarda el contacto y cierra la ventana de diálogo"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
 msgstr "Envía un _mensaje al contacto..."
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Guardar"
-
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
 msgstr "Borra esta lista"
 
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
-msgstr "Borrar..."
-
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
 msgstr "Guarda la lista y cierra la ventana de diálogo"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."
 msgstr "E_nviar la lista a otros..."
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
 msgid "Send _message to list..."
 msgstr "Enviar un _mensaje a la lista..."
 
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Borrar..."
+
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Cancelar reun_ión"
@@ -26643,10 +26415,12 @@ msgstr "Abre una ventana para escribir un mensaje de correo"
 
 #: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr ""
+"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ui/evolution-mail-global.xml.h:11
-msgid "Post New Message"
+#, fuzzy
+msgid "Post Ne_w Message"
 msgstr "Publicar un mensaje nuevo"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26681,14 +26455,19 @@ msgstr "Panel de _previsualización"
 msgid "Change the properties of this folder"
 msgstr "Cambia las propiedades de esta carpeta"
 
-#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copia mensajes seleccionados al portapapeles"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Corta el(los) mensaje(s) seleccionado(s) al portapapeles"
 
+#: ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "E_xpunge"
+msgstr "P_urgar"
+
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Ocultar los mensajes _seleccionados"
@@ -26702,8 +26481,10 @@ msgid "Hide _Read Messages"
 msgstr "Oculta_r mensajes leídos"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
@@ -26713,7 +26494,7 @@ msgstr "Marcar todos como _leídos"
 msgid "Mark all visible messages as read"
 msgstr "Marca los mensajes visibles como leídos"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
 msgid "Paste message(s) from the clipboard"
 msgstr "Pega un(os) mensaje(s) desde el portapapeles"
 
@@ -26731,7 +26512,8 @@ msgstr "Selecciona todos los mensajes que no están seleccionados actualmente"
 
 #: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
-msgstr "Selecciona todos los mensajes en el mismo hilo que el mensaje seleccionado"
+msgstr ""
+"Selecciona todos los mensajes en el mismo hilo que el mensaje seleccionado"
 
 #: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
@@ -26757,26 +26539,37 @@ msgstr "Oculta temporalmente los mensajes seleccionados"
 msgid "Threaded Message list"
 msgstr "Lista de mensajes encadenados"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:19
-msgid "_Expunge"
-msgstr "P_urgar"
-
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "Carpe_ta"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Invertir selección"
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ui/evolution-mail-list.xml.h:31
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "_Lista de mensajes encadenados"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "_Cerrar"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Ver"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Aña_dir remitente a la agenda"
@@ -26794,401 +26587,413 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Aplica filtros a los mensajes seleccionados"
 
 #: ui/evolution-mail-message.xml.h:5
+#, fuzzy
+msgid "Caret _Mode"
+msgstr "Modelo del texto"
+
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Responde a todos los destinatarios del mensaje seleccionado"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responde al remitente del mensaje seleccionado"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Copia mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr "Crear una carpeta _virtual según el mensaje"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crea una regla para filtrar los mensajes de este remitente"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crea una regla para filtrar los mensajes con este asunto"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr "Crea una carpeta virtual para estos destinatarios"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr "Crea una carpeta virtual para esta lista de correo"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr "Crea una carpeta virtual para este remitente"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr "Crea una carpeta virtual para este asunto"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Reduce el tamaño del texto"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Muestra el siguiente mensaje importante"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Muestra el mensaje siguiente"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Muestra el siguiente mensaje no leído"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Muestra el siguiente hilo no leído"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Muestra el anterior mensaje importante"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Muestra el mensaje anterior"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Muestra el anterior mensaje no leído"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "F_orward"
 msgstr "Reen_viar"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar según la _lista de correo..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Filtrar según el remite_nte..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Filtrar según los destinata_rios..."
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Filtrar según el a_sunto..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:37
 msgid "Flag selected message(s) for follow-up"
 msgstr "Marcar los mensajes seleccionados para seguimiento"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:38
 msgid "Follow _Up..."
 msgstr "_Seguimiento..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar la carga de imágenes en el correo HTML"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reenvía el mensaje seleccionado en el cuerpo de un mensaje nuevo"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenvía el mensaje seleccionado citado como una respuesta"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message to someone"
 msgstr "Reenvía a alguien el mensaje seleccionado"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reenvía a alguien el mensaje seleccionado como un adjunto"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:45
 msgid "Increase the text size"
 msgstr "Incrementar el tamaño del texto"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:46
 msgid "Load _Images"
 msgstr "Cargar _imágenes"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr "Mar_car como leído"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr "Marcar como i_mportante"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as U_nread"
 msgstr "Marcar como _no leído"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as Unimp_ortant"
 msgstr "Marcar como no imp_ortante"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marca el(los) mensaje(s) seleccionado(s) como leídos"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as important"
 msgstr "Marca el(los)r mensaje(s) seleccionado(s) como importantes"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marca el(los) mensaje(s) seleccionado(s) como no leídos"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcar mensaje(s) seleccionado(s) como no importantes"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para borrar"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:56
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:57
 msgid "Move selected message(s) to another folder"
 msgstr "Mover mensaje(s) seleccionado(s) a otra carpeta"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Siguiente"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr "Siguiente mensaje _importante"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "Siguiente _hilo"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "Siguiente m_ensaje no leído"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:62
 msgid "Open the selected message in a new window"
 msgstr "Abre el mensaje seleccionado en una nueva ventana"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:63
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abre el mensaje seleccionado para reenviarlo"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:64
 msgid "Original Si_ze"
 msgstr "Tamaño _original"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:65
 msgid "P_revious Unread Message"
 msgstr "Me_nsaje anterior no leído"
 
-#: ui/evolution-mail-message.xml.h:62
-msgid "Post a Reply"
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Post a Repl_y"
 msgstr "Publicar una respuesta"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:68
 msgid "Post a reply to a message in a Public folder"
 msgstr "Publica una respuesta a un mensaje en una carpeta pública"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:69
 msgid "Pr_evious Important Message"
 msgstr "Mensaje importante an_terior"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:70
 msgid "Preview the message to be printed"
 msgstr "Previsualiza el mensaje que va a ser impreso"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:71
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:74
 msgid "Print this message"
 msgstr "Imprimir este mensaje"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:75
 msgid "Re_direct"
 msgstr "Re_dirigir"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:76
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Reenviar (rebotar) el mensaje seleccionado a alguien"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "Responder a _todos"
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr "Responder a la _lista"
+
+#: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr "Dejar el texto en su tamaño original"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch Message..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "S_earch in Message..."
 msgstr "Bu_scar mensaje..."
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "S_maller"
 msgstr "_Menor"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
 msgid "Save the message as a text file"
 msgstr "Guardar el mensaje en un archivo de texto"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:85
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:86
 msgid "Set up the page settings for your current printer"
 msgstr "Establecer la configuración de la página para la impresora actual"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show Email _Source"
 msgstr "Mostrar el _origen del mensaje"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show Full _Headers"
 msgstr "Mostrar _cabeceras completas"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
+
+#: ui/evolution-mail-message.xml.h:90
 msgid "Show message in the normal style"
 msgstr "Mostrar mensajes en el estilo normal"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Show message with all email headers"
 msgstr "Mostrar mensajes con todas las cabeceras"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Mostrar la fuente del mensaje en bruto"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Text Si_ze"
 msgstr "_Tamaño del texto"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr "Recuperar los mensajes seleccionados"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "VFolder on Mailing _List..."
 msgstr "Carpeta virtual según la _lista de correo..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "VFolder on Se_nder..."
 msgstr "Carpeta virtual según el remite_nte..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "VFolder on _Recipients..."
 msgstr "Carpeta virtual según los destinata_rios..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "VFolder on _Subject..."
 msgstr "Carpeta virtual según el a_sunto..."
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Adjunto"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Create Filter From Message"
 msgstr "Crear un filtro del _mensaje"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Forward Message"
 msgstr "_Reenviar mensaje"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Inline"
 msgstr "_Incluido en línea"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Larger"
 msgstr "Ma_yor"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Message Display"
 msgstr "_Mostrar mensaje"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Normal Display"
 msgstr "Vista _normal"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Open Message"
 msgstr "_Abrir mensaje"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Previous Message"
 msgstr "Mensaje a_nterior"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr "Responder al _remitente"
+
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Resend..."
 msgstr "_Reexpedir..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "_Cerrar"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Ver"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Adjuntar"
@@ -27197,7 +27002,7 @@ msgstr "Adjuntar"
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Cierra el archivo actual"
 
@@ -27213,7 +27018,7 @@ msgstr "Cifrar este mensaje con PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Cifra este mensaje con su certificado de cifrado S/MIME"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "For_mato"
 
@@ -27245,6 +27050,11 @@ msgstr "Cifrar con S/MIME"
 msgid "S/MIME Sign"
 msgstr "Firmar con S/MIME"
 
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Guardar"
+
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Guardar como"
@@ -27258,7 +27068,7 @@ msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
@@ -27275,7 +27085,7 @@ msgid "Send"
 msgstr "Enviar"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
@@ -27340,7 +27150,7 @@ msgid "_From Field"
 msgstr "Campo _De"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -27356,11 +27166,11 @@ msgstr "Campo _Responder-A"
 msgid "_Security"
 msgstr "_Seguridad"
 
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Guardar el archivo y cerrar la ventana de diálogo"
 
@@ -27697,27 +27507,33 @@ msgid "_Work Week View"
 msgstr "Vista de la semana _laboral"
 
 #: views/mail/galview.xml.h:1
-msgid "As Sent Folder"
+#, fuzzy
+msgid "As _Sent Folder"
 msgstr "Como carpeta de enviados"
 
 #: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr "Por marca de seguimiento"
+#, fuzzy
+msgid "By S_tatus"
+msgstr "Por estado"
 
 #: views/mail/galview.xml.h:3
-msgid "By Sender"
+#, fuzzy
+msgid "By Se_nder"
 msgstr "Por remitente"
 
 #: views/mail/galview.xml.h:4
-msgid "By Status"
-msgstr "Por estado"
+#, fuzzy
+msgid "By Su_bject"
+msgstr "Por asunto"
 
 #: views/mail/galview.xml.h:5
-msgid "By Subject"
-msgstr "Por asunto"
+#, fuzzy
+msgid "By _Follow Up Flag"
+msgstr "Por marca de seguimiento"
 
 #: views/mail/galview.xml.h:6
-msgid "Messages"
+#, fuzzy
+msgid "_Messages"
 msgstr "Mensajes"
 
 #: views/tasks/galview.xml.h:1
@@ -27774,20 +27590,20 @@ msgstr "Definir vistas..."
 
 #. 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:427
+#: widgets/misc/e-calendar-item.c:456
 msgid "MTWTFSS"
 msgstr "LMXJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
+#: widgets/misc/e-calendar-item.c:1174
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
 msgid "Now"
 msgstr "Ahora"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
 msgid "Today"
 msgstr "Hoy"
 
@@ -27904,22 +27720,6 @@ msgstr "_Editar búsquedas guardadas"
 msgid "_Advanced..."
 msgstr "_Avanzado..."
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr "Información"
-
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr "Error"
-
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr "Pregunta"
-
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr "Mensaje"
-
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Buscar"
@@ -27965,6 +27765,542 @@ msgstr "Soporte de archivo local de calendario de Evolution"
 msgid "Evolution Addressbook local file backend"
 msgstr "Soporte de libretas de direcciones en archivo local de Evolution"
 
+#~ msgid "That person is already attending the meeting!"
+#~ msgstr "¡Esa persona ya está participando en la reunión!"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "_Save as..."
+#~ msgstr "_Guardar como..."
+
+#~ msgid "End Date"
+#~ msgstr "Fecha final"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Nueva cit_a"
+
+#~ msgid "Print..."
+#~ msgstr "Imprimir..."
+
+#~ msgid "Chair Persons"
+#~ msgstr "Presidencia"
+
+#~ msgid "Required Participants"
+#~ msgstr "Participantes requeridos"
+
+#~ msgid "Optional Participants"
+#~ msgstr "Participantes opcionales"
+
+#~ msgid "Resources"
+#~ msgstr "Recursos"
+
+#~ msgid "Individual"
+#~ msgstr "Individual"
+
+#~ msgid "Group"
+#~ msgstr "Grupo"
+
+#~ msgid "Resource"
+#~ msgstr "Recurso"
+
+#~ msgid "Room"
+#~ msgstr "Sala"
+
+#~ msgid "Chair"
+#~ msgstr "Presidente"
+
+#~ msgid "Required Participant"
+#~ msgstr "Participantes requeridos"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Participante opcional"
+
+#~ msgid "Non-Participant"
+#~ msgstr "No participan"
+
+#~ msgid "Needs Action"
+#~ msgstr "Necesita acción"
+
+#~ msgid "Delegated"
+#~ msgstr "Delegado"
+
+#~ msgid "In Process"
+#~ msgstr "En proceso"
+
+#~ msgid "Hey you, dunce. You need an account to send mail doncha know."
+#~ msgstr "Necesita una cuenta para enviar correo."
+
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Propiedades para «%s»"
+
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
+
+#~ msgid "Could not create temporary directory: %s"
+#~ msgstr "No se pudo crear el directorio temporal: %s"
+
+#~ msgid "%d new"
+#~ msgstr "%d nuevos"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "%d hidden"
+#~ msgstr "%d ocultos"
+
+#~ msgid "%d visible"
+#~ msgstr "%d visibles"
+
+#~ msgid "%d selected"
+#~ msgstr "%d seleccionado"
+
+#~ msgid "%d unsent"
+#~ msgstr "%d sin enviar"
+
+#~ msgid "%d sent"
+#~ msgstr "%d enviar"
+
+#~ msgid "%d total"
+#~ msgstr "%d total"
+
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "Crear una carpeta _virtual de la búsqueda..."
+
+#~ msgid "VFolder on _Subject"
+#~ msgstr "Carpeta virtual según el a_sunto"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "Carpeta virtual según el re_mitente"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "Carpeta virtual según los des_tinatarios"
+
+#~ msgid "VFolder on Mailing _List"
+#~ msgstr "Carpeta virtual según la li_sta de correo"
+
+#~ msgid "Filter on Sub_ject"
+#~ msgstr "Filtro según el _asunto"
+
+#~ msgid "Filter on Sen_der"
+#~ msgstr "Filtro según el _remitente"
+
+#~ msgid "Filter on Re_cipients"
+#~ msgstr "Filtro según los _destinatarios"
+
+#~ msgid "Filter on _Mailing List"
+#~ msgstr "Filtro según la lista de _correo"
+
+#~ msgid "_Edit as New Message..."
+#~ msgstr "_Editar como un mensaje nuevo..."
+
+#~ msgid "_Print"
+#~ msgstr "Im_primir"
+
+#~ msgid "_Forward"
+#~ msgstr "Reen_viar"
+
+#~ msgid "Follo_w Up..."
+#~ msgstr "_Seguimiento..."
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "Ma_rcar como terminado"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "_Quitar marca"
+
+#~ msgid "Mark as _Unread"
+#~ msgstr "Marcar como _no leído"
+
+#~ msgid "Mark as _Important"
+#~ msgstr "Marcar como _importante"
+
+#~ msgid "_Mark as Unimportant"
+#~ msgstr "Marcar como no im_portante"
+
+#~ msgid "U_ndelete"
+#~ msgstr "_Recuperar"
+
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "Mo_ver a la carpeta..."
+
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Añadir remitente a la li_breta de direcciones"
+
+#~ msgid "Appl_y Filters"
+#~ msgstr "Aplicar _filtros"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Crear re_gla desde el mensaje"
+
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "Carpeta virtual según la _lista de correo"
+
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Filtrar según la _lista de correo (%s)"
+
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "Carpeta virtual según la li_sta de correo (%s)"
+
+#~ msgid "Don't show this message again."
+#~ msgstr "No mostrar otra vez este mensaje."
+
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "No ha configurado el cliente de correo.\n"
+#~ "Necesita hacerlo para poder enviar,\n"
+#~ "recibir o escribir mensajes.\n"
+#~ "¿Querría configurarlo ahora?"
+
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Necesita configurar una identidad para\n"
+#~ "poder escribir mensajes de correo."
+
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Necesita configurar un transporte de\n"
+#~ "correo para poder enviarlo."
+
+#~ msgid ""
+#~ "You are sending an HTML-formatted message. Please make sure that\n"
+#~ "the following recipients are willing and able to receive HTML mail:\n"
+#~ msgstr ""
+#~ "Está enviando un mensaje formateado en HTML. Por favor, asegúrese de que "
+#~ "los siguientes destinatarios desean y son capaces de recibir  mensajes "
+#~ "formateados en HTML:\n"
+
+#~ msgid "Send anyway?"
+#~ msgstr "¿Enviar de todos modos?"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Este mensaje no tiene asunto.\n"
+#~ "¿Quiere enviarlo?"
+
+#~ msgid ""
+#~ "Since the contact list you are sending to is configured to hide the "
+#~ "list's addresses, this message will contain only Bcc recipients."
+#~ msgstr ""
+#~ "Dado que la lista de contactos a la que estas enviado está configurada "
+#~ "para esconder la lista de direcciones, este mensaje sólo contendrá "
+#~ "destinatarios Cco."
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "Este mensaje solo contiene destinatarios Cco."
+
+#~ msgid ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "Es posible que el servidor de correo revele los destinatarios añadiendo "
+#~ "una cabecera Apparently-To.\n"
+#~ "¿Enviar de todos modos?"
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "Debes especificar destinatarios para poder enviar el mensaje."
+
+#~ msgid ""
+#~ "Unable to open the drafts folder for this account.\n"
+#~ "Would you like to use the default drafts folder?"
+#~ msgstr ""
+#~ "No se pudo abrir la carpeta de borradores para esta cuenta.\n"
+#~ "¿Quiere usar la carpeta de borradores predeterminada?"
+
+#~ msgid "an unknown sender"
+#~ msgstr "un remitente desconocido"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+#~ msgstr "El %a, %d-%m-%Y a las %H:%M, %%s escribió:"
+
+#~ msgid "Move message(s) to"
+#~ msgstr "Mover mensaje(s) a"
+
+#~ msgid "Copy message(s) to"
+#~ msgstr "Copiar mensaje(s) a"
+
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "¿Seguro que quiere editar los %d mensajes?"
+
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Solo puede editar mensajes guardados\n"
+#~ "en la carpeta Borradores."
+
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Sólo puede reenviar mensajes\n"
+#~ "de la carpeta Enviados."
+
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr "¿Seguro que quiere reenviar todos los %d mensajes?"
+
+#~ msgid "No Message Selected"
+#~ msgstr "Se hay mensajes seleccionados"
+
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "No se pudo obtener el mensaje; «%s»\n"
+#~ "  %s"
+
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "«%s» ya existe\n"
+#~ "¿Quiere sobreescribirlo?"
+
+#~ msgid "Save Message As..."
+#~ msgstr "Guardar mensaje como..."
+
+#~ msgid "Save Messages As..."
+#~ msgstr "Guardar mensajes como..."
+
+#~ msgid ""
+#~ "This operation will permanently erase all messages marked as\n"
+#~ "deleted. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "Esta operación borrará permanentemente todos los mensajes marcados como "
+#~ "borrados. Si continuas, no podrás recuperar esos mensajes.\n"
+#~ "\n"
+#~ "¿Borrar realmente esos mensajes?"
+
+#~ msgid ""
+#~ "Error loading filter information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error cargando la información del filtro:\n"
+#~ "%s"
+
+#~ msgid "Filters"
+#~ msgstr "Filtros"
+
+#~ msgid "Page %d of %d"
+#~ msgstr "Página %d de %d"
+
+#~ msgid "Print Message"
+#~ msgstr "Imprimir mensaje"
+
+#~ msgid "Printing of message failed"
+#~ msgstr "Ha fallado la impresión del mensaje"
+
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr "¿Seguro que quiere abrir %d mensajes en ventanas separadas?"
+
+#~ msgid "Could not create a S/MIME signature context."
+#~ msgstr "No se pudo crear un contexto de firma S/MIME."
+
+#~ msgid "Could not create a S/MIME certsonly context."
+#~ msgstr "No se pudo crear un contexto de certificado S/MIME."
+
+#~ msgid "Could not create a S/MIME encryption context."
+#~ msgstr "No se pudo crear un contexto de cifrado S/MIME."
+
+#~ msgid "Could not create a S/MIME envelope context."
+#~ msgstr "No se pudo crear un contexto sobre tipo S/MIME."
+
+#~ msgid "Could not create a S/MIME decode context."
+#~ msgstr "No se pudo crear un contexto de decodificación S/MIME."
+
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "El archivo «%s» ya existe.\n"
+#~ "¿Quiere que lo sobreescriba?"
+
+#~ msgid "Save Attachment"
+#~ msgstr "Guardar adjunto"
+
+#~ msgid "Could not create temporary file '%s': %s"
+#~ msgstr "No se pudo crear el archivo temporal: «%s»: %s"
+
+#~ msgid "Save Attachment..."
+#~ msgstr "Guardar adjunto"
+
+#~ msgid "View Inline"
+#~ msgstr "Ver incluido"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Abrir en %s..."
+
+#~ msgid "View Inline (via %s)"
+#~ msgstr "Ver incluido (vía %s)"
+
+#~ msgid "Hide"
+#~ msgstr "Ocultar"
+
+#~ msgid "External Viewer"
+#~ msgstr "Visores externos"
+
+#~ msgid "Downloading images"
+#~ msgstr "Descargando imágenes"
+
+#~ msgid "Loading message content"
+#~ msgstr "Cargando el contenido del mensaje"
+
+#~ msgid "Overdue:"
+#~ msgstr "Retrasadas:"
+
+#~ msgid "by %B %d, %Y, %l:%M %P"
+#~ msgstr "por %B %d, %Y, %l:%M %P"
+
+#~ msgid "Open Link in Browser"
+#~ msgstr "Abrir enlace en el Navegador"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "Copiar dirección del enlace"
+
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Guardar enlace como (ARRÉGLAME)"
+
+#~ msgid "Save Image as..."
+#~ msgstr "Guardar imagen como..."
+
+#~ msgid "%s attachment"
+#~ msgstr "%s adjunto"
+
+#~ msgid "Could not parse MIME message. Displaying as source."
+#~ msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
+
+#~ msgid "Bad Address"
+#~ msgstr "Dirección errónea"
+
+#~ msgid "Reply-To"
+#~ msgstr "Responder a"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Cco"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Este mensaje está firmado digitalmente. Pulsa en el icono del candado "
+#~ "para más información."
+
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "No se pudo crear un contexto de verificación PGP."
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr "Este mensaje está firmado digitalmente y es auténtico."
+
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr ""
+#~ "Este mensaje está firmado digitalmente pero no se puede verificar su "
+#~ "autenticidad."
+
+#~ msgid "Pointer to FTP site (%s)"
+#~ msgstr "Puntero a sitio FTP (%s)"
+
+#~ msgid "Pointer to local file (%s) valid at site \"%s\""
+#~ msgstr "Puntero a archivo local (%s) valido en «%s»"
+
+#~ msgid "Pointer to local file (%s)"
+#~ msgstr "Puntero a archivo local (%s)"
+
+#~ msgid "Pointer to remote data (%s)"
+#~ msgstr "Puntero a sitio FTP (%s)"
+
+#~ msgid "Pointer to unknown external data (\"%s\" type)"
+#~ msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
+
+#~ msgid "Malformed external-body part."
+#~ msgstr "Parte externa al cuerpo del mensaje mal escrita."
+
+#~ msgid "However, the message was successfully sent."
+#~ msgstr "Aun así, este mensaje fue enviado correctamente."
+
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Mensaje sin título)"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Mensaje sin título"
+
+#~ msgid "Empty Message"
+#~ msgstr "Mensaje vacío"
+
+#~ msgid "Find in Message"
+#~ msgstr "Buscar en mensaje"
+
+#~ msgid "Case Sensitive"
+#~ msgstr "Sensible a mayúsculas"
+
+#~ msgid "Search Forward"
+#~ msgstr "Buscar hacia adelante"
+
+#~ msgid "Find:"
+#~ msgstr "Buscar:"
+
+#~ msgid "Matches:"
+#~ msgstr "Coincide:"
+
+#~ msgid "Forwarded Message"
+#~ msgstr "Mensaje reenviado"
+
+#~ msgid "(No subject)"
+#~ msgstr "(Sin asunto)"
+
+#~ msgid "%s - Message"
+#~ msgstr "%s - Mensaje"
+
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "Analizando carpetas bajo %s en «%s»"
+
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "Analizando carpetas de nivel superior en «%s»"
+
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "Suscribiendo a carpeta «%s»"
+
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "Desuscribiendo la carpeta «%s»"
+
+#~ msgid "No server has been selected"
+#~ msgstr "No se ha seleccionado ningún servidor"
+
+#~ msgid "Please select a server."
+#~ msgstr "Por favor seleccione un servidor."
+
+#~ msgid "Scanning folders ..."
+#~ msgstr "Analizando carpetas..."
+
+#~ msgid "Save As..."
+#~ msgstr "Guardar como..."
+
+#~ msgid "Information"
+#~ msgstr "Información"
+
+#~ msgid "Question"
+#~ msgstr "Pregunta"
+
+#~ msgid "Message"
+#~ msgstr "Mensaje"
+
 #~ msgid ""
 #~ "ping_timeout_callback: could not determine if the CORBA object is nil or "
 #~ "not"
@@ -28430,16 +28766,6 @@ msgstr "Soporte de libretas de direcciones en archivo local de Evolution"
 #~ msgid "Cannot initialize the Evolution mail component."
 #~ msgstr "No se pudo inicializar el componente de correo de Evolution."
 
-#~ msgid "Cannot initialize Evolution's mail config component."
-#~ msgstr ""
-#~ "No se pudo inicializar el componente de configuración de correo de "
-#~ "Evolution."
-
-#~ msgid "Cannot initialize Evolution's folder info component."
-#~ msgstr ""
-#~ "No se pudo inicializar el componente de información sobre carpetas de "
-#~ "Evolution."
-
 #~ msgid ""
 #~ "Please specify signature filename\n"
 #~ "in Advanced section of signature settings."
@@ -28481,4 +28807,3 @@ msgstr "Soporte de libretas de direcciones en archivo local de Evolution"
 
 #~ msgid "Salve file"
 #~ msgstr "Guardar archivo"
-
diff --git a/po/et.po b/po/et.po
index 0a8417e079..02546c8a98 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1.0.2\n"
-"POT-Creation-Date: 2003-06-25 13:24-0400\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2002-03-08 19:58+0200\n"
 "Last-Translator: Tõivo Leedjärv <toivo@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -20,67 +20,209 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Evolution'i impordiassistent"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Evolution'i sõnumiredaktor."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
-msgid "Evolution VCard importer"
-msgstr "Evolution'i sõnumiredaktor."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Fail kui"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Täisnimi"
+
 #: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Aadress:"
+
+#: addressbook/backend/ebook/e-card.c:1333
+#, fuzzy
+msgid "Address Label"
+msgstr "Aadressikaardid"
+
+#: addressbook/backend/ebook/e-card.c:1340
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
 #: addressbook/backend/ebook/e-card.c:1347
+#: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr "Esmane"
+#: addressbook/backend/ebook/e-card.c:1354
+#, fuzzy
+msgid "Birth date"
+msgstr "Sünniaeg"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "Esm"
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisatsioon"
 
+#: addressbook/backend/ebook/e-card.c:1374
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organisatsioon"
+
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Kontor"
+
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Tiitel"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Roll"
+
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Juht"
+
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Hüüdnimi"
+
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Abikaasa"
+
+#: addressbook/backend/ebook/e-card.c:1430
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniversary"
+msgstr "Aastapäev"
+
+#: addressbook/backend/ebook/e-card.c:1436
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"Postiprogramm:"
+
+#: addressbook/backend/ebook/e-card.c:1443
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr "Kalendri URI"
+
+#: addressbook/backend/ebook/e-card.c:1450
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "_Hõivatuse URL:"
+
+#: addressbook/backend/ebook/e-card.c:1457
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Kalender"
+
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Märkus"
+
+#: addressbook/backend/ebook/e-card.c:1471
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Kustutada kontakt?"
+
+#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategooriad"
+
+#: addressbook/backend/ebook/e-card.c:1485
+#, fuzzy
+msgid "Category List"
+msgstr "Kategooria on"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "List"
+msgstr "Lista"
+
+#: addressbook/backend/ebook/e-card.c:1513
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Muu aadress"
+
+#: addressbook/backend/ebook/e-card.c:1520
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Amritsar"
+
+#: addressbook/backend/ebook/e-card.c:1527
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+#: addressbook/backend/ebook/e-card.c:1534
+#, fuzzy
+msgid "Last Use"
+msgstr "Aseta"
+
+#: addressbook/backend/ebook/e-card.c:1545
+#, fuzzy
+msgid "Use Score"
+msgstr "Skoor"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
+msgstr "Esmane"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr "Esm"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -115,12 +257,6 @@ msgid "Home"
 msgstr "Kodu"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisatsioon"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
@@ -239,21 +375,9 @@ msgid "Dep"
 msgstr "Osak"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Kont"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Tiitel"
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -264,12 +388,6 @@ msgid "Prof"
 msgstr "Ala"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Juht"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "juht"
 
@@ -278,32 +396,9 @@ msgid "Ass"
 msgstr "Abil"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Hüüdnimi"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Hüüdnimi"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Abikaasa"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Märkus"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr "Kalendri URI"
-
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
@@ -327,11 +422,6 @@ msgid "icsCalendar"
 msgstr "Kalender"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr "Aastapäev"
-
-#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Aastap"
 
@@ -339,12 +429,6 @@ msgstr "Aastap"
 msgid "Birth Date"
 msgstr "Sünniaeg"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategooriad"
-
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Perekonnanimi"
@@ -360,125 +444,34 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-destination.c:709
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Nimetu kontaktide nimekiri"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Täisnimi"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
-msgid "Address"
-msgstr "_Aadress:"
-
-#: addressbook/backend/ebook/e-card.c:1333
-#, fuzzy
-msgid "Address Label"
-msgstr "Aadressikaardid"
-
-#: addressbook/backend/ebook/e-card.c:1340
-#, fuzzy
-msgid "Phone"
-msgstr "Ponce"
-
-#: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
-msgid "Birth date"
-msgstr "Sünniaeg"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1374
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Organizational Unit"
-msgstr "Organisatsioon"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Roll"
+msgid "Evolution LDIF importer"
+msgstr "Evolution'i impordiassistent"
 
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
-"\n"
-"Postiprogramm:"
 
-#: addressbook/backend/ebook/e-card.c:1450
-#, fuzzy
-msgid "Free/Busy URL"
-msgstr "_Hõivatuse URL:"
-
-#: addressbook/backend/ebook/e-card.c:1457
-#, fuzzy
-msgid "ICS Calendar"
-msgstr "Kalender"
-
-#: addressbook/backend/ebook/e-card.c:1471
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Related Contacts"
-msgstr "Kustutada kontakt?"
+msgid "Evolution VCard Importer"
+msgstr "Evolution'i sõnumiredaktor."
 
-#: addressbook/backend/ebook/e-card.c:1485
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 #, fuzzy
-msgid "Category List"
-msgstr "Kategooria on"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
+msgid "Evolution VCard importer"
+msgstr "Evolution'i sõnumiredaktor."
 
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1506
-#, fuzzy
-msgid "List"
-msgstr "Lista"
-
-#: addressbook/backend/ebook/e-card.c:1513
-#, fuzzy
-msgid "List Show Addresses"
-msgstr "Muu aadress"
-
-#: addressbook/backend/ebook/e-card.c:1520
-#, fuzzy
-msgid "Arbitrary"
-msgstr "Amritsar"
-
-#: addressbook/backend/ebook/e-card.c:1527
-#, fuzzy
-msgid "ID"
-msgstr "I"
-
-#: addressbook/backend/ebook/e-card.c:1534
-#, fuzzy
-msgid "Last Use"
-msgstr "Aseta"
-
-#: addressbook/backend/ebook/e-card.c:1545
-#, fuzzy
-msgid "Use Score"
-msgstr "Skoor"
-
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:171
-msgid "Could not initialize Bonobo"
-msgstr "Ei saa laadida Bonobot"
-
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
 msgid "Searching..."
@@ -539,14 +532,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook ei ole laetud\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr "Ei saa käivitada wombat serverit"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr "EI saa käivitada wombatit"
 
@@ -555,159 +548,6 @@ msgstr "EI saa käivitada wombatit"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Muuda aadressiraamatut"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Factory for the Addressbook's address popup"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook minicard viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook minicard viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook minicard viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Addressbook minicard viewer"
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:620
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontaktid"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Kontaktide infot sisaldav kaust"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP server"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "Kontaktide infot sisaldav LDAP server"
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public Contacts"
-msgstr "Kontaktid"
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public folder containing contact information"
-msgstr "Kontaktide infot sisaldav kaust"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "New Contact"
-msgstr "Uus kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:575
-#, fuzzy
-msgid "Create a new contact"
-msgstr "Loob uue kontakti"
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
-msgstr "Uus kontaktide nimekiri"
-
-#: addressbook/gui/component/addressbook-component.c:578
-#, fuzzy
-msgid "Contact _List"
-msgstr "Kontaktide _nimekiri"
-
-#: addressbook/gui/component/addressbook-component.c:579
-#, fuzzy
-msgid "Create a new contact list"
-msgstr "Loob uue kontaktide nimekirja"
-
-#: addressbook/gui/component/addressbook-config.c:206
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Ei saa luua ühendust LDAP serveriga."
-
-#: addressbook/gui/component/addressbook-config.c:231
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"SMTP serveri jaoks autentimine nurjus.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-#, fuzzy
-msgid "This server does not support LDAPv3 schema information"
-msgstr "IMAP serveri vastus ei sisaldanud %s infot"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-#, fuzzy
-msgid "Error retrieving schema information"
-msgstr ""
-"Viga filtriinfo laadimisel:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP serveri vastus ei sisaldanud %s infot"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Konto nimi"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Serveri nimi"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Teised kontaktid"
-
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -835,6 +675,116 @@ msgstr "Suvaline kategooria"
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, mida kaustalehitseja näitab"
 
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:628
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Kontaktid"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Kontaktide infot sisaldav kaust"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP server"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "Kontaktide infot sisaldav LDAP server"
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontaktid"
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Kontaktide infot sisaldav kaust"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "New Contact"
+msgstr "Uus kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:583
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Loob uue kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "New Contact List"
+msgstr "Uus kontaktide nimekiri"
+
+#: addressbook/gui/component/addressbook-component.c:586
+#, fuzzy
+msgid "Contact _List"
+msgstr "Kontaktide _nimekiri"
+
+#: addressbook/gui/component/addressbook-component.c:587
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Loob uue kontaktide nimekirja"
+
+#: addressbook/gui/component/addressbook-config.c:206
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Ei saa luua ühendust LDAP serveriga."
+
+#: addressbook/gui/component/addressbook-config.c:231
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"SMTP serveri jaoks autentimine nurjus.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP serveri vastus ei sisaldanud %s infot"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Viga filtriinfo laadimisel:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP serveri vastus ei sisaldanud %s infot"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Konto nimi"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Serveri nimi"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Teised kontaktid"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -863,33 +813,76 @@ msgstr "Loo uus kontakt \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:914
+#: addressbook/gui/component/e-address-popup.c:917
 msgid "Querying Addressbook..."
 msgstr "Aadressiraamatust pärimine..."
 
-#: addressbook/gui/component/e-address-popup.c:998
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-popup.c:1001
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr "Muuda kontakti andmeid"
 
-#: addressbook/gui/component/e-address-popup.c:1028
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Lisa kontaktide hulka"
 
-#: addressbook/gui/component/e-address-popup.c:1053
+#: addressbook/gui/component/e-address-popup.c:1056
 msgid "Merge E-Mail Address"
 msgstr "Ühenda e-posti aadressid"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Disable Queries"
 msgstr "Keela päringud"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr "Luba päringud (Ohtlik!)"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Muuda aadressiraamatut"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Factory for the Addressbook's address popup"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook minicard viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook minicard viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook minicard viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution Addressbook minicard viewer"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -1042,10 +1035,9 @@ msgstr "Üks"
 msgid "S_earch scope: "
 msgstr "Otsi _kehtivuspiirkonnast:"
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1256
+#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr "Otsin"
 
@@ -1237,11 +1229,11 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Redaktor"
 
@@ -1288,21 +1280,25 @@ msgstr "Üldine"
 msgid "searching-tab"
 msgstr "Otsin"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Kontaktide valimine aadressiraamatust"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Eemalda kõik"
+#: addressbook/gui/component/select-names/e-select-names.c:650
+#, fuzzy
+msgid "Find contact in"
+msgstr "Saatja sisaldab"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Eemalda"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Eemalda kõik"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
@@ -1327,14 +1323,10 @@ msgstr "Nimetu kontakt"
 msgid "Source"
 msgstr "Allikas"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Kontaktide valimine aadressiraamatust"
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Find contact in"
-msgstr "Saatja sisaldab"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -1411,7 +1403,7 @@ msgid "D_epartment:"
 msgstr "_Oskaond:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:197
+#: calendar/gui/dialogs/task-editor.c:200
 msgid "Details"
 msgstr "Täpsustused"
 
@@ -1482,11 +1474,13 @@ msgid "_Categories..."
 msgstr "Kate_gooriad"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
-#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Kustuta"
 
@@ -1531,15 +1525,15 @@ msgid "_Web page address:"
 msgstr "Kodulehe aad_ress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
+#: addressbook/gui/widgets/e-minicard.c:183
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #, fuzzy
 msgid "Editable"
 msgstr "Luba"
@@ -2573,18 +2567,18 @@ msgstr "Zimbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #, fuzzy
 msgid "Book"
 msgstr "Bodo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
+#: addressbook/gui/widgets/e-minicard-widget.c:93
 #, fuzzy
 msgid "Card"
 msgstr "Auto"
@@ -2821,7 +2815,7 @@ msgstr "Uus nimekiri"
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 msgid "Save List as VCard"
 msgstr "Salvesta nimekiri VKaardina"
 
@@ -2868,7 +2862,7 @@ msgstr ""
 "eksisteerib antud kaustas. Kas sa soovid seda ikka lisada?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Eriotsing"
@@ -2887,10 +2881,10 @@ msgid "%d cards"
 msgstr "%d kaarti"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #, fuzzy
 msgid "Query"
 msgstr "Quimper"
@@ -2900,263 +2894,262 @@ msgstr "Quimper"
 msgid "Error getting book view"
 msgstr "Viga %s käivitamisel"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 #, fuzzy
 msgid "Model"
 msgstr "Molde"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr "Õnnestus"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1210
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Juurdepääs keelatud"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card not found"
 msgstr "Kaarti ei leitud"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr "Kaardi ID on juba olemas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Protocol not supported"
 msgstr "Mitte toetatud protokoll"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:785
-#: camel/camel-service.c:875 camel/camel-service.c:917
-#: camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
+#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autentimine ebaõnnestus."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autentimine on vajalik"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "Faili %s ei leitud."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 msgid "Other error"
 msgstr "Muu viga"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr "Kas soovid muudatused salvestada?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 #, fuzzy
 msgid "_Discard"
 msgstr "Dinard"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error adding list"
 msgstr "Viga listi lisamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 msgid "Error adding card"
 msgstr "Viga kaardi lisamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 msgid "Error modifying list"
 msgstr "Viga listi muutmisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 msgid "Error removing list"
 msgstr "Viga listi eemaldamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 msgid "Error removing card"
 msgstr "Viga kaardi eemaldamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 #, fuzzy
 msgid "Move cards to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s jaoks"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tüüp"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.c:398
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-#: addressbook/gui/widgets/e-addressbook-view.c:895
-#: addressbook/gui/widgets/e-addressbook-view.c:1879
+#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1883
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvesta VKaardina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 #, fuzzy
 msgid "New Contact..."
 msgstr "Uus kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Uus kontaktide nimekiri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Mine kausta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #, fuzzy
 msgid "Import..."
 msgstr "_Impordi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Otsi kontakte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Aadressiraamatu allikad..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot'i sätted"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Saada kontakt edasi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Trüki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Print Envelope"
 msgstr "Trüki ümbrik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Ko_peeri kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Tõsta kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:912
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Lõika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Kustuta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: calendar/gui/e-cal-view.c:1109
 #, fuzzy
 msgid "Current View"
 msgstr "Käe_solev vaade"
@@ -3165,7 +3158,7 @@ msgstr "Käe_solev vaade"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:949
+#: addressbook/gui/widgets/e-addressbook-view.c:953
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,š,z,t,u,v,w,õ,ä,ö,ü,x,y"
 
@@ -3173,11 +3166,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,š,z,t,u,v,w,õ,ä,ö,ü,x,y"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:954
+#: addressbook/gui/widgets/e-addressbook-view.c:958
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,š,z,t,u,v,w,õ,ä,ö,ü,x,y"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1352
+#: addressbook/gui/widgets/e-addressbook-view.c:1356
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3245,36 +3238,46 @@ msgstr "Muu telefon"
 msgid "Primary Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-minicard-control.c:204
-#, c-format
-msgid "and %d other cards."
-msgstr "ja %d teist kaarti."
-
-#: addressbook/gui/widgets/e-minicard-control.c:206
-msgid "and one other card."
-msgstr "ja üks teine kaart."
-
-#: addressbook/gui/widgets/e-minicard-control.c:318
-msgid "Save in addressbook"
-msgstr "Salvesta aadressiraamatusse"
-
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #, fuzzy
 msgid "Width"
 msgstr "Laius:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #, fuzzy
 msgid "Height"
 msgstr "Kõrgus:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Kustutatud"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Ülesannete sorteerimine"
+
+#: addressbook/gui/widgets/e-minicard-control.c:204
+#, c-format
+msgid "and %d other cards."
+msgstr "ja %d teist kaarti."
+
+#: addressbook/gui/widgets/e-minicard-control.c:206
+msgid "and one other card."
+msgstr "ja üks teine kaart."
+
+#: addressbook/gui/widgets/e-minicard-control.c:318
+msgid "Save in addressbook"
+msgstr "Salvesta aadressiraamatusse"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3294,11 +3297,6 @@ msgstr "Teksti _suurus"
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-#, fuzzy
-msgid "Column Width"
-msgstr "Columbia"
-
 #: addressbook/gui/widgets/e-minicard-view.c:141
 #, fuzzy
 msgid ""
@@ -3332,15 +3330,10 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adrar"
 
-#: addressbook/gui/widgets/e-minicard.c:169
-#, fuzzy
-msgid "Selected"
-msgstr "Kustutatud"
-
-#: addressbook/gui/widgets/e-minicard.c:176
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
 #, fuzzy
-msgid "Has Cursor"
-msgstr "Ülesannete sorteerimine"
+msgid "Column Width"
+msgstr "Columbia"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3351,20 +3344,20 @@ msgstr "Kaardi vaade"
 msgid "GTK Tree View"
 msgstr "Nädala vaade"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Trüki ümbrik"
-
-#: addressbook/printing/e-contact-print.c:1139
+#: addressbook/printing/e-contact-print.c:1158
 msgid "Print cards"
 msgstr "Trüki kaardid"
 
-#: addressbook/printing/e-contact-print.c:1204
-#: addressbook/printing/e-contact-print.c:1226
+#: addressbook/printing/e-contact-print.c:1224
+#: addressbook/printing/e-contact-print.c:1250
 msgid "Print card"
 msgstr "Trüki kaart"
 
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Trüki ümbrik"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10-punktine Tahoma"
@@ -3534,6 +3527,63 @@ msgstr "Laius:"
 msgid "_Font..."
 msgstr "_Kirjatüüp..."
 
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "koos kõigi kohalike ja aktiivsete võrgukaustadega"
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "Kaardid puuduvad"
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Sisemine viga"
+
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Nimetu sündmus"
@@ -3663,28 +3713,30 @@ msgid "31st"
 msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:912
 msgid "High"
 msgstr "Kõrge"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
+#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Keskmine"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:910
 msgid "Low"
 msgstr "Madal"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr "Määramata"
 
@@ -3692,13 +3744,13 @@ msgstr "Määramata"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr "Viga kalendriserveriga suhtlemisel"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3707,85 +3759,33 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "Tä_htsus:"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Kalendri ja ülesannete sätted"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendri ja ülesannete sätted"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-# !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
-
-# !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution'i uudiseredaktor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution'i uudiseredaktor"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Alarmi teenus"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Algus:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Lõpp:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr "vigane aeg"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Sulge"
 
@@ -3801,16 +3801,25 @@ msgstr "Easilükkamise aeg (minutites)"
 msgid "_Edit appointment"
 msgstr "_Muuda kohtumist"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3822,7 +3831,7 @@ msgstr ""
 "meili teel.  Evolution kuvab selle asemel hariliku\n"
 "meeldetuletusdialoogi."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3839,70 +3848,86 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Alarmi teenus"
+
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize Bonobo"
+msgstr "Ei saa laadida Bonobot"
+
+#: calendar/gui/alarm-notify/notify-main.c:176
 msgid "Could not initialize gnome-vfs"
 msgstr "Ei saa gnome-vfs initsialiseerida"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
+#: calendar/gui/alarm-notify/notify-main.c:185
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Kokkuvõte sisaldab"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Kirjeldus sisaldab"
+#: calendar/gui/calendar-commands.c:376
+#, fuzzy
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid "
+"enam võimalik taastada.\n"
+"\n"
+"Kas tõesti eemaldame kustutatud sõnumid?"
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentaar sisaldab"
+#: calendar/gui/calendar-commands.c:382
+#, fuzzy
+msgid "Purge events older than"
+msgstr "on väiksem kui"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
-msgid "Unmatched"
-msgstr "Puudub"
+#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "päeva"
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
+#: calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:518
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:849
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Kalendrivaate loomine nurjus. Kontrolli ORBit'i ja OAF'i seadistusi."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3923,11 +3948,11 @@ msgstr "_Avaliku kalendri URL:"
 msgid "Public folder containing appointments and events"
 msgstr "Kohtumisi ja sündmusi sisaldav kaust"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Ülesanded"
@@ -4003,107 +4028,6 @@ msgstr "Uus _sündmus"
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue sündmuse"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr "Isiklik"
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Salajane"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Avalik"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "Põ"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "Lõ"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "Ida"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "Lä"
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr "Vaba"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1204
-msgid "Busy"
-msgstr "Kinni"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr "Pole alanud"
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr "Töös"
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr "Lõpetatud"
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geograafiline asukoht peab olema sisestatud formaadis: \n"
-"\n"
-"45.436845,125.862501"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
-#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
-msgstr "Puudub"
-
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr "Korduv"
-
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr "Määratud"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
-msgstr "Jah"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
-msgstr "Ei"
-
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Päeva vaade"
@@ -4120,51 +4044,72 @@ msgstr "Nädala vaade"
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Käe_solev vaade"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Kokkuvõte sisaldab"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Kirjeldus sisaldab"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentaar sisaldab"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
+msgid "Unmatched"
+msgstr "Puudub"
+
+#: calendar/gui/comp-editor-factory.c:462
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Viga kalendriserveriga suhtlemisel"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Juurdepääs keelatud"
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:125
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "URI, mida kalender näitab"
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:420
+#: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Helialarmi häälestus"
 
-#: calendar/gui/dialogs/alarm-options.c:429
+#: calendar/gui/dialogs/alarm-options.c:475
 msgid "Message Alarm Options"
 msgstr "Sõnumialarmi häälestus"
 
-#: calendar/gui/dialogs/alarm-options.c:438
+#: calendar/gui/dialogs/alarm-options.c:484
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Kirjaalarmi häälestus"
 
-#: calendar/gui/dialogs/alarm-options.c:447
+#: calendar/gui/dialogs/alarm-options.c:493
 msgid "Program Alarm Options"
 msgstr "Programmi alarmi häälestus"
 
-#: calendar/gui/dialogs/alarm-options.c:456
+#: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
 msgstr "Tundmatu alarmi häälestus"
 
@@ -4203,10 +4148,6 @@ msgstr "Saada"
 msgid "With these arguments:"
 msgstr "Nende parameetritega:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "päeva"
-
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr ""
@@ -4219,7 +4160,8 @@ msgstr "korda, vahemikuga"
 msgid "hours"
 msgstr "tundi"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minutit"
 
@@ -4233,11 +4175,11 @@ msgstr "Põhilised asjad"
 msgid "Date/Time:"
 msgstr "Kuupäev ja kell:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr "Näita teadet"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr "Mängi heli"
 
@@ -4245,7 +4187,7 @@ msgstr "Mängi heli"
 msgid "Reminders"
 msgstr "Meeldetuletajad"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr "Käivita programm"
 
@@ -4256,7 +4198,8 @@ msgstr "Saada sõnum"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Kokkuvõte:"
 
@@ -4340,7 +4283,7 @@ msgstr "Päev(a)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr "Reede"
 
@@ -4354,7 +4297,7 @@ msgstr "Minut(it)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr "Esmaspäev"
 
@@ -4365,7 +4308,7 @@ msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr "Laupäev"
 
@@ -4379,7 +4322,7 @@ msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr "Pühapäev"
 
@@ -4399,7 +4342,7 @@ msgstr "Ülesannete n_imekiri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr "Neljapäev"
 
@@ -4417,7 +4360,7 @@ msgstr "Aja vorming:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr "Teisipäev"
 
@@ -4427,12 +4370,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr "Töönädal"
 
@@ -4545,78 +4488,53 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Kas sa tõesti soovid katkestada ja kustutada antud päeviku sissekande?"
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Antud sündmus on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Antud ülesanne on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Antud päeviku sissekanne on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sa ei muutnud midagi. Kas sulgeda aken?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Antud sündmust on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Antud ülesannet on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Antud päeviku sissekannet on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada "
 "redaktorit?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Tundmatu viga: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
-msgid " to "
-msgstr " kuni "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
-msgid " (Completed "
-msgstr " (Valmis "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
-msgid "Completed "
-msgstr "Lõpetatud "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
-msgid " (Due "
-msgstr " (Tähtaeg "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
-msgid "Due "
-msgstr "Tähtaeg "
-
 #: calendar/gui/dialogs/comp-editor.c:334
 #, fuzzy
 msgid "Could not update invalid object"
@@ -4664,21 +4582,47 @@ msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
-#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/dialogs/comp-editor.c:1406
-#: calendar/gui/dialogs/comp-editor.c:1432
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1459
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Tundmatu viga: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
+msgid " to "
+msgstr " kuni "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
+msgid " (Completed "
+msgstr " (Valmis "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
+msgid "Completed "
+msgstr "Lõpetatud "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
+msgid " (Due "
+msgstr " (Tähtaeg "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
+msgid "Due "
+msgstr "Tähtaeg "
+
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4787,31 +4731,31 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
 msgid "Appointment"
 msgstr "Sündmus"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Meeldetuletaja"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Planeering"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Algab kuupäeval"
@@ -4849,9 +4793,9 @@ msgid "Classification"
 msgstr "Liigitamine"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Salajane"
+#, fuzzy
+msgid "Co_nfidential"
+msgstr "Salajane"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4877,7 +4821,6 @@ msgid "Pu_blic"
 msgstr "A_valik"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Näita aega kui"
 
@@ -4894,74 +4837,34 @@ msgstr "_Lõpp:"
 msgid "_Start time:"
 msgstr "_Algus:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr "Puudub"
+
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Organiseerija peab olema määrtud."
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr "See isik on juba osavõtja!"
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:630
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Osavõtja"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Osavõtja lisamiseks vajuta siia"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Ühine nimi"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Kust Delegeeritud"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Kuhu Delegeeritud"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Keel"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Liige"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Olek"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4972,7 +4875,7 @@ msgid "_Change Organizer"
 msgstr "_Muuda organiseerijat:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Kustu teisi..."
 
@@ -5132,7 +5035,7 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5159,53 +5062,83 @@ msgstr "Ülesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Ülesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Lõpetatud "
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#, fuzzy, no-c-format
+msgid "% _Complete"
 msgstr "valmis (%)"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
-msgstr "Lõpetamise päev:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311
+msgid "Completed"
+msgstr "Lõpetatud"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
+msgid "In Progress"
+msgstr "Töös"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305
+msgid "Not Started"
+msgstr "Pole alanud"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Edenemine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Date Completed:"
+msgstr "Lõpetamise päev:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "Tä_htsus:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Olek:"
 
-#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "Kodulehe aad_ress"
+
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Põhiline"
 
-#: calendar/gui/dialogs/task-editor.c:204
-#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Kellele määratud"
 
-#: calendar/gui/dialogs/task-page.c:480
+#: calendar/gui/dialogs/task-page.c:482
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.c:542
+msgid "Due date is before start date!"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "_Salajane"
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Kirjeldus:"
@@ -5218,228 +5151,263 @@ msgstr "_Alguskuupäev:"
 msgid "_Due Date:"
 msgstr "_Tähtaeg:"
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr "%d päeva"
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr "1 päev"
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr "%d nädalat"
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr "1 nädal"
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr "%d tundi"
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr "1 tund"
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutit"
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr "1 minut"
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekundit"
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr "Saada sõnum"
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr "Teostatakse tundmatu tegevus"
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s enne sündmuse algust"
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s pärast sündmuse algust"
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s sündmuse alguses"
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s enne sündmuse lõppu"
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s pärast sündmuse lõppu"
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s sündmuse lõpus"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
+msgid "Public"
+msgstr "Avalik"
+
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
+msgid "Private"
+msgstr "Isiklik"
+
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
+msgid "Confidential"
+msgstr "Salajane"
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 #, fuzzy
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1933
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Vaba"
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:393
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Kinni"
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
-#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "A_va"
 
-#: calendar/gui/e-calendar-table.c:959
+#: calendar/gui/e-calendar-table.c:989
 #, fuzzy
-msgid "_Save as..."
-msgstr "Salvesta kui..."
+msgid "Open _Web Page"
+msgstr "_Ava sõnum"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Save As..."
+msgstr "_Salvesta kui..."
+
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
+#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Trüki..."
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
-#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Lõika"
 
-#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
+#: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
-#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
+#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1001
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Määra ülesanne"
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi ülesanded lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
-#: calendar/gui/e-week-view.c:4335
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks vajuta siia"
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "valmis (%)"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr "Lõpetatud"
 
@@ -5448,12 +5416,13 @@ msgid "Completion Date"
 msgstr "Lõpetamise kuupäev"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr "Tähtaeg"
+#, fuzzy
+msgid "Description"
+msgstr "Kirjeldus:"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
-msgstr "Lõpeb kuupäeval"
+msgid "Due Date"
+msgstr "Tähtaeg"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
@@ -5463,255 +5432,313 @@ msgstr "Geograafiline asukoht"
 msgid "Priority"
 msgstr "Tähtsus"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Algab kuupäeval"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Olek"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Ülesannete sorteerimine"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a, %d.%m.%Y %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr " värvusega"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+#: calendar/gui/e-calendar-table.etspec.h:20
+#, fuzzy
+msgid "component"
+msgstr "Sündmus"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Kuupäev peab olema sisestatud formaadis: \n"
-"\n"
-"%s"
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Tundmatu"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
+#: calendar/gui/e-cal-model.c:828
+msgid "Recurring"
+msgstr "Korduv"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
-msgid "%A %d %B"
-msgstr "%A, %d. %B"
+#: calendar/gui/e-cal-model.c:830
+msgid "Assigned"
+msgstr "Määratud"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d. %b"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "Yes"
+msgstr "Jah"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "el"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "No"
+msgstr "Ei"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pl"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "Põ"
 
-#: calendar/gui/e-day-view.c:3694
-msgid "New _Appointment"
-msgstr "Uus _sündmus"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "Lõ"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr "Ida"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "Lä"
 
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
+#: calendar/gui/e-cal-model-tasks.c:550
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Geograafiline asukoht peab olema sisestatud formaadis: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+msgid "New _Appointment..."
+msgstr "Uus _sündmus..."
+
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
 #, fuzzy
 msgid "New Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
 msgid "New Task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Trüki"
-
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
+#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Mine tänasele _päevale"
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
 msgid "_Go to Date..."
 msgstr "_Mine kuupäevale..."
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
-#: ui/evolution-calendar.xml.h:34
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/hõivatud infot"
 
-#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
+#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
 #: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Sõnumite sätted..."
 
-#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
-#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr "_Salvesta kui..."
-
-#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
+#: calendar/gui/e-cal-view.c:1139
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta kohtumine"
 
-#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
+#: calendar/gui/e-cal-view.c:1140
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
+#: calendar/gui/e-cal-view.c:1145
 msgid "Make this Occurrence _Movable"
 msgstr "Märgi see sündmus _nihutatavaks"
 
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_õik sündmused"
 
-#: calendar/gui/e-itip-control.c:706
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a, %d.%m.%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Kuupäev peab olema sisestatud formaadis: \n"
+"\n"
+"%s"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "el"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pl"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
+msgid "%A %d %B"
+msgstr "%A, %d. %B"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d. %b"
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:676
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Li_htne kordus"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 #, fuzzy
 msgid "Every day"
 msgstr "Vahemikuga"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d päeva"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "Every week"
 msgstr "Vahemikuga"
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d nädalat"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 #, fuzzy
 msgid "Every week on "
 msgstr "Evergreen"
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d nädalat"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 #, fuzzy
 msgid " and "
 msgstr "Liiv"
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 #, fuzzy
 msgid "every month"
 msgstr "Ühte _kuud"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 #, fuzzy
 msgid "Every year"
 msgstr "Vahemikuga"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Lõpp: <b>"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Lõpetatud "
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1005
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5719,351 +5746,345 @@ msgstr ""
 "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst endale "
 "sobilik tegevus."
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 #, fuzzy
 msgid "Location:"
 msgstr "As_ukoht:"
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 #, fuzzy
 msgid "Status:"
 msgstr "_Olek:"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Vastu võetud"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek"
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
-#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Tundmatu"
-
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 msgid "Update"
 msgstr "Uuenda"
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Olgu"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 msgid "Accept"
 msgstr "Nõustu"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 msgid "Tentatively accept"
 msgstr "Proovinõusolek"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 msgid "Decline"
 msgstr "Lükka tagasi"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud info saatmine"
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 msgid "Send Latest Information"
 msgstr "Saadab värskeima informatsiooni"
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publitseeris kohtumise info."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 msgid "Meeting Information"
 msgstr "Kohtumise info"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> soovib saada sinu kohalolekut kohtumisel."
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> soovib saada sinu kohalolekut kohtumisel."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1309
 msgid "Meeting Proposal"
 msgstr "Ettepanek kohtumiseks"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> soovib saada värskeimat infot kohtumise kohta."
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 msgid "Meeting Update"
 msgstr "Kohtumise info uuendus"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> soovib saada värskeimat infot kohtumise kohta."
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 msgid "Meeting Update Request"
 msgstr "Soov muuta kohtumist"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> vastas kohtumise päringule."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Reply"
 msgstr "Kohtumise vastus"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> tühistas kohtumise."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 msgid "Meeting Cancellation"
 msgstr "Kokkusaamise tühistamine"
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> tühistas kohtumise."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 msgid "Bad Meeting Message"
 msgstr "Vigane kohtmise sõnum"
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas ülesande info."
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 msgid "Task Information"
 msgstr "Ülesande info"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1381
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta."
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vastas ülesande määramisele."
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas ülesande."
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1402
 msgid "Task Cancellation"
 msgstr "Ülesande tühistamine"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> avalikustas vaba/hõivatud info."
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud info"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> soovib saada sinu vaba/hõivatud infot."
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud infot"
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> vastas vaba/hõivatud päringule."
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendrifaili ei saa uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Osavõtja olekut ei olnud võimailk uuendada, kuna objekti enam ei eksisteeri"
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada, kuna selle olek on vigane!\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 msgid "Attendee status could not be updated!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vali kaust"
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vali kaust"
@@ -6105,253 +6126,285 @@ msgstr "lõppkuup."
 msgid "date-start"
 msgstr "alguskuup."
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr "Juhid"
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
-msgid "Required Participants"
-msgstr "Vajalikud osalejad"
-
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
-msgstr "Võimalikud osalejad"
-
-#: calendar/gui/e-meeting-model.c:82
-#, fuzzy
-msgid "Resources"
-msgstr "Ressurss"
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
-msgid "Individual"
-msgstr "Individuaalne"
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
-msgid "Group"
-msgstr "Grupp"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
-msgid "Resource"
-msgstr "Ressurss"
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
-msgid "Room"
-msgstr "Ruum"
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
-msgid "Chair"
-msgstr "Juht"
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
-msgid "Required Participant"
-msgstr "Nõutav osaleja"
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
-msgid "Optional Participant"
-msgstr "Võimalik osavõtja"
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
-msgid "Non-Participant"
-msgstr "Mitteosaleja"
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
-msgid "Needs Action"
-msgstr "Vajab tegevust"
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Katseline"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
-msgid "Delegated"
-msgstr "Delegeeritud"
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
-msgstr "Töös"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d. %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
-msgid "%a %m/%d/%Y"
-msgstr "%a, %d.%m.%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Info puudub"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "_Options"
 msgstr "_Häälestus"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _Only Working Hours"
 msgstr "Näita tunde _tööpäeva piires"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:461
 #, fuzzy
 msgid "Show _Zoomed Out"
 msgstr "Näita kontsentreeritult"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update Free/Busy"
 msgstr "_Värskenda vaba/hõivatud"
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
+#: calendar/gui/e-meeting-time-sel.c:541
 msgid "_All People and Resources"
 msgstr "_Kõik inimesed ja ressursid"
 
-#: calendar/gui/e-meeting-time-sel.c:563
+#: calendar/gui/e-meeting-time-sel.c:550
 msgid "All _People and One Resource"
 msgstr "Kõik _inimesed ja üks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:572
+#: calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required People"
 msgstr "_Vajalikud inimesed"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "Required People and _One Resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "Meeting _start time:"
 msgstr "Kohtumise _algus:"
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Meeting _end time:"
 msgstr "Kohtumise l_õpp:"
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
-#: calendar/gui/gnome-cal.c:2017
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2054
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d. %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2087
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a, %d.%m.%Y"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Osavõtja"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Osavõtja lisamiseks vajuta siia"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Ühine nimi"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Kust Delegeeritud"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Kuhu Delegeeritud"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Keel"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Liige"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
+msgstr "vigane aeg"
+
+#: calendar/gui/e-tasks.c:221
+#, fuzzy
+msgid "Start Date:"
+msgstr "_Alguskuupäev:"
+
+#: calendar/gui/e-tasks.c:237
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Tähtaeg:"
+
+#. write priority
+#: calendar/gui/e-tasks.c:265
+#, fuzzy
+msgid "Priority:"
+msgstr "Tä_htsus:"
+
+#. URL
+#: calendar/gui/e-tasks.c:321
+#, fuzzy
+msgid "Web Page:"
+msgstr "Lehekülg"
+
+#: calendar/gui/e-tasks.c:702
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s ülesanded"
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ei saa laadida '%s' ülesandeid"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:746
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Viga %s käivitamisel"
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:899
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Lõpetamise kuupäev"
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:922
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1017
 #, fuzzy
 msgid "Expunging"
 msgstr "Tühjendan kausta"
 
-#: calendar/gui/e-week-view.c:3581
-msgid "New _Appointment..."
-msgstr "Uus _sündmus..."
-
-#: calendar/gui/gnome-cal.c:1481
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' avamiseks vajalik meetod on toetamata"
 
-#: calendar/gui/gnome-cal.c:1556
+#: calendar/gui/gnome-cal.c:1772
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm %s"
 
-#: calendar/gui/gnome-cal.c:1748
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1757
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1988
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Avan %s kalendri"
 
-#: calendar/gui/gnome-cal.c:2028
+#: calendar/gui/gnome-cal.c:2197
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Avan kausta %s"
 
+#: calendar/gui/gnome-cal.c:3094
+#, fuzzy, c-format
+msgid "Purging event %s"
+msgstr "Kontrollin %s"
+
+#: calendar/gui/gnome-cal.c:3178
+#, fuzzy
+msgid "Purging"
+msgstr "Turin"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Kalendri ja ülesannete sätted"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendri ja ülesannete sätted"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution'i sõnumikausta kuvamise komponent."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+# !PARANDA!
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
+
+# !PARANDA!
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution'i uudiseredaktor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution'i uudiseredaktor"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprill"
@@ -6462,7 +6515,7 @@ msgstr "Vaba/Hõivatud informatsioon (%s - %s)"
 msgid "iCalendar information"
 msgstr "iKalendri informatsioon"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
@@ -6495,82 +6548,81 @@ msgid "Sa"
 msgstr "L"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1882
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud päev (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1919
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valitud nädal (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1927
 msgid "Selected month (%b %Y)"
 msgstr "Valitud kuu (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1934
 msgid "Selected year (%Y)"
 msgstr "Valitud aasta (%Y)"
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2262
 msgid "Task"
 msgstr "Ülesanne"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2321
 #, c-format
 msgid "Status: %s"
 msgstr "Olek: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2338
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "Tä_htsus:"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2350
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%): %i"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2362
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategooriad: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2387
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Trükkimise eelvaade"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2559
 msgid "Print Item"
 msgstr "Trüki kirje"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2632
 msgid "Print Setup"
 msgstr "Trükkimise sätted"
 
@@ -6578,7 +6630,7 @@ msgstr "Trükkimise sätted"
 msgid "The URI of the tasks folder to display"
 msgstr "Kuvatava ülesannete kausta URI"
 
-#: calendar/gui/tasks-control.c:465
+#: calendar/gui/tasks-control.c:448
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6591,11 +6643,11 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldame kustutatud sõnumid?"
 
-#: calendar/gui/tasks-control.c:468
+#: calendar/gui/tasks-control.c:451
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: calendar/gui/tasks-control.c:610
+#: calendar/gui/tasks-control.c:593
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Trüki kaardid"
@@ -8302,28 +8354,28 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:167
 msgid "Signing is not supported by this cipher"
 msgstr "See šiffer ei toeta allkirjastamist"
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:207
 msgid "Verifying is not supported by this cipher"
 msgstr "See šiffer ei toeta kontrolli"
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:251
 msgid "Encryption is not supported by this cipher"
 msgstr "See šiffer ei toeta krüpteerimist"
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:293
 msgid "Decryption is not supported by this cipher"
 msgstr "See šiffer ei toeta dekrüpteerimist"
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:331
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "See šiffer ei toeta dekrüpteerimist"
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:363
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "See šiffer ei toeta dekrüpteerimist"
@@ -8366,7 +8418,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Taassünkroniseeritakse serveriga"
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Säilitan Kausta '%s'"
@@ -8387,57 +8443,57 @@ msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ei saa luua kataloogi %s: %s"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 msgid "Syncing folders"
 msgstr "Kaustade sünkroniseerimine"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri analüüsil: %s: %s"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri täitmisel: %s: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 msgid "Unable to open spool folder"
 msgstr "Puhverkausta pole võimalik avada"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 msgid "Unable to process spool folder"
 msgstr "Puhverkausta pole võimalik töödelda"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Võetakse vastu teadet %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 msgid "Syncing folder"
 msgstr "Kausta sünkroniseerimine"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Tõmban %d. sõnumit %dst"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d. teate juures %d'st tekkis viga"
@@ -8462,7 +8518,36 @@ msgstr "Vigased argumendid"
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga filtri abil otsimisel %s: %s"
 
-#: camel/camel-folder-search.c:346
+#: camel/camel-folder.c:585
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Toetamata operatsioon: lisa sõnum: %s"
+
+#: camel/camel-folder.c:1163
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
+
+#: camel/camel-folder.c:1203
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Toetamata operatsioon: otsing UID järgi: %s"
+
+#: camel/camel-folder.c:1321
+msgid "Moving messages"
+msgstr "Sõnumite liigutamine"
+
+#: camel/camel-folder.c:1321
+#, fuzzy
+msgid "Copying messages"
+msgstr "Sõnumite liigutamine"
+
+#: camel/camel-folder.c:1571
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Võtan vastu %d teadet"
+
+#: camel/camel-folder-search.c:348
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8471,7 +8556,7 @@ msgstr ""
 "Otsinguavaldist ei ole võimalik analüüsida: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:356
+#: camel/camel-folder-search.c:358
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8480,40 +8565,16 @@ msgstr ""
 "Viga otsinguavaldise täitmisel: %s: \n"
 "%s"
 
-#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 #, fuzzy
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 
-#: camel/camel-folder-search.c:653
+#: camel/camel-folder-search.c:650
 #, fuzzy, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Täidetakse päring tundmatul päisel: %s"
 
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Toetamata operatsioon: lisa sõnum: %s"
-
-#: camel/camel-folder.c:1161
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
-
-#: camel/camel-folder.c:1201
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Toetamata operatsioon: otsing UID järgi: %s"
-
-#: camel/camel-folder.c:1319
-msgid "Moving messages"
-msgstr "Sõnumite liigutamine"
-
-#: camel/camel-folder.c:1319
-#, fuzzy
-msgid "Copying messages"
-msgstr "Sõnumite liigutamine"
-
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8539,7 +8600,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr "Katkestatud."
 
@@ -8593,26 +8654,6 @@ msgstr "Sõnumi lahtikrüptimine ebaõnnestus."
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Ei saa kontrollida sõnumit: Ajutise faili loomine ebaõnnestus: %s"
 
-#: camel/camel-lock-client.c:111
-#, fuzzy, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ei suuda luua lukustamisabilise toru: %s"
-
-#: camel/camel-lock-client.c:124
-#, fuzzy, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Lukustamisabilise haruprotsessi ei saa luua: %s"
-
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
-#, fuzzy, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
-
-#: camel/camel-lock-client.c:215
-#, fuzzy, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' ei õnnestnud lukustada"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8633,6 +8674,26 @@ msgstr "fcntl(2) abil lukustamine nurjus: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) abil lukustamine nurjus: %s"
 
+#: camel/camel-lock-client.c:100
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ei suuda luua lukustamisabilise toru: %s"
+
+#: camel/camel-lock-client.c:113
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Lukustamisabilise haruprotsessi ei saa luua: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, fuzzy, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
+
+#: camel/camel-lock-client.c:204
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' ei õnnestnud lukustada"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8699,11 +8760,11 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 #, fuzzy
 msgid "parse error"
 msgstr "Muu viga"
@@ -8772,11 +8833,11 @@ msgstr ""
 "See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse "
 "kasutades turvalist CRAM-MD5 parooli."
 
-#: camel/camel-sasl-digest-md5.c:46
+#: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:50
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8870,7 +8931,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1207
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
@@ -8929,23 +8990,23 @@ msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 msgid "PLAIN"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr "POP enne SMTPd"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "See valik lubab POP ühenduse enne SMTP ühenduse üritamist"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
 msgstr "POP allika URI"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
@@ -8954,57 +9015,57 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regulaaravaldise kompileerimine nurjus: %s: %s"
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vajab kasutajanime osa"
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:285
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vajab hosti osa"
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:293
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vajab kataloogitee osa"
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:738
 #, c-format
 msgid "Resolving: %s"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:783 camel/camel-service.c:915
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Viga nime lahendamisel: %s"
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Hostinime lahendamine ebaõnnestus: %s: põhjus teadmata"
 
-#: camel/camel-service.c:818
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Hostinime lahendamine ebaõnnestus: %s: ei leia hosti"
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Hostinime lahendamine ebaõnnestus: %s: põhjus teadmata"
 
-#: camel/camel-service.c:880
+#: camel/camel-service.c:860
 #, fuzzy
 msgid "Resolving address"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:949
+#: camel/camel-service.c:929
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Hostinime lahendamine ebaõnnestus: %s: ei leia hosti"
 
-#: camel/camel-service.c:952
+#: camel/camel-service.c:932
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Hostinime lahendamine ebaõnnestus: %s: põhjus teadmata"
@@ -9017,12 +9078,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9068,142 +9129,142 @@ msgstr "Sõnumi lahtikrüptimine ebaõnnestus."
 msgid "Failed to verify certificates."
 msgstr "Sertifikaatide kontroll ebaõnnestus."
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:212
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Sertifikaatide kontroll ebaõnnestus."
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "Sertifikaatide kontroll ebaõnnestus."
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Allkirjafail"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Viga %s laadimisel"
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 #, fuzzy
 msgid "Out of memory"
 msgstr "Kontorist väljas"
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "Sertifikaatide kontroll ebaõnnestus."
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 #, fuzzy
 msgid "Certificate Revoked"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "Vigane parameeter"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9212,15 +9273,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9233,7 +9294,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9243,28 +9304,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9276,17 +9337,17 @@ msgstr "_Sertifikaadi ID:"
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Viga %s käivitamisel"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
@@ -9314,12 +9375,12 @@ msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2806
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2809
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
@@ -9356,38 +9417,38 @@ msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ootamatu OK vastus IMAP serverilt: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ei saa luua kataloogi %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ei saa laadida %s kokkuvõtet"
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr "Kaust hävitati ja taasloodi serveris."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr "Kontrollin muudetud sõnumite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:1883
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Sõnumi lahtikrüptimine ebaõnnestus."
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9396,24 +9457,24 @@ msgstr ""
 "Ei saa kätte sõnumit: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Sõnumit ei leitud"
 
-#: camel/providers/imap/camel-imap-folder.c:1943
-#: camel/providers/imap/camel-imap-folder.c:2539
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr "See sõnum ei ole hetkel kättesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:2203
-#: camel/providers/imap/camel-imap-folder.c:2273
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr "Võtan kokkuvõtvat infot uute sõnumite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:2577
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia sõnumi sisu FETCH vastuses."
 
@@ -9463,89 +9524,105 @@ msgstr "Nimeruum"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Rakenda filtreid kõikidele Sisendkasti uutele sõnumitele"
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "_Kontrolli uusi sõnumeid automaatselt"
+
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Parool"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s teenus %s jaoks %s peal"
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/imap/camel-imap-store.c:589
+#: camel/providers/imap/camel-imap-store.c:821
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Ühendus katkestatud"
 
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ei saa ühenduda %s (port: %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:655
+#: camel/providers/imap/camel-imap-store.c:686
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Ei saa luua ühendust POP serveriga.\n"
 "Viga kasutajanime saatmisel: %s"
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/pop3/camel-pop3-store.c:220
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operatsioon ei ole toetatud"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:687
 #: camel/providers/pop3/camel-pop3-store.c:261
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentimine ebaõnnestus."
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:824
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Ühenduse loomine serveriga nurjus: %s"
+
+#: camel/providers/imap/camel-imap-store.c:1237
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s ei toeta küsitud autentimistüüpi %s"
 
-#: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentimistüübi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPalun sisesta IMAP parool %s@%s jaoks"
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9553,42 +9630,70 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1660
+#: camel/providers/imap/camel-imap-store.c:1802
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2003
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Kausta nimi ei tohi sisaldada Return sümbolit"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2015
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tundmatu viga: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2051
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Ühenduse loomine POP serveriga nurjus: %s"
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "Saadab sõnumi kontaktile"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:379
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:383
+#: camel/providers/local/camel-local-folder.c:386
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:390
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9648,50 +9753,54 @@ msgstr ""
 "Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga "
 "puhverfailides"
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Kohaliku posti fail %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kausta ümbernimetamine ebaõnnestus: %s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ei saa kustutada kausta kokkuvõttefaili '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ei saa kustutada kausta indeksfaili '%s': %s"
@@ -9705,17 +9814,17 @@ msgstr "Ei saa salvestada kokkuvõtet: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr "Vigane sõnumi sisu"
 
@@ -9731,7 +9840,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9796,29 +9905,29 @@ msgstr "Kontrollin uute sõnumite olemasolu"
 msgid "Storing folder"
 msgstr "Kausta säilitamine"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s lukustamine nurjus: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:289
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:349
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:352
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9827,15 +9936,15 @@ msgstr ""
 "Ei saa kätte sõnumit %s kaustast %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9844,7 +9953,16 @@ msgstr ""
 "Ei saa avada faili '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr ""
+"Kataloogi %s loomine nurjus:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9853,14 +9971,15 @@ msgstr ""
 "Ei saa luua faili '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ei ole tavaline fail."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9869,11 +9988,36 @@ msgstr ""
 "Ei saa kustutada kausta '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Kaust '%s' ei ole tühi, jätan kustutamata."
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Sa ei saa luua selle nimega kausta"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "Ei saa luua kataloogi %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Ei saa kontrollida kausta: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
+
+#: camel/providers/local/camel-mbox-store.c:427
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "Kirjeldatud kaustanimi ei ole korrektne: %s"
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9903,7 +10047,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Ei saa avada ajutist kirjakasti: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
@@ -9920,38 +10064,38 @@ msgstr "Kausta ümbernimetamine ebaõnnestus: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tundmatu viga: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Kausta ümbernimetamine ebaõnnestus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Viga ajutise kirjakasti kirjutamisel: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Ajutisse kirjakasti kirjutamine ebaõnnestus: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Sõnumi lisamine mh vormingus kausta nurjus: %s: %s"
@@ -10029,6 +10173,68 @@ msgid ""
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "Palun sisesta %s@%s NNTP parool"
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr "Server keeldus kasutajanime vastu võtmast"
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+msgid "Failed to send username to server"
+msgstr "Kasutajanime saatmine serverile ebaõnnestus"
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr "Server keeldus kasutajanime/parooli vastu võtmast"
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr ""
+"Ei saa kätte sõnumit: %s\n"
+"  %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+#, fuzzy
+msgid "User cancelled"
+msgstr "Operatsioon katekstatud"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr "Ei saanud gruppide nimekirja serverist kätte."
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, fuzzy, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+"Väljundfaili loomine nurjus: %s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+"Väljundfaili loomine nurjus: %s\n"
+" %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENETi uudised"
@@ -10037,59 +10243,59 @@ msgstr "USENETi uudised"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Ei saa luua kataloogi %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENETi uudised üle %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Toru loomine ebaõnnestus: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "IMAPi käsk ebaõnnestus: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Kontrollin uute sõnumite olemasolu"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "Tundmatu viga: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 #, fuzzy
 msgid "Use cancel"
 msgstr "Tühista"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Operatsioon katekstatud"
@@ -10098,14 +10304,6 @@ msgstr "Operatsioon katekstatud"
 msgid "Retrieving POP summary"
 msgstr "Võtan vastu POP kokkuvõtet"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-#, fuzzy
-msgid "User cancelled"
-msgstr "Operatsioon katekstatud"
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
@@ -10115,37 +10313,23 @@ msgstr "Ei saa salvestada kokkuvõtet: %s: %s"
 msgid "Expunging deleted messages"
 msgstr "Hävitan kustutatud sõnumid"
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Võtan vastu POP sõnumit nr %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-"Ei saa kätte sõnumit: %s\n"
-"  %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Teadmata sademed"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr ""
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Jäta sõnumid serverisse"
@@ -10308,145 +10492,145 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "E-posti saatmiseks SMTP protokolli abil läbi võrgus oleva mailhub'i.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Abisõnum"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Teenus on valmis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Teenus sulgeb ülekandekanali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Teenus ei ole saadaval, sulgen ülekandekanali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Autentimise mehhanism on liiga nõrk"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Ajutine autentimine ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autentimine on vajalik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:298
 #, fuzzy
 msgid "Welcome response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Ei saa luua ühendust POP serveriga.\n"
 "Viga kasutajanime saatmisel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:343
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH päring ületas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:372
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPalun sisesta %s@%s SMTP parool"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10457,90 +10641,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posti saatmine %s kaudu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr "Sõnumi saatmine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr "Ei saa saata sõnumit: saajate aadressid on määramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:714
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ei saa saata sõnumit: saajate aadressid on määramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr "SMTP tervitus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "RSET päring ületas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "SMTP autentimine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "Viga SASL autentimisobjekti loomise."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH päring ületas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "AUTH päring nurjus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Halb autentimisvastus serverilt.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM päring ületas ajalimiidi: %s: sõnum jäi saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM vastuse viga: %s: sõnum jäi saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO päring ületas ajalimiidi: %s: sõnum jäi saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA päring ületas ajalimiidi: %s: sõnum jäi saatmata"
@@ -10548,72 +10732,71 @@ msgstr "DATA päring ületas ajalimiidi: %s: sõnum jäi saatmata"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA saatmine ületas ajalimiidi: sõnumi tühistamine: %s: sõnum jäi saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Serverilt saadi vigane autentimise vastus."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET päring ületas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH päring ületas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET vastuse viga: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:103
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "manus"
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Eemalda valitud kirjed manuste nimekirjast"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Lisa sõnumile manus"
 
@@ -10646,90 +10829,12 @@ msgstr "MIME tüüp:"
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Aadressiraamatu vaatamiseks kliki siia"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Vastus:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Saatja:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Teema:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Adressaat:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Sisesta sõnumi adressaadid"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Koopia:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Sisesta aadressid, milledele saadetakse sõnumi koopiad"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Pimekoopia:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr "Sisesta aadressid, millele saadetakse sõnumi pimekoopiad."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-#, fuzzy
-msgid "Post To:"
-msgstr "Porto"
-
-#: composer/e-msg-composer-hdrs.c:553
-#, fuzzy
-msgid "Posting destination"
-msgstr "Kirjeldus puudub"
-
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
-#, fuzzy
-msgid "Attach file(s)"
-msgstr "Lisab sõnumile faili"
-
-#: composer/e-msg-composer.c:535
+#: composer/e-msg-composer.c:562
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Ei saa salvestada allkirjafaili."
 
-#: composer/e-msg-composer.c:814
+#: composer/e-msg-composer.c:841
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10738,44 +10843,44 @@ msgstr ""
 "Viga faili %s lugemisel:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1177
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr "Fail on juba olemas. Kirjutada üle?"
 
-#: composer/e-msg-composer.c:1195
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Viga faili salvestamisel: %s"
 
-#: composer/e-msg-composer.c:1218
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Viga faili laadimisel: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1287
+#: composer/e-msg-composer.c:1325
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10784,7 +10889,7 @@ msgstr ""
 "Väljundfaili loomine nurjus: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1296
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10793,7 +10898,7 @@ msgstr ""
 "Viga kirja automaatsel salvestamisel: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10801,7 +10906,7 @@ msgstr ""
 "Ximian Evolution leidis eelmisest sessioonist salvestamata faile.\n"
 "Kas sa soovid üritada nende taastamist?"
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1594
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10812,35 +10917,35 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata sõnum"
 
-#: composer/e-msg-composer.c:1593
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:2017
+#: composer/e-msg-composer.c:2054
 #, fuzzy
 msgid "Signature:"
 msgstr "Allkirja salvestamine"
 
-#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Sõnumi koostamine"
 
-#: composer/e-msg-composer.c:2934
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2962
+#: composer/e-msg-composer.c:3030
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10851,7 +10956,7 @@ msgstr ""
 "Ei saa luua sõnumiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:3029
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10859,12 +10964,89 @@ msgstr ""
 "Ei saa luua sõnumiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:4045
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
+#: composer/e-msg-composer-hdrs.c:290
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Aadressiraamatu vaatamiseks kliki siia"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Vastus:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Saatja:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Teema:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Adressaat:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Sisesta sõnumi adressaadid"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Koopia:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Sisesta aadressid, milledele saadetakse sõnumi koopiad"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Pimekoopia:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr "Sisesta aadressid, millele saadetakse sõnumi pimekoopiad."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-hdrs.c:553
+#, fuzzy
+msgid "Posting destination"
+msgstr "Kirjeldus puudub"
+
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
+msgstr "Lisab sõnumile faili"
+
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -11028,7 +11210,7 @@ msgstr ""
 "Antud nimega fail eksisteerib.\n"
 "Kirjutada üle?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "Kirjutada fail üle?"
 
@@ -11051,90 +11233,210 @@ msgstr "Kategooriad"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %d.%m.%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%I %p"
 
+#: executive-summary/component/component-factory.c:151
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Bonobo komponentide süsteemi lähtestamine nurjus"
+
+#: executive-summary/component/e-summary.c:925
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Kausta ümbernimetamine ebaõnnestus:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:939
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Viga %s laadimisel"
+
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:125
+#, fuzzy
+msgid "Select a service"
+msgstr "Vali fail"
+
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Saada sõnum"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Change the view to %s"
+msgstr "Muudab kausta nime"
+
+#: executive-summary/component/e-summary-url.c:73
+#, fuzzy, c-format
+msgid "Run %s"
+msgstr "URL: %s"
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Sulge"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Tõstab kausta teise kohta"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Häälestus"
+
+#: executive-summary/component/e-summary-url.c:553
+#, fuzzy
+msgid "page"
+msgstr "Lehekülg"
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+msgid "Error"
+msgstr "Viga"
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update now"
+msgstr "Uuenda"
+
+#: executive-summary/test-service/rdf-summary.c:795
+#, fuzzy
+msgid "Update every "
+msgstr "_Värskenda vaba/hõivatud"
+
 #: filter/filter-datespec.c:65
 #, fuzzy
 msgid "1 second ago"
@@ -11261,89 +11563,6 @@ msgstr "Stiili nimi:"
 msgid "Select Folder"
 msgstr "Vali kaust"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Viga regulaaravaldises '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
-msgid "Important"
-msgstr "Tähtis"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
-#, fuzzy
-msgid "Later"
-msgstr "pärast"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Sa pead sellele filtrile nime määrama."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Reegli nimi: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Nimetu"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Kui"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Käivita tegevused"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "kui kõik tingimised on täidetud"
-
-#: filter/filter-rule.c:800
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "kui mõni tingimus on täidetud"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "sissetulev"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "väljaminev"
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Võrdle"
@@ -11449,6 +11668,89 @@ msgstr "koos kõigi kohalike kalatoogidega"
 msgid "years"
 msgstr "aastat"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Viga regulaaravaldises '%s':\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+msgid "Important"
+msgstr "Tähtis"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1458
+#, fuzzy
+msgid "Later"
+msgstr "pärast"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Sa pead sellele filtrile nime määrama."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Reegli nimi: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Nimetu"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Kui"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Käivita tegevused"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "kui kõik tingimised on täidetud"
+
+#: filter/filter-rule.c:800
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "kui mõni tingimus on täidetud"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "sissetulev"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "väljaminev"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11473,230 +11775,230 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "sisaldab"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopeeri kausta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Vastuvõtmise kuupäev"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Saatmise kuupäev"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ei sisalda"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ei lõppe"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ei ole olemas"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "ei ole olemas"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ei kõla kui"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ei alga"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Ei ole olemas"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Mustand"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "lõppeb"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "On olemas"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "on olemas"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Avaldis"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "on"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "on pärast"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "on enne"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "Tähistatud"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "on suurem kui"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "on väiksem kui"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ei ole"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Tähistatud"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Postiloend (list)"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Sõnumi sisu"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Kirja päis"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Tõsta kausta"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Saada kontaktile sõnum"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Mängi heli:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Loetud"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Adressaadid"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Regulaaravaldis vastab"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Vastatud kellele"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "on suurem kui"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "on väiksem kui"
-
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Skoor"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+#: filter/libfilter-i18n.h:30
 msgid "Sender"
 msgstr "Saatja"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:31
 msgid "Set Status"
 msgstr "Määra olek"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:32
 #, fuzzy
 msgid "Shell Command"
 msgstr "Firma"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:33
 msgid "Size (kB)"
 msgstr "Suurus (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "kõlab kui"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:34
 msgid "Source Account"
 msgstr "Lähtekonto"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:35
 msgid "Specific header"
 msgstr "Päise eripära"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "algab"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:37
 msgid "Stop Processing"
 msgstr "Peata töötlemine"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Teema"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "Unset Status"
 msgstr "Määra olek"
 
-#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/libfilter-i18n.h:40
+msgid "contains"
+msgstr "sisaldab"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not contain"
+msgstr "ei sisalda"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
+msgstr "ei lõppe"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not exist"
+msgstr "ei ole olemas"
+
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "does not return"
+msgstr "ei ole olemas"
+
+#: filter/libfilter-i18n.h:45
+msgid "does not sound like"
+msgstr "ei kõla kui"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not start with"
+msgstr "ei alga"
+
+#: filter/libfilter-i18n.h:47
+msgid "ends with"
+msgstr "lõppeb"
+
+#: filter/libfilter-i18n.h:48
+msgid "exists"
+msgstr "on olemas"
+
+#: filter/libfilter-i18n.h:49
+#, fuzzy
+msgid "is Flagged"
+msgstr "Tähistatud"
+
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is after"
+msgstr "on pärast"
+
+#: filter/libfilter-i18n.h:51
+#, fuzzy
+msgid "is before"
+msgstr "on enne"
+
+#: filter/libfilter-i18n.h:52
+msgid "is greater than"
+msgstr "on suurem kui"
+
+#: filter/libfilter-i18n.h:53
+msgid "is less than"
+msgstr "on väiksem kui"
+
+#: filter/libfilter-i18n.h:54
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Tähistatud"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not"
+msgstr "ei ole"
+
+#: filter/libfilter-i18n.h:56
+msgid "is"
+msgstr "on"
+
+#: filter/libfilter-i18n.h:57
+#, fuzzy
+msgid "returns greater than"
+msgstr "on suurem kui"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns less than"
+msgstr "on väiksem kui"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
+msgstr "kõlab kui"
+
+#: filter/libfilter-i18n.h:61
+msgid "starts with"
+msgstr "algab"
+
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:916
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11766,10 +12068,9 @@ msgid "Scanning %s"
 msgstr "Kontrollin %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Post"
 
@@ -11836,7 +12137,7 @@ msgstr "Evolution impordib sinu Netscape andmeid"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Prügi"
 
@@ -11851,7 +12152,7 @@ msgid "Scanning directory"
 msgstr "Kontrollin kausta"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:541
+#: shell/e-shell-startup-wizard.c:556
 msgid "Starting import"
 msgstr "Impordi alustamine"
 
@@ -11888,357 +12189,160 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Loob või muudab mailikontosid ja muid sätteid"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution'i kontoredaktor"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution'i sõnumiredaktor."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution'i sõnumiredaktor."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution'i sõnumiredaktor."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "E-posti seadistamisliides"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
-msgid "Mail Accounts"
-msgstr "Kontod"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr ""
-
-#: mail/component-factory.c:117
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Avalik"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Ülesandeid sisaldav kaust"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:147
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "See kaust ei saa sisaldada sõnumeid."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Properties..."
 msgstr "Omadused..."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Change this folder's properties"
 msgstr "Muudab selle kataloogi omadusi"
 
-#: mail/component-factory.c:819
+#: mail/component-factory.c:826
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:1000
+#: mail/component-factory.c:1008
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:1023
+#: mail/component-factory.c:1031
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "New Mail Message"
 msgstr "Uus sõnum"
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "_Mail Message"
 msgstr "_Saada sõnum"
 
-#: mail/component-factory.c:1064
+#: mail/component-factory.c:1072
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Sõnumi koostamine"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 #, fuzzy
 msgid "New Message Post"
 msgstr "Uus sõnum"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 #, fuzzy
 msgid "_Post Message"
 msgstr "Eelmisele sõnumile"
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1081
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Uus sõnum"
 
-#: mail/component-factory.c:1365
+#: mail/component-factory.c:1373
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ühendun serverisse..."
 
-#: mail/component-factory.c:1376
+#: mail/component-factory.c:1384
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:486
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\" omadused"
-
-#: mail/folder-browser-ui.c:488
-msgid "Properties"
-msgstr "Omadused"
-
-#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Ajutise kataloogi loomine nurjus: %s"
-
-#: mail/folder-browser.c:782
-#, c-format
-msgid "%d new"
-msgstr "uued: %d"
-
-#: mail/folder-browser.c:785 mail/folder-browser.c:793
-#: mail/folder-browser.c:796
-msgid ", "
-msgstr ", "
-
-#: mail/folder-browser.c:787
-#, c-format
-msgid "%d hidden"
-msgstr "peidetud: %d"
-
-#: mail/folder-browser.c:789
-#, c-format
-msgid "%d visible"
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
 msgstr ""
 
-#: mail/folder-browser.c:794
-#, c-format
-msgid "%d selected"
-msgstr "valitud: %d"
-
-#: mail/folder-browser.c:799
-#, c-format
-msgid "%d unsent"
-msgstr "saatmata: %d"
-
-#: mail/folder-browser.c:801
-#, c-format
-msgid "%d sent"
-msgstr "saadetud: %d"
-
-#: mail/folder-browser.c:803
-#, c-format
-msgid "%d total"
-msgstr "kokku: %d"
-
-#: mail/folder-browser.c:1182
-#, fuzzy
-msgid "Create _Virtual Folder From Search..."
-msgstr "Loo sõnumi baasil _Virtuaalne Kaust"
-
-#: mail/folder-browser.c:1736
-msgid "VFolder on _Subject"
-msgstr "VKaust _teema järgi"
-
-#: mail/folder-browser.c:1737
-msgid "VFolder on Se_nder"
-msgstr "VKaust _saatja järgi"
-
-#: mail/folder-browser.c:1738
-msgid "VFolder on _Recipients"
-msgstr "VKaust _adressaatide järgi"
-
-#: mail/folder-browser.c:1739
-msgid "VFolder on Mailing _List"
-msgstr "VKaust _postiloendi järgi"
-
-#: mail/folder-browser.c:1743
-msgid "Filter on Sub_ject"
-msgstr "Filter t_eema järgi"
-
-#: mail/folder-browser.c:1744
-msgid "Filter on Sen_der"
-msgstr "Filter saat_ja järgi"
-
-#: mail/folder-browser.c:1745
-msgid "Filter on Re_cipients"
-msgstr "Filter a_dressaatide järgi"
-
-#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
-msgid "Filter on _Mailing List"
-msgstr "Filter  p_ostiloendi järgi"
-
-#: mail/folder-browser.c:1764
-msgid "_Edit as New Message..."
-msgstr "_Redigeeri kui uut sõnumit..."
-
-#: mail/folder-browser.c:1766
-msgid "_Print"
-msgstr "_Trüki"
-
-#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
-msgid "_Reply to Sender"
-msgstr "_Vasta saatjale"
-
-#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
-msgid "Reply to _List"
-msgstr "Vasta postiloendisse"
-
-#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
-msgid "Reply to _All"
-msgstr "Vasta kõigile"
-
-#: mail/folder-browser.c:1773
-msgid "_Forward"
-msgstr "_Saada edasi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
 
-#: mail/folder-browser.c:1777
-msgid "Follo_w Up..."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/folder-browser.c:1778
-#, fuzzy
-msgid "Fla_g Completed"
-msgstr "Lõpetatud"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-#: mail/folder-browser.c:1779
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
-msgid "Cl_ear Flag"
-msgstr "Puhasta"
-
-#. separator here?
-#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
-msgid "Mar_k as Read"
-msgstr "_Märgi loetuks"
+msgid "Configure your email accounts here"
+msgstr "Loob või muudab mailikontosid ja muid sätteid"
 
-#: mail/folder-browser.c:1784
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Mark as _Unread"
-msgstr "Märgi kui l_ugemata"
-
-#: mail/folder-browser.c:1785
-msgid "Mark as _Important"
-msgstr "Märgi tä_htsaks"
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: mail/folder-browser.c:1786
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "_Mark as Unimportant"
-msgstr "Märgi vähet_ähtsaks"
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution'i kontoredaktor"
 
-#: mail/folder-browser.c:1791
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
-msgid "U_ndelete"
-msgstr "_Taasta"
+msgid "Evolution Mail component"
+msgstr "Evolution'i sõnumiredaktor."
 
-#: mail/folder-browser.c:1795
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Mo_ve to Folder..."
-msgstr "_Tõsta kausta..."
-
-#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "Ko_peeri kausta..."
+msgid "Evolution Mail composer"
+msgstr "Evolution'i sõnumiredaktor."
 
-#: mail/folder-browser.c:1804
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Add Sender to Address_book"
-msgstr "Lisa saatja aadressiraamatusse"
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution'i sõnumiredaktor."
 
-#: mail/folder-browser.c:1808
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 #, fuzzy
-msgid "Appl_y Filters"
-msgstr "Rakenda filtrid"
+msgid "Evolution Mail configuration interface"
+msgstr "E-posti seadistamisliides"
 
-#: mail/folder-browser.c:1812
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Crea_te Rule From Message"
-msgstr "Loo sõnumi baasil _reegel"
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution'i sõnumikausta kuvamise komponent."
 
-#: mail/folder-browser.c:2071
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
 #, fuzzy
-msgid "VFolder on M_ailing List"
-msgstr "VKaust _postiloendi järgi"
-
-#: mail/folder-browser.c:2073
-#, fuzzy, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Filter  p_ostiloendi järgi"
-
-#: mail/folder-browser.c:2074
-#, fuzzy, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "VKaust _postiloendi järgi"
+msgid "Evolution Mail preferences control"
+msgstr "Evolution'i sõnumikausta kuvamise komponent."
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 #, fuzzy
-msgid "Default"
-msgstr "_Vaikimisi"
+msgid "Mail Accounts"
+msgstr "Kontod"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
 msgstr ""
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -12327,7 +12431,7 @@ msgstr "_Konto nimi:"
 msgid "_Path:"
 msgstr "_Kataloog:"
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1886
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua ühe nimega kahte kontot."
 
@@ -12359,17 +12463,17 @@ msgstr "_Vaikimisi"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 #, fuzzy
 msgid "Account name"
 msgstr "_Konto nimi:"
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -12410,195 +12514,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "Seda teadet enam mitte näidata."
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "Saata sellegipoolest?"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Sellel sõnumil on teema väli tühi.\n"
-"Kas saadame ilma teemata?"
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr "tundmatu saatja"
-
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "%%s kirjutas %a, %d.%m.%Y kell %H:%M:"
-
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "Tõsta sõnum(id) kausta..."
-
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "Kopeeri sõnum(id) kausta..."
-
-#: mail/mail-callbacks.c:2344
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:2393
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:2403
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr "Ühtegi sõnumit ei ole valitud"
-
-#: mail/mail-callbacks.c:2465
-#, fuzzy, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"Ei saa kätte sõnumit: %s\n"
-"  %s"
-
-#: mail/mail-callbacks.c:2470
-#, fuzzy, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"%s on juba olemas\n"
-"Kas soovid üle kirjutada?"
-
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr "Sõnumi salvestamine teise nimega..."
-
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr "Sõnumite salvestamine teise nimega..."
-
-#: mail/mail-callbacks.c:2686
-#, fuzzy
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid "
-"enam võimalik taastada.\n"
-"\n"
-"Kas tõesti eemaldame kustutatud sõnumid?"
-
-#: mail/mail-callbacks.c:2781
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Viga filtriinfo laadimisel:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr "Filtrid"
-
-#: mail/mail-callbacks.c:2830
-#, fuzzy, c-format
-msgid "Page %d of %d"
-msgstr "Tõmban %d. sõnumit %dst"
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr "Sõnumi trükkimine"
-
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr "Sõnumi trükkimine nurjus"
-
-#: mail/mail-callbacks.c:3147
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr ""
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 #, fuzzy
@@ -12630,11 +12545,19 @@ msgstr "Lisa tingimus"
 msgid "Signature(s)"
 msgstr "_HTML allkiri:"
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Teenuse kontrollimine"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Ühendun serverisse..."
+
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identiteet"
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:369
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -12646,12 +12569,12 @@ msgstr ""
 "võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma "
 "sõnumitesse."
 
-#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Posti vastuvõtmine"
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:377
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12662,16 +12585,16 @@ msgstr ""
 "meetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
 "interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Posti saatmine"
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:389
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12682,11 +12605,11 @@ msgstr ""
 "parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
 "interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Kontohaldus"
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:396
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12695,14 +12618,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Teenuse kontrollimine"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Ühendun serverisse..."
-
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Tuvasta toetatavad tüübid"
@@ -12833,6 +12748,11 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "_Vaikimisi"
+
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
@@ -13331,256 +13251,62 @@ msgstr "Kasuta turvalist ühendust (_SSL)"
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
-#, fuzzy
-msgid "color"
-msgstr " värvusega"
-
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "kirjeldus"
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr ""
-
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
-msgstr ""
-
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
-msgstr ""
-
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr ""
-
-#: mail/mail-display.c:197
-#, fuzzy, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Antud nimega fail eksisteerib.\n"
-"Kirjutada üle?"
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr "Salvesta kaasatud fail"
-
-#: mail/mail-display.c:409
-#, fuzzy, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "Ajutise kataloogi loomine nurjus: %s"
-
-#: mail/mail-display.c:457
-#, fuzzy
-msgid "Save Attachment..."
-msgstr "Salvesta kaasatud fail"
-
-#: mail/mail-display.c:458
-msgid "View Inline"
-msgstr "Kuva sõnumi sees"
-
-#: mail/mail-display.c:459
-#, c-format
-msgid "Open in %s..."
-msgstr "Ava programmiga %s..."
-
-#: mail/mail-display.c:515
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Kuva sõnumi sees (%s abil)"
-
-#: mail/mail-display.c:519
-msgid "Hide"
-msgstr "Ära kuva"
-
-#: mail/mail-display.c:539
-msgid "External Viewer"
-msgstr ""
-
-#: mail/mail-display.c:1368
-#, fuzzy
-msgid "Downloading images"
-msgstr "_Lae pildid"
-
-#: mail/mail-display.c:1545
-msgid "Loading message content"
-msgstr ""
-
-#: mail/mail-display.c:1887
-#, fuzzy
-msgid "Overdue:"
-msgstr "_Hilinenud ülesanded:"
-
-#: mail/mail-display.c:1891
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %P"
-msgstr "%d. %b %l:%M %p"
-
-#: mail/mail-display.c:2255
-msgid "Open Link in Browser"
-msgstr ""
-
-#: mail/mail-display.c:2256
-msgid "Copy Link Location"
-msgstr "Kopeeri viida asukoht"
-
-#: mail/mail-display.c:2258
-msgid "Save Link as (FIXME)"
-msgstr ""
-
-#: mail/mail-display.c:2260
-msgid "Save Image as..."
-msgstr "Salvesta pilt kui..."
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:832
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: mail/mail-format.c:665
-#, c-format
-msgid "%s attachment"
-msgstr "\"%s\" tüüpi manus"
-
-#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
-#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-
-#: mail/mail-format.c:785 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Kuupäev"
-
-#: mail/mail-format.c:871
-msgid "Bad Address"
-msgstr ""
-
-#: mail/mail-format.c:912 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Kellelt"
-
-#: mail/mail-format.c:916
-msgid "Reply-To"
-msgstr ""
-
-#: mail/mail-format.c:921 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kellele"
-
-#: mail/mail-format.c:926
-msgid "Cc"
-msgstr "Koopia"
-
-#: mail/mail-format.c:931
-msgid "Bcc"
-msgstr "Pimekoopia"
-
-#: mail/mail-format.c:1482
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"See sõnum on digitaalselt allkirjastatud. Lisainfo jaoks kliki lukuikoonil."
-
-#: mail/mail-format.c:1510
-#, fuzzy
-msgid "Could not create a PGP verfication context"
-msgstr "Ühenduse loomine POP serveriga nurjus: %s"
-
-# !PARANDA! - kas on ikka täpne tõlge?
-#: mail/mail-format.c:1518
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "See sõnum on digitaalselt allkirjastatud ja autentne."
-
-# !PARANDA! - kas on ikka täpne tõlge?
-#: mail/mail-format.c:1525
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "See sõnum on digitaalselt allkirjastatud kuid ei ole autentne."
-
-#: mail/mail-format.c:1789
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Viide FTP saidile (%s)"
-
-#: mail/mail-format.c:1800
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: mail/mail-format.c:1803
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Viide kohalikule failile (%s)"
-
-#: mail/mail-format.c:1830
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr ""
-
-#: mail/mail-format.c:1836
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#: mail/mail-format.c:1838
-msgid "Malformed external-body part."
-msgstr ""
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:711
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:792
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr "Ei saa salvestada kausta metainfot faili %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:848
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ei saa salvestada kausta metainfot faili %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:900
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kausta %s metaandmete kustutamine nurjus: %s"
 
-#: mail/mail-local.c:1323
+#: mail/mail-local.c:1363
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Muudan kausta \"%s\" vormingusse \"%s\""
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1388
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1448
+#: mail/mail-local.c:1488
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
 
-#: mail/mail-local.c:1512
+#: mail/mail-local.c:1552
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:259
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13589,7 +13315,7 @@ msgstr ""
 "Viga tegevusel '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:262
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13598,118 +13324,131 @@ msgstr ""
 "Operatsiooni käigus tekkis viga:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:913
 msgid "Working"
 msgstr "Töötan"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:87
 msgid "Filtering Folder"
 msgstr "Filtreerin kausta"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
-#: mail/mail-ops.c:550 mail/mail-ops.c:579
-msgid "However, the message was successfully sent."
-msgstr "Sellegipoolest saadeti sõnum edukalt."
+#: mail/mail-ops.c:557
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Ebaõnnestud posti salvestamine ajutisse faili %s: %s"
+
+#: mail/mail-ops.c:578
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: mail/mail-ops.c:587
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Ebaõnnestud posti salvestamine ajutisse faili %s: %s"
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Saadan \"%s\""
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Saadan sõnumit %d (kokku: %d)"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "Salvestan sõnumi kausta"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Tõstan sõnumid %s"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Kontrollin kaustu \"%s\""
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr "Edasi saadetud sõnumid"
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avan kausta %s"
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eemaldan kausta %s"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Säilitan Kausta '%s'"
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr "Värskendan kausta"
 
-#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr "Tühjendan kausta"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1666
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Võtan vastu sõnumit %s"
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Võtan vastu %d teadet"
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvestan %d sõnumit"
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13718,125 +13457,93 @@ msgstr ""
 "Väljundfaili loomine nurjus: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taastan ühenduse: %s"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Pealkirjata sõnum)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Pealkirjata sõnum"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Tühi sõnum"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "Otsi sõnumist"
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr "Tõstutundlik"
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr ""
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr "Leia:"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Vastavusi:"
-
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kataloog: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:259
 #, c-format
 msgid "Type: %s"
 msgstr "Tüüp: %s"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:308
 msgid "Send & Receive Mail"
 msgstr "Sõnumite saatmine ja vastuvõtmine"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Katkesta kõik"
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:390
 msgid "Updating..."
 msgstr "Uuendan..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 msgid "Waiting..."
 msgstr "Ootan..."
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:229
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas töö."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:262
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Palun sisesta %s parool"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:264
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:287
 msgid "_Remember this password"
 msgstr "_Jäta see parool meelde"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:288
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13886,21 +13593,17 @@ msgstr "Edasi saadetud sõnum - %s"
 msgid "Forwarded message"
 msgstr "Edasi saadetud sõnum"
 
-#: mail/mail-tools.c:438
-msgid "Forwarded Message"
-msgstr "Edasi saadetud sõnum"
-
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:209
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:467
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13909,100 +13612,95 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:776
 msgid "VFolders"
 msgstr "VKaustad"
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:834
 msgid "vFolders"
 msgstr "vKaustad"
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:873
 msgid "Edit VFolder"
 msgstr "Muuda VKausta"
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Proovitake redigeerida olematut vkausta '%s'."
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:965
 msgid "New VFolder"
 msgstr "Uus VKaust"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Teema puudub)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - sõnum"
-
-#: mail/message-list.c:741
+#: mail/message-list.c:900
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: mail/message-list.c:742
+#: mail/message-list.c:901
 msgid "Seen"
 msgstr "Nähtud"
 
-#: mail/message-list.c:743
+#: mail/message-list.c:902
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:903
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:904
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:908
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:909
 msgid "Lower"
 msgstr "Madal"
 
-#: mail/message-list.c:754
+#: mail/message-list.c:913
 msgid "Higher"
 msgstr "Kõrge"
 
-#: mail/message-list.c:755
+#: mail/message-list.c:914
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1231
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1238
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1247
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1259
 msgid "%a %l:%M %p"
 msgstr "%a, %l:%M %p"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1267
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %l:%M %p"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1269
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3062
 msgid "Generating message list"
 msgstr "Sõnumite nimekirja koostamine"
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Kuupäev"
+
 #: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
@@ -14021,6 +13719,10 @@ msgstr "Tähistatud"
 msgid "Follow Up Flag"
 msgstr ""
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Kellelt"
+
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
@@ -14034,6 +13736,10 @@ msgstr "Vastu võetud"
 msgid "Size"
 msgstr "Suurus"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Kellele"
+
 #: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
@@ -14053,7 +13759,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr "Allika info"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr "Saada edasi"
 
@@ -14061,11 +13767,11 @@ msgstr "Saada edasi"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
 msgid "Reply"
 msgstr "Vasta"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
@@ -14099,39 +13805,6 @@ msgstr "Tähtaeg "
 msgid "_Flag:"
 msgstr "Faili nimi:"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "Kontrollin %s all olevaid kaustu serveris \"%s\""
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "Kontrollin juurtaseme kaustu servers \"%s\""
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Kausta \"%s\" tellimine"
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Kausta \"%s\" tellimuse lõpetamine"
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Kaust"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "Ühtegi serverit ei ole valitud"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Palun vali server."
-
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -14148,18 +13821,128 @@ msgid "S_erver:"
 msgstr "_Serveri nimi:"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Scanning folders ..."
-msgstr "Salvesta kausta..."
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Telli"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
 msgstr "_Lõpeta tellimus"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %e. %B %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Palun oota..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Kokkuvõtte trükkimine"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Kokkuvõtte trükkimine ebaõnnestus"
+
+#: my-evolution/e-summary-calendar.c:384
+msgid "Appointments"
+msgstr "Sündmused"
+
+#: my-evolution/e-summary-calendar.c:392
+#, fuzzy
+msgid "No appointments."
+msgstr "Sündmused puuduvad"
+
+#: my-evolution/e-summary-calendar.c:409
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d. %B"
+
+#: my-evolution/e-summary-calendar.c:411
+#, fuzzy
+msgid "%l:%M%p %d %B"
+msgstr "%l:%M %d. %B"
+
+#: my-evolution/e-summary-calendar.c:429
+msgid "No description"
+msgstr "Kirjeldus puudub"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Sõnumite kokkuvõte"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Päeva lause"
+
+#: my-evolution/e-summary-preferences.c:565
+#, fuzzy
+msgid "New News Feed"
+msgstr "_Uudistekanalid"
+
+#: my-evolution/e-summary-preferences.c:581
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Viga RDF'i allalaadimisel"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:496
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Vihmavalingud"
+
+#: my-evolution/e-summary-tasks.c:349
+msgid "No tasks"
+msgstr "Ülesanded puuduvad"
+
+#: my-evolution/e-summary-tasks.c:387
+#, fuzzy
+msgid "blue"
+msgstr "Ambler"
+
+#: my-evolution/e-summary-tasks.c:387
+msgid "(No Description)"
+msgstr "(Kirjeldus puudub)"
+
+#: my-evolution/e-summary-weather.c:72
+msgid "My Weather"
+msgstr "Ilmateade"
+
+#: my-evolution/e-summary-weather.c:261
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Ilm"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:582
+msgid "KBOS"
+msgstr "EETN"
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
@@ -23977,116 +23760,6 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zürich"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr "Sündmused"
-
-#: my-evolution/e-summary-calendar.c:389
-#, fuzzy
-msgid "No appointments."
-msgstr "Sündmused puuduvad"
-
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d. %B"
-
-#: my-evolution/e-summary-calendar.c:408
-#, fuzzy
-msgid "%l:%M%P %d %B"
-msgstr "%l:%M %d. %B"
-
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr "Kirjeldus puudub"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Sõnumite kokkuvõte"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Päeva lause"
-
-#: my-evolution/e-summary-preferences.c:565
-#, fuzzy
-msgid "New News Feed"
-msgstr "_Uudistekanalid"
-
-#: my-evolution/e-summary-preferences.c:581
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Viga RDF'i allalaadimisel"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:496
-#, fuzzy
-msgid "All"
-msgstr "McAllen"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "Vihmavalingud"
-
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr "Ülesanded puuduvad"
-
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr "(Kirjeldus puudub)"
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Ilmateade"
-
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Ilm"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr "EETN"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %e. %B %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Palun oota..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Kokkuvõtte trükkimine"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Kokkuvõtte trükkimine ebaõnnestus"
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr "° F"
@@ -25352,24 +25025,27 @@ msgstr "_Ühte päeva"
 msgid "_Show full path for folders"
 msgstr "_Näita kaustadele täielikku otsinguteed"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
+#: notes/component-factory.c:27
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Uus"
 
-# !PARANDA!
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#: notes/component-factory.c:27
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution'i shell"
+msgid "Create a new note"
+msgstr "Loo uue kausta"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
+#: notes/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Bonobo komponentide süsteemi lähtestamine nurjus"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#: notes/main.c:30
 #, fuzzy
-msgid "Folder Settings"
-msgstr "Sõnumite sätted"
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Bonobo laadimine ebaõnnestus.\n"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25457,6 +25133,46 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Evolution'i komponent, mis tegeleb \"%s\" kaustadega,\n"
+"lõpetas ootamatult. Et nendele andmetele uuesti ligi pääseda, pead\n"
+"sa Evolution'i sulgema ja seejärel taaskäivitama."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Vigased argumendid"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Ei leia häälestusandmebaasi"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Üldine viga"
+
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
@@ -25556,27 +25272,32 @@ msgstr ""
 "Kausta ümbernimetamine ebaõnnestus:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:538
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:541
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Kausta nime muutmine"
 
-#: shell/e-shell-folder-commands.c:553
+#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Kirjeldatud kaustanimi ei ole korrektne: %s"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:590
+#: shell/e-shell-folder-commands.c:587
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25616,11 +25337,19 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige informatsioon, mida soovite importida:"
 
-#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
+#: shell/e-shell-importer.c:151
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25629,22 +25358,22 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi %d."
 
-#: shell/e-shell-importer.c:317
+#: shell/e-shell-importer.c:323
 #, fuzzy
 msgid "Select importer"
 msgstr "Vali kaust"
 
-#: shell/e-shell-importer.c:458
+#: shell/e-shell-importer.c:464
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s ei leitud."
 
-#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
-#: shell/e-shell-importer.c:518
+#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
+#: shell/e-shell-importer.c:524
 msgid "Evolution Error"
 msgstr "Evolution'i viga "
 
-#: shell/e-shell-importer.c:475
+#: shell/e-shell-importer.c:481
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25653,11 +25382,11 @@ msgstr ""
 "Puudub importija, mis suudaks hakkama saada failiga\n"
 "%s"
 
-#: shell/e-shell-importer.c:484
+#: shell/e-shell-importer.c:490
 msgid "Importing"
 msgstr "Importimine"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25666,17 +25395,17 @@ msgstr ""
 "Impordin %s.\n"
 "Käivitan %s"
 
-#: shell/e-shell-importer.c:503
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid "Error starting %s"
 msgstr "Viga %s käivitamisel"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:523
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga %s laadimisel"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:540
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25685,32 +25414,36 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi 1."
 
-#: shell/e-shell-importer.c:588
+#: shell/e-shell-importer.c:594
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: shell/e-shell-importer.c:637
-msgid "Filename:"
+#: shell/e-shell-importer.c:643
+#, fuzzy
+msgid "_Filename:"
 msgstr "Faili nimi:"
 
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr "Vali fail"
 
-#: shell/e-shell-importer.c:651
-msgid "File type:"
+#: shell/e-shell-importer.c:658
+#, fuzzy
+msgid "File _type:"
 msgstr "Faili tüüp:"
 
-#: shell/e-shell-importer.c:676
-msgid "Import data and settings from older programs"
+#: shell/e-shell-importer.c:684
+#, fuzzy
+msgid "Import data and settings from _older programs"
 msgstr "Impordi teiste programmide andmeid ja sätted"
 
-#: shell/e-shell-importer.c:680
-msgid "Import a single file"
+#: shell/e-shell-importer.c:687
+#, fuzzy
+msgid "Import a _single file"
 msgstr "Impordi üksikut faili"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
+#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25718,25 +25451,26 @@ msgstr ""
 "Palun oota...\n"
 "Üritan tuvastada olemasolevaid programme"
 
-#: shell/e-shell-importer.c:749
+#: shell/e-shell-importer.c:758
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
+#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
-#: shell/e-shell-importer.c:1047
+#: shell/e-shell-importer.c:1061
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: shell/e-shell-importer.c:1048
+#: shell/e-shell-importer.c:1062
 msgid "Select a destination folder for importing this data"
 msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
 
-#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
-msgid "Import"
+#: shell/e-shell-importer.c:1193
+#, fuzzy
+msgid "_Import"
 msgstr "Impordi"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25803,11 +25537,19 @@ msgstr ""
 "Kirjeldatud kausta loomine nurjus:\n"
 "%s"
 
-#: shell/e-shell-user-creatable-items-handler.c:586
-#: shell/e-shell-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Uus"
+#: shell/e-shell-startup-wizard.c:771
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:782
+#, fuzzy
+msgid "Quit Assistant"
+msgstr "Assistent"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25831,6 +25573,37 @@ msgstr "Kausta nimi ei tohi sisaldada Return sümbolit"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Kausta ei näidata)"
+
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(Puudub)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse "
+"siirdumiseks vajuta seda nuppu."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta "
+"seda nuppu."
+
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse süsteemi paigaldatud olevat."
@@ -25881,76 +25654,13 @@ msgstr "Siirdu aut_onoomsesse olekusse"
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Kausta ei näidata)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Puudub)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse "
-"siirdumiseks vajuta seda nuppu."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta "
-"seda nuppu."
-
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Evolution'i komponent, mis tegeleb \"%s\" kaustadega,\n"
-"lõpetas ootamatult. Et nendele andmetele uuesti ligi pääseda, pead\n"
-"sa Evolution'i sulgema ja seejärel taaskäivitama."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Vigased argumendid"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Ei leia häälestusandmebaasi"
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Viga kiirvalikute salvestamisel."
 
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Üldine viga"
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Kiirvalikud"
 
 #: shell/e-shortcuts-view.c:80
 #, fuzzy
@@ -26072,19 +25782,6 @@ msgstr "_Eemalda"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eemaldab kiirvalikute ribalt selle korralduse"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Viga kiirvalikute salvestamisel."
-
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Kiirvalikud"
-
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Chico"
-
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Vigu ei tekkinud"
@@ -26141,6 +25838,15 @@ msgstr "Sa ei saa luua selle nimega kausta"
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Chico"
+
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Kaust"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -26155,95 +25861,95 @@ msgstr "%s (%d%% valmis)"
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks kliki siia>"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Tundmatu viga."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr "CORBA viga"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1189
 msgid "Interrupted"
 msgstr "Katkestatud"
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1191
 msgid "Invalid argument"
 msgstr "Vigane parameeter"
 
-#: shell/evolution-shell-component.c:1190
+#: shell/evolution-shell-component.c:1193
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1195
 msgid "No owner"
 msgstr "Omanik puudub"
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1197
 msgid "Not found"
 msgstr "Ei leitud"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1199
 msgid "Unsupported type"
 msgstr "Toetamata tüüp"
 
-#: shell/evolution-shell-component.c:1198
+#: shell/evolution-shell-component.c:1201
 msgid "Unsupported schema"
 msgstr "Toetamata skeem"
 
-#: shell/evolution-shell-component.c:1200
+#: shell/evolution-shell-component.c:1203
 msgid "Unsupported operation"
 msgstr "Toetamata tegevus"
 
-#: shell/evolution-shell-component.c:1202
+#: shell/evolution-shell-component.c:1205
 msgid "Internal error"
 msgstr "Sisemine viga"
 
-#: shell/evolution-shell-component.c:1206
+#: shell/evolution-shell-component.c:1209
 msgid "Exists"
 msgstr "Olemas"
 
-#: shell/evolution-shell-component.c:1208
+#: shell/evolution-shell-component.c:1211
 msgid "Invalid URI"
 msgstr "Vigane URI"
 
-#: shell/evolution-shell-component.c:1212
+#: shell/evolution-shell-component.c:1215
 msgid "Has subfolders"
 msgstr "Sisaldab alamkaustu"
 
-#: shell/evolution-shell-component.c:1214
+#: shell/evolution-shell-component.c:1217
 msgid "No space left"
 msgstr "Vaba ruum on otsas"
 
-#: shell/evolution-shell-component.c:1216
+#: shell/evolution-shell-component.c:1219
 msgid "Old owner has died"
 msgstr ""
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Tundmatu viga."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 #: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
@@ -26360,6 +26066,25 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+# !PARANDA!
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution'i shell"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Sõnumite sätted"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Faili importimiseks Evolution'i vajuta \"Impordi\"."
@@ -26395,6 +26120,10 @@ msgstr ""
 msgid "Importers"
 msgstr "Importijad"
 
+#: shell/importer/intelligent.c:191
+msgid "Import"
+msgstr "Impordi"
+
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Ära impordi"
@@ -26572,7 +26301,7 @@ msgstr "Tõstab valitud sõnumi teise kausta"
 msgid "Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "Kleebib lõikepuhvri"
 
@@ -26580,9 +26309,9 @@ msgstr "Kleebib lõikepuhvri"
 msgid "Previews the contacts to be printed"
 msgstr "Trükitavate kontaktide eelvaatlemine"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Trükkimise _eelvaade"
 
@@ -26627,17 +26356,21 @@ msgstr "Peata laadimine"
 msgid "View the current contact"
 msgstr "käesoleva hetkega"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Tegevused"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "Ko_peeri kausta..."
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Saada kontakt edasi..."
 
@@ -26709,47 +26442,62 @@ msgstr "Aktiveerib valitud kuupäeva"
 msgid "Go to today"
 msgstr "Aktiveerib tänase päeva"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "Kuu"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr "Trükitava kalendri eelvaatlemine"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Trükib selle kalendri"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 "Publitseerib selle kalendri vaba- ja hõivatud aja kohta käivat informatsiooni"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#, fuzzy
+msgid "Purg_e"
+msgstr "Bourges"
+
+#: ui/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Purge old appointments and meetings"
+msgstr "Kohtumisi ja sündmusi sisaldav kaust"
+
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Show as list"
+msgstr "Näita detaile"
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr "Näitab ühte päeva"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr "Näitab ühte kuud"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr "Näitab ühte nädalat"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Näitab ühte töönädalat"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr "Nädal"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Sulge"
@@ -26758,7 +26506,7 @@ msgstr "Sulge"
 msgid "Close this item"
 msgstr "Sulgeb elemendi"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Kustutab elemendi"
 
@@ -26771,48 +26519,59 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr "Trükitava elemendi eelvaatlemine"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Trükib elemendi"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Salvesta"
-
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
-msgstr "Salvesta kui..."
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "S_alvesta kui..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Salvesta ja sulge"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save and _Close"
+msgstr "Salvesta ja sulge"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
 msgstr "Salvestab elemendi kettale ja sulgeb dialoogiakna"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr "Salvestab elemendi kettale"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fail"
 
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Salvesta"
+
 #: ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
 msgstr "Kopeerib valitud sõnumi teise kausta"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "_Lõika"
 
@@ -26836,51 +26595,39 @@ msgstr "_Vali kõik"
 msgid "Select all text"
 msgstr "Valib kõik kontaktid"
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr "Trüki _ümbrik"
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "S_alvesta kui..."
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
 msgstr "Salvestab kontakti ja sulgeb dialoogiakna"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
 msgstr "Saada _kontaktile sõnum"
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Salvesta"
-
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
 msgstr "Kustutab nimekirja"
 
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
-msgstr "Kustuta"
-
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
 msgstr "Salvestab nimekirja ja sulgeb dialoogiakna"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."
 msgstr "Saada _loend edasi..."
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
 msgid "Send _message to list..."
 msgstr "_Saada loendile sõnum..."
 
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Kustuta"
+
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "T_ühista kohtumine"
@@ -26956,7 +26703,7 @@ msgstr "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
 
 #: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "Post New Message"
+msgid "Post Ne_w Message"
 msgstr "Uus sõnum"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26993,16 +26740,21 @@ msgstr "_Eelvaate paan"
 msgid "Change the properties of this folder"
 msgstr "Muuda kausta omadusi"
 
-#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopeerib valitud sõnumi teise kausta"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Asetab lõikepuhvris oleva sõnumi"
 
+#: ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "E_xpunge"
+msgstr "_Puhasta"
+
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Peida _valitud sõnumid"
@@ -27021,14 +26773,15 @@ msgid ""
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as R_ead"
+#, fuzzy
+msgid "Mark All as _Read"
 msgstr "Märgi kõik loetuk_s"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Märgib kõik peitmata sõnumid loetuks"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Asetab lõikepuhvris oleva sõnumi"
@@ -27073,26 +26826,37 @@ msgstr "Viib valitud sõnumid ajutiselt peitu"
 msgid "Threaded Message list"
 msgstr "Esitab sõnumeid jutulõngadena"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
-msgid "_Expunge"
-msgstr "_Puhasta"
-
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Kaust"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Omadused..."
 
-#: ui/evolution-mail-list.xml.h:31
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "_Esita sõnumeid jutulõngadena"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Sulgeb akna"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "_Sulge"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Vaade"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -27113,426 +26877,437 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Rakendab filtreerimisreeglid valitud sõnumitele"
 
 #: ui/evolution-mail-message.xml.h:5
+#, fuzzy
+msgid "Caret _Mode"
+msgstr "Teksti _suurus"
+
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Koostab vastuse kõigile valitud sõnumi adressaatidele"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Koostab vastuse valitud sõnumi postiloendisse"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Koostab vastuse valitud sõnumi koostajale"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Kopeerib valitud sõnumi teise kausta"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr "Loo sõnumi baasil _Virtuaalne Kaust"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Loob reegli filtreerimaks selle saatja poolt saadetud sõnumeid"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Loob reegli filtreerimaks nendele adressaatidele saadetud sõnumeid"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Loob reegli filtreerimaks sellese postiloendisse saadetud sõnumeid"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr "Loob reegli filtreerimaks selle teemaga sõnumeid"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr "Loob virtuaalse kausta selle sõnumi adressaatide järgi"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr "Loob virtuaalse kausta selle sõnumi postiloendi järgi"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr "Loob virtuaalse kausta selle sõnumi saatja järgi"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr "Loob virtuaalse kausta selle sõnumi teema järgi"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Vähendab teksti suurust"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Kuvab järgmise tähtsa sõnumi"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Kuvab järgmise sõnumi"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Kuvab järgmise lugemata sõnumi"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Kuvab järgmise lugemata jutulõnga"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Kuvab eelmise tähtsa sõnumi"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Kuvab eelmise sõnumi"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Kuvab eelmise lugemata sõnumi"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "F_orward"
 msgstr "Saada edasi"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "Filter _postiloendi järgi"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Filter _saatja järgi"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Filter _adressaatide järgi"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Filter _teema järgi"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Märgib valitud sõnumi kustutamisele kuuluvaks"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Follow _Up..."
 msgstr "T_äisnimi..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message in the body of a new message"
 msgstr "Saadab valitud sõnumi kellelegi edasi (saadetava sõnumi sees)"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message quoted like a reply"
 msgstr "Saadab valitud sõnumi kellelegi edasi (tsitaadina)"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message to someone"
 msgstr "Saadab valitud sõnumi kellelegi edasi"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Saadab valitud sõnumi kellelegi edasi (manusena)"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:45
 msgid "Increase the text size"
 msgstr "Suurendab teksti suurust"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:46
 msgid "Load _Images"
 msgstr "_Lae pildid"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr "_Märgi loetuks"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr "Märgi t_ähtsaks"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as U_nread"
 msgstr "Märgi kui l_ugemata"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as Unimp_ortant"
 msgstr "Märgi vähetä_htsaks"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Märgib valitud sõnumi loetuks"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Märgib valitud sõnumi tähtsaks"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Märgib valitud sõnumi lugemata sõnumiks"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Märgib valitud sõnumi vähetähtsaks"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Märgib valitud sõnumi kustutamisele kuuluvaks"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:56
 msgid "Move"
 msgstr "Tõsta"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Tõstab valitud sõnumi teise kausta"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Järgmine"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Järgmisele tähtsale sõnumile"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Järgmisele jutulõngale"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Järgmisele lugemata sõnumile"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:62
 msgid "Open the selected message in a new window"
 msgstr "Avab valitud sõnumi uues aknas"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:63
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Valitud sõnumi uuesti saatmiseks ava see sõnumiredaktoris"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:64
 msgid "Original Si_ze"
 msgstr "_Algne suurus"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Eelmisele lugemata sõnumile"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
-msgid "Post a Reply"
+msgid "Post a Repl_y"
 msgstr "Ülesande vastus"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Eelmisele tähtsale sõnumile"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:70
 msgid "Preview the message to be printed"
 msgstr "Trükitava sõnumi eelvaatlemine"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:71
 msgid "Previous"
 msgstr "Eelmine"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:74
 msgid "Print this message"
 msgstr "Trükib valitud sõnumi"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Re_direct"
 msgstr "Woensdrecht"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Saadab valitud sõnumi kellelegi edasi"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "Vasta kõigile"
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr "Vasta postiloendisse"
+
+#: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr "Taastab teksti algse suuruse"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch Message..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "S_earch in Message..."
 msgstr "_Otsi sõnumist..."
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "S_maller"
 msgstr "_Väiksem"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
 msgid "Save the message as a text file"
 msgstr "Salvestab sõnumi tekstifaili"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:85
 msgid "Search for text in the body of the displayed message"
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Lehekülje sätted aktiivse printeri jaoks"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show Email _Source"
 msgstr "_Näita e-post lähtekoodi"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show Full _Headers"
 msgstr "Näita kõiki _päiseid"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Otsib teksti kuvatud sõnumi sisust"
+
+#: ui/evolution-mail-message.xml.h:90
 msgid "Show message in the normal style"
 msgstr "Näita sõnumit normaalse stiiliga"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Show message with all email headers"
 msgstr "Näita sõnumit koos kõigi päistega"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Näita sõnumit töötlemata kujul"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Text Si_ze"
 msgstr "Teksti _suurus"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr "Taasta valitud sõnumid"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "VFolder on Mailing _List..."
 msgstr "VKaust _postiloendi järgi..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "VFolder on Se_nder..."
 msgstr "VKaust _saatja järgi..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "VFolder on _Recipients..."
 msgstr "VKaust _adressaatide järgi..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "VFolder on _Subject..."
 msgstr "VKaust _teema järgi..."
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Attached"
 msgstr "Manusta"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Copy to Folder"
 msgstr "_Kopeeri teise kausta"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Create Filter From Message"
 msgstr "_Loo sõnumi baasil filter"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Forward Message"
 msgstr "Saada sõnum _edasi"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Go To"
 msgstr "Mine"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Inline"
 msgstr "Sõnumi sees"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Larger"
 msgstr "_Suurem"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Message Display"
 msgstr "Sõnumi _kuvamine"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Move to Folder"
 msgstr "_Tõsta teise kausta"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Next Message"
 msgstr "Järgmisele sõnumile"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Normal Display"
 msgstr "_Harilik kuva"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Open Message"
 msgstr "_Ava sõnum"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Eelmisele sõnumile"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Quoted"
 msgstr "Tsitaadina"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr "_Vasta saatjale"
+
+#: ui/evolution-mail-message.xml.h:119
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Muuda nime..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "T_ööriistad"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Undelete"
 msgstr "_Taasta"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Sulgeb akna"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "_Sulge"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Vaade"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Manusta"
@@ -27541,7 +27316,7 @@ msgstr "Manusta"
 msgid "Attach a file"
 msgstr "Lisab sõnumile faili"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Sulge fail"
 
@@ -27557,7 +27332,7 @@ msgstr "Krüpteeri sõnum PGPga"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krüptib kirja sinu S/MIME krüptimissertifikaadi abil"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "Vor_mindamine"
 
@@ -27590,6 +27365,11 @@ msgstr "S/MIME krüptimine"
 msgid "S/MIME Sign"
 msgstr "S/MIME allkiri"
 
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Salvesta"
+
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Salvesta kui"
@@ -27603,7 +27383,7 @@ msgid "Save in folder..."
 msgstr "Salvesta kausta..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Salvesta käesolev fail"
 
@@ -27620,7 +27400,7 @@ msgid "Send"
 msgstr "Saada"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Saada sõnum HTML formaadis"
 
@@ -27686,7 +27466,7 @@ msgid "_From Field"
 msgstr "_Kellele väli"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Lisa"
 
@@ -27702,11 +27482,11 @@ msgstr "_Vasta-kellele väli"
 msgid "_Security"
 msgstr "_Turvalisus"
 
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:10
 #, fuzzy
 msgid "Save the current file and close the window"
 msgstr "Salvestab elemendi kettale ja sulgeb dialoogiakna"
@@ -27785,16 +27565,21 @@ msgstr "Kustutab valitud ülesanded"
 msgid "Mar_k as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Mark selected tasks as complete"
+msgstr "_Märgi ülesanded lõpetatuks"
+
+#: ui/evolution-tasks.xml.h:11
 msgid "Paste task from the clipboard"
 msgstr "Asetab lõikepuhvrist ülesande"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Trükitavate kontaktide eelvaatlemine"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "Print the list of tasks"
 msgstr "Trükib valitud sõnumi"
@@ -28064,27 +27849,31 @@ msgstr "Töönädala vaade"
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
-msgid "As Sent Folder"
+msgid "As _Sent Folder"
 msgstr "Vali kaust"
 
 #: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr ""
+#, fuzzy
+msgid "By S_tatus"
+msgstr "Oleku järgi"
 
 #: views/mail/galview.xml.h:3
-msgid "By Sender"
+#, fuzzy
+msgid "By Se_nder"
 msgstr "Saatja järgi"
 
 #: views/mail/galview.xml.h:4
-msgid "By Status"
-msgstr "Oleku järgi"
+#, fuzzy
+msgid "By Su_bject"
+msgstr "Teema järgi"
 
 #: views/mail/galview.xml.h:5
-msgid "By Subject"
-msgstr "Teema järgi"
+msgid "By _Follow Up Flag"
+msgstr ""
 
 #: views/mail/galview.xml.h:6
-msgid "Messages"
+#, fuzzy
+msgid "_Messages"
 msgstr "Sõnumid"
 
 #: views/tasks/galview.xml.h:1
@@ -28147,20 +27936,20 @@ msgstr "Kirjelda vaateid"
 
 #. 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:427
+#: widgets/misc/e-calendar-item.c:456
 msgid "MTWTFSS"
 msgstr "ETKNRLP"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
+#: widgets/misc/e-calendar-item.c:1174
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
 msgid "Now"
 msgstr "Praegu"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
 msgid "Today"
 msgstr "Täna"
 
@@ -28281,22 +28070,6 @@ msgstr "Lisa salvestatud otsingutesse"
 msgid "_Advanced..."
 msgstr "Edasijõudnutele..."
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr "Info"
-
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr "Viga"
-
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr "Küsimus"
-
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr "Sõnum"
-
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Otsi"
@@ -28349,6 +28122,423 @@ msgstr "Evolution'i kalendri iTip/iMip vaataja"
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolution Addressbook minicard viewer"
 
+#~ msgid "That person is already attending the meeting!"
+#~ msgstr "See isik on juba osavõtja!"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#, fuzzy
+#~ msgid "_Save as..."
+#~ msgstr "Salvesta kui..."
+
+#~ msgid "End Date"
+#~ msgstr "Lõpeb kuupäeval"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Uus _sündmus"
+
+#~ msgid "Print..."
+#~ msgstr "Trüki"
+
+#~ msgid "Chair Persons"
+#~ msgstr "Juhid"
+
+#~ msgid "Required Participants"
+#~ msgstr "Vajalikud osalejad"
+
+#~ msgid "Optional Participants"
+#~ msgstr "Võimalikud osalejad"
+
+#, fuzzy
+#~ msgid "Resources"
+#~ msgstr "Ressurss"
+
+#~ msgid "Individual"
+#~ msgstr "Individuaalne"
+
+#~ msgid "Group"
+#~ msgstr "Grupp"
+
+#~ msgid "Resource"
+#~ msgstr "Ressurss"
+
+#~ msgid "Room"
+#~ msgstr "Ruum"
+
+#~ msgid "Chair"
+#~ msgstr "Juht"
+
+#~ msgid "Required Participant"
+#~ msgstr "Nõutav osaleja"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Võimalik osavõtja"
+
+#~ msgid "Non-Participant"
+#~ msgstr "Mitteosaleja"
+
+#~ msgid "Needs Action"
+#~ msgstr "Vajab tegevust"
+
+#~ msgid "Delegated"
+#~ msgstr "Delegeeritud"
+
+#~ msgid "In Process"
+#~ msgstr "Töös"
+
+#~ msgid "Properties for \"%s\""
+#~ msgstr "\"%s\" omadused"
+
+#~ msgid "Properties"
+#~ msgstr "Omadused"
+
+#~ msgid "Could not create temporary directory: %s"
+#~ msgstr "Ajutise kataloogi loomine nurjus: %s"
+
+#~ msgid "%d new"
+#~ msgstr "uued: %d"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "%d hidden"
+#~ msgstr "peidetud: %d"
+
+#~ msgid "%d selected"
+#~ msgstr "valitud: %d"
+
+#~ msgid "%d unsent"
+#~ msgstr "saatmata: %d"
+
+#~ msgid "%d sent"
+#~ msgstr "saadetud: %d"
+
+#~ msgid "%d total"
+#~ msgstr "kokku: %d"
+
+#, fuzzy
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "Loo sõnumi baasil _Virtuaalne Kaust"
+
+#~ msgid "VFolder on _Subject"
+#~ msgstr "VKaust _teema järgi"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "VKaust _saatja järgi"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "VKaust _adressaatide järgi"
+
+#~ msgid "VFolder on Mailing _List"
+#~ msgstr "VKaust _postiloendi järgi"
+
+#~ msgid "Filter on Sub_ject"
+#~ msgstr "Filter t_eema järgi"
+
+#~ msgid "Filter on Sen_der"
+#~ msgstr "Filter saat_ja järgi"
+
+#~ msgid "Filter on Re_cipients"
+#~ msgstr "Filter a_dressaatide järgi"
+
+#~ msgid "Filter on _Mailing List"
+#~ msgstr "Filter  p_ostiloendi järgi"
+
+#~ msgid "_Edit as New Message..."
+#~ msgstr "_Redigeeri kui uut sõnumit..."
+
+#~ msgid "_Print"
+#~ msgstr "_Trüki"
+
+#~ msgid "_Forward"
+#~ msgstr "_Saada edasi"
+
+#, fuzzy
+#~ msgid "Fla_g Completed"
+#~ msgstr "Lõpetatud"
+
+#, fuzzy
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Puhasta"
+
+#, fuzzy
+#~ msgid "Mark as _Unread"
+#~ msgstr "Märgi kui l_ugemata"
+
+#~ msgid "Mark as _Important"
+#~ msgstr "Märgi tä_htsaks"
+
+#, fuzzy
+#~ msgid "_Mark as Unimportant"
+#~ msgstr "Märgi vähet_ähtsaks"
+
+#, fuzzy
+#~ msgid "U_ndelete"
+#~ msgstr "_Taasta"
+
+#, fuzzy
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "_Tõsta kausta..."
+
+#, fuzzy
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Lisa saatja aadressiraamatusse"
+
+#, fuzzy
+#~ msgid "Appl_y Filters"
+#~ msgstr "Rakenda filtrid"
+
+#, fuzzy
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Loo sõnumi baasil _reegel"
+
+#, fuzzy
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "VKaust _postiloendi järgi"
+
+#, fuzzy
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Filter  p_ostiloendi järgi"
+
+#, fuzzy
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "VKaust _postiloendi järgi"
+
+#~ msgid "Don't show this message again."
+#~ msgstr "Seda teadet enam mitte näidata."
+
+#~ msgid "Send anyway?"
+#~ msgstr "Saata sellegipoolest?"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Sellel sõnumil on teema väli tühi.\n"
+#~ "Kas saadame ilma teemata?"
+
+#~ msgid "an unknown sender"
+#~ msgstr "tundmatu saatja"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+#~ msgstr "%%s kirjutas %a, %d.%m.%Y kell %H:%M:"
+
+#~ msgid "Move message(s) to"
+#~ msgstr "Tõsta sõnum(id) kausta..."
+
+#~ msgid "Copy message(s) to"
+#~ msgstr "Kopeeri sõnum(id) kausta..."
+
+#~ msgid "No Message Selected"
+#~ msgstr "Ühtegi sõnumit ei ole valitud"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Ei saa kätte sõnumit: %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "%s on juba olemas\n"
+#~ "Kas soovid üle kirjutada?"
+
+#~ msgid "Save Message As..."
+#~ msgstr "Sõnumi salvestamine teise nimega..."
+
+#~ msgid "Save Messages As..."
+#~ msgstr "Sõnumite salvestamine teise nimega..."
+
+#, fuzzy
+#~ msgid ""
+#~ "This operation will permanently erase all messages marked as\n"
+#~ "deleted. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid "
+#~ "enam võimalik taastada.\n"
+#~ "\n"
+#~ "Kas tõesti eemaldame kustutatud sõnumid?"
+
+#~ msgid ""
+#~ "Error loading filter information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Viga filtriinfo laadimisel:\n"
+#~ "%s"
+
+#~ msgid "Filters"
+#~ msgstr "Filtrid"
+
+#, fuzzy
+#~ msgid "Page %d of %d"
+#~ msgstr "Tõmban %d. sõnumit %dst"
+
+#~ msgid "Print Message"
+#~ msgstr "Sõnumi trükkimine"
+
+#~ msgid "Printing of message failed"
+#~ msgstr "Sõnumi trükkimine nurjus"
+
+#, fuzzy
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Antud nimega fail eksisteerib.\n"
+#~ "Kirjutada üle?"
+
+#~ msgid "Save Attachment"
+#~ msgstr "Salvesta kaasatud fail"
+
+#, fuzzy
+#~ msgid "Could not create temporary file '%s': %s"
+#~ msgstr "Ajutise kataloogi loomine nurjus: %s"
+
+#, fuzzy
+#~ msgid "Save Attachment..."
+#~ msgstr "Salvesta kaasatud fail"
+
+#~ msgid "View Inline"
+#~ msgstr "Kuva sõnumi sees"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Ava programmiga %s..."
+
+#~ msgid "View Inline (via %s)"
+#~ msgstr "Kuva sõnumi sees (%s abil)"
+
+#~ msgid "Hide"
+#~ msgstr "Ära kuva"
+
+#, fuzzy
+#~ msgid "Downloading images"
+#~ msgstr "_Lae pildid"
+
+#, fuzzy
+#~ msgid "Overdue:"
+#~ msgstr "_Hilinenud ülesanded:"
+
+#, fuzzy
+#~ msgid "by %B %d, %Y, %l:%M %P"
+#~ msgstr "%d. %b %l:%M %p"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "Kopeeri viida asukoht"
+
+#~ msgid "Save Image as..."
+#~ msgstr "Salvesta pilt kui..."
+
+#~ msgid "%s attachment"
+#~ msgstr "\"%s\" tüüpi manus"
+
+#~ msgid "Cc"
+#~ msgstr "Koopia"
+
+#~ msgid "Bcc"
+#~ msgstr "Pimekoopia"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "See sõnum on digitaalselt allkirjastatud. Lisainfo jaoks kliki "
+#~ "lukuikoonil."
+
+#, fuzzy
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "Ühenduse loomine POP serveriga nurjus: %s"
+
+# !PARANDA! - kas on ikka täpne tõlge?
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr "See sõnum on digitaalselt allkirjastatud ja autentne."
+
+# !PARANDA! - kas on ikka täpne tõlge?
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr "See sõnum on digitaalselt allkirjastatud kuid ei ole autentne."
+
+#~ msgid "Pointer to FTP site (%s)"
+#~ msgstr "Viide FTP saidile (%s)"
+
+#~ msgid "Pointer to local file (%s)"
+#~ msgstr "Viide kohalikule failile (%s)"
+
+#~ msgid "However, the message was successfully sent."
+#~ msgstr "Sellegipoolest saadeti sõnum edukalt."
+
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Pealkirjata sõnum)"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Pealkirjata sõnum"
+
+#~ msgid "Empty Message"
+#~ msgstr "Tühi sõnum"
+
+#~ msgid "Find in Message"
+#~ msgstr "Otsi sõnumist"
+
+#~ msgid "Case Sensitive"
+#~ msgstr "Tõstutundlik"
+
+#~ msgid "Find:"
+#~ msgstr "Leia:"
+
+#~ msgid "Matches:"
+#~ msgstr "Vastavusi:"
+
+#~ msgid "Forwarded Message"
+#~ msgstr "Edasi saadetud sõnum"
+
+#~ msgid "(No subject)"
+#~ msgstr "(Teema puudub)"
+
+#~ msgid "%s - Message"
+#~ msgstr "%s - sõnum"
+
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "Kontrollin %s all olevaid kaustu serveris \"%s\""
+
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "Kontrollin juurtaseme kaustu servers \"%s\""
+
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "Kausta \"%s\" tellimine"
+
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "Kausta \"%s\" tellimuse lõpetamine"
+
+#~ msgid "No server has been selected"
+#~ msgstr "Ühtegi serverit ei ole valitud"
+
+#~ msgid "Please select a server."
+#~ msgstr "Palun vali server."
+
+#, fuzzy
+#~ msgid "Scanning folders ..."
+#~ msgstr "Salvesta kausta..."
+
+#~ msgid "Save As..."
+#~ msgstr "Salvesta kui..."
+
+#~ msgid "Information"
+#~ msgstr "Info"
+
+#~ msgid "Question"
+#~ msgstr "Küsimus"
+
+#~ msgid "Message"
+#~ msgstr "Sõnum"
+
 #~ msgid "Search"
 #~ msgstr "Otsi"
 
@@ -28708,10 +28898,6 @@ msgstr "Evolution Addressbook minicard viewer"
 #~ msgid "Warning: Unsent Messages"
 #~ msgstr "Hoiatus: salvestamata sõnum"
 
-#, fuzzy
-#~ msgid "Cannot initialize the Evolution mail component."
-#~ msgstr "Bonobo komponentide süsteemi lähtestamine nurjus"
-
 #~ msgid "Imports Outlook Express 4 files into Evolution"
 #~ msgstr "Impordib Outlook Express 4 faile Evolution'i"
 
@@ -28758,9 +28944,6 @@ msgstr "Evolution Addressbook minicard viewer"
 #~ msgid "Marquette"
 #~ msgstr "Marquette"
 
-#~ msgid "Executive summary component could not initialize Bonobo.\n"
-#~ msgstr "Bonobo laadimine ebaõnnestus.\n"
-
 #, fuzzy
 #~ msgid "Configuration control for Evolution folder settings."
 #~ msgstr "Evolution'i kalendrihaldamise komponent."
@@ -28819,10 +29002,6 @@ msgstr "Evolution Addressbook minicard viewer"
 #~ msgstr "init_bonobo(): Bonobo lähtestamine nurjus"
 
 #, fuzzy
-#~ msgid "_Configure..."
-#~ msgstr "Häälestus"
-
-#, fuzzy
 #~ msgid "_Configure Pilot..."
 #~ msgstr "Häälestus"
 
@@ -29538,24 +29717,9 @@ msgstr "Evolution Addressbook minicard viewer"
 #~ "State: %s\n"
 #~ "Riik: %s"
 
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "Palun sisesta %s@%s NNTP parool"
-
-#~ msgid "Server rejected username"
-#~ msgstr "Server keeldus kasutajanime vastu võtmast"
-
-#~ msgid "Failed to send username to server"
-#~ msgstr "Kasutajanime saatmine serverile ebaõnnestus"
-
-#~ msgid "Server rejected username/password"
-#~ msgstr "Server keeldus kasutajanime/parooli vastu võtmast"
-
 #~ msgid "Message %s not found."
 #~ msgstr "Ei leia sõnumit %s"
 
-#~ msgid "Could not get group list from server."
-#~ msgstr "Ei saanud gruppide nimekirja serverist kätte."
-
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Uudisteserveri kausta avamine nurjus: %s"
 
@@ -29568,9 +29732,6 @@ msgstr "Evolution Addressbook minicard viewer"
 #~ msgid "Could not fetch message: %s"
 #~ msgstr "Sõnumi võtmine nurjus: %s"
 
-#~ msgid "Could not connect to server: %s"
-#~ msgstr "Ühenduse loomine serveriga nurjus: %s"
-
 #~ msgid "(Unknown)"
 #~ msgstr "(Tundmatu)"
 
diff --git a/po/eu.po b/po/eu.po
index ae8c4d7e2c..849cb48a0e 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1.0\n"
-"POT-Creation-Date: 2003-06-25 13:24-0400\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2001-05-25 13:35+0200\n"
 "Last-Translator: Josu Waliño <josu@elhuyar.com>\n"
 "Language-Team: Euskara\n"
@@ -13,67 +13,207 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Evolution-en Inportatzeko laguntzailea"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Evolution-en mezu-prestatzailea."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
-msgid "Evolution VCard importer"
-msgstr "Evolution-en mezu-prestatzailea."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Jaso honela"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Izen osoa"
+
 #: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Izena"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "Helbi_dea:"
+
+#: addressbook/backend/ebook/e-card.c:1333
+#, fuzzy
+msgid "Address Label"
+msgstr "Helbide-txartelak"
+
+#: addressbook/backend/ebook/e-card.c:1340
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
 #: addressbook/backend/ebook/e-card.c:1347
+#: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Helb. el."
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr "Nagusia"
+#: addressbook/backend/ebook/e-card.c:1354
+#, fuzzy
+msgid "Birth date"
+msgstr "Jaioteguna"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "Nag"
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URLa"
+
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Erakundea"
+
+#: addressbook/backend/ebook/e-card.c:1374
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Erakundea"
 
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Bulegoa"
+
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Kargua"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Funtzioa"
+
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Zuzendaria"
+
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Laguntzailea"
 
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Goitizena"
+
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Ezkontidea"
+
+#: addressbook/backend/ebook/e-card.c:1430
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniversary"
+msgstr "Urteurrena"
+
+#: addressbook/backend/ebook/e-card.c:1436
+#, fuzzy
+msgid "Mailer"
+msgstr "Posta"
+
+#: addressbook/backend/ebook/e-card.c:1443
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr "Egutegi-URIa"
+
+#: addressbook/backend/ebook/e-card.c:1450
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "_Libre/okupatuta URLa:"
+
+#: addressbook/backend/ebook/e-card.c:1457
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Egutegia"
+
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Oharra"
+
+#: addressbook/backend/ebook/e-card.c:1471
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Kontaktua ezabatu?"
+
+#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategoriak"
+
+#: addressbook/backend/ebook/e-card.c:1485
+#, fuzzy
+msgid "Category List"
+msgstr "Kategoria da"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "List"
+msgstr "Lista"
+
+#: addressbook/backend/ebook/e-card.c:1513
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Beste helbide bat"
+
+#: addressbook/backend/ebook/e-card.c:1520
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Amritsar"
+
+#: addressbook/backend/ebook/e-card.c:1527
+#, fuzzy
+msgid "ID"
+msgstr "jn."
+
+#: addressbook/backend/ebook/e-card.c:1534
+#, fuzzy
+msgid "Last Use"
+msgstr "Itsatsi"
+
+#: addressbook/backend/ebook/e-card.c:1545
+#, fuzzy
+msgid "Use Score"
+msgstr "Puntuazioa"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
+msgstr "Nagusia"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr "Nag"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -108,12 +248,6 @@ msgid "Home"
 msgstr "Etxekoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Erakundea"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Erak"
 
@@ -232,21 +366,9 @@ msgid "Dep"
 msgstr "Sai"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Bulegoa"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Bul"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Kargua"
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -257,12 +379,6 @@ msgid "Prof"
 msgstr "Lanb"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Zuzendaria"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Zuz"
 
@@ -271,32 +387,9 @@ msgid "Ass"
 msgstr "Lag"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Goitizena"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Goit"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Ezkontidea"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Oharra"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr "Egutegi-URIa"
-
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "EguURI"
@@ -320,11 +413,6 @@ msgid "icsCalendar"
 msgstr "Egutegia"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr "Urteurrena"
-
-#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Urteu"
 
@@ -332,12 +420,6 @@ msgstr "Urteu"
 msgid "Birth Date"
 msgstr "Jaioteguna"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategoriak"
-
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Deitura"
@@ -353,122 +435,33 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-destination.c:709
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Kontaktu-zerrenda izengabea"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Izen osoa"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
-msgid "Address"
-msgstr "Helbi_dea:"
-
-#: addressbook/backend/ebook/e-card.c:1333
-#, fuzzy
-msgid "Address Label"
-msgstr "Helbide-txartelak"
-
-#: addressbook/backend/ebook/e-card.c:1340
-#, fuzzy
-msgid "Phone"
-msgstr "Ponce"
-
-#: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
-msgid "Birth date"
-msgstr "Jaioteguna"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URLa"
-
-#: addressbook/backend/ebook/e-card.c:1374
-#, fuzzy
-msgid "Organizational Unit"
-msgstr "Erakundea"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Funtzioa"
-
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr "Posta"
-
-#: addressbook/backend/ebook/e-card.c:1450
-#, fuzzy
-msgid "Free/Busy URL"
-msgstr "_Libre/okupatuta URLa:"
-
-#: addressbook/backend/ebook/e-card.c:1457
-#, fuzzy
-msgid "ICS Calendar"
-msgstr "Egutegia"
-
-#: addressbook/backend/ebook/e-card.c:1471
-#, fuzzy
-msgid "Related Contacts"
-msgstr "Kontaktua ezabatu?"
-
-#: addressbook/backend/ebook/e-card.c:1485
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Category List"
-msgstr "Kategoria da"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
+msgid "Evolution LDIF importer"
+msgstr "Evolution-en Inportatzeko laguntzailea"
 
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1506
-#, fuzzy
-msgid "List"
-msgstr "Lista"
-
-#: addressbook/backend/ebook/e-card.c:1513
-#, fuzzy
-msgid "List Show Addresses"
-msgstr "Beste helbide bat"
-
-#: addressbook/backend/ebook/e-card.c:1520
-#, fuzzy
-msgid "Arbitrary"
-msgstr "Amritsar"
-
-#: addressbook/backend/ebook/e-card.c:1527
-#, fuzzy
-msgid "ID"
-msgstr "jn."
-
-#: addressbook/backend/ebook/e-card.c:1534
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Last Use"
-msgstr "Itsatsi"
+msgid "Evolution VCard Importer"
+msgstr "Evolution-en mezu-prestatzailea."
 
-#: addressbook/backend/ebook/e-card.c:1545
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 #, fuzzy
-msgid "Use Score"
-msgstr "Puntuazioa"
+msgid "Evolution VCard importer"
+msgstr "Evolution-en mezu-prestatzailea."
 
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:171
-msgid "Could not initialize Bonobo"
-msgstr "Ezin izan da Bonobo hasieratu"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -529,14 +522,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook ez dago kargatuta\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr "Ezin izan da wombat zerbitzaria abiarazi"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr "Ezin izan da wombat abiarazi"
 
@@ -545,159 +538,6 @@ msgstr "Ezin izan da wombat abiarazi"
 msgid "Could not read pilot's Address application block"
 msgstr "Ezin izan da pilot-aren Helbidearen aplikazio-blokea irakurri"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Editatu helbide-liburua"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Helbide-liburuko helbideen pop-up-erako fabrika"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:620
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontaktuak"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Kontaktuen informazioa duen karpeta"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP zerbitzaria"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "Kontaktuen informazioa duen LDAP zerbitzaria"
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public Contacts"
-msgstr "Kontaktuak"
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public folder containing contact information"
-msgstr "Kontaktuen informazioa duen karpeta"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "New Contact"
-msgstr "Kontaktu berria"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "_Contact"
-msgstr "_Kontaktua"
-
-#: addressbook/gui/component/addressbook-component.c:575
-#, fuzzy
-msgid "Create a new contact"
-msgstr "Sortu kontaktu berria"
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
-msgstr "Kontaktuen zerrenda berria"
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "Contact _List"
-msgstr "_Kontaktuen zerrenda"
-
-#: addressbook/gui/component/addressbook-component.c:579
-#, fuzzy
-msgid "Create a new contact list"
-msgstr "Sortu kontaktu-zerrenda berria"
-
-#: addressbook/gui/component/addressbook-config.c:206
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Ezin da LDAP zerbitzariarekin konektatu."
-
-#: addressbook/gui/component/addressbook-config.c:231
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Ezin da IMAP zerbitzarirako autentifikatu.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-#, fuzzy
-msgid "This server does not support LDAPv3 schema information"
-msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-#, fuzzy
-msgid "Error retrieving schema information"
-msgstr ""
-"Errorea iragazki-informazioa kargatzean:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Kontuaren izena"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Zerbitzari-izena"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Beste kontaktu batzuk"
-
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -825,6 +665,116 @@ msgstr "Edozein kategoria"
 msgid "The URI that the Folder Browser will display"
 msgstr "Karpeta-arakatzaileak bistaratuko duen URIa"
 
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:628
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Kontaktuak"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Kontaktuen informazioa duen karpeta"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP zerbitzaria"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "Kontaktuen informazioa duen LDAP zerbitzaria"
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontaktuak"
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Kontaktuen informazioa duen karpeta"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "New Contact"
+msgstr "Kontaktu berria"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "_Contact"
+msgstr "_Kontaktua"
+
+#: addressbook/gui/component/addressbook-component.c:583
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Sortu kontaktu berria"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "New Contact List"
+msgstr "Kontaktuen zerrenda berria"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "Contact _List"
+msgstr "_Kontaktuen zerrenda"
+
+#: addressbook/gui/component/addressbook-component.c:587
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Sortu kontaktu-zerrenda berria"
+
+#: addressbook/gui/component/addressbook-config.c:206
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Ezin da LDAP zerbitzariarekin konektatu."
+
+#: addressbook/gui/component/addressbook-config.c:231
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Ezin da IMAP zerbitzarirako autentifikatu.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Errorea iragazki-informazioa kargatzean:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Kontuaren izena"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Zerbitzari-izena"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Beste kontaktu batzuk"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -853,33 +803,76 @@ msgstr "Sortu kontaktu berria \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Gehitu helbidea lehendik dagoen kontaktuari \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:914
+#: addressbook/gui/component/e-address-popup.c:917
 msgid "Querying Addressbook..."
 msgstr "Helbide-liburuan kontsulta egiten..."
 
-#: addressbook/gui/component/e-address-popup.c:998
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-popup.c:1001
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr "Editatu kontaktu-informazioa"
 
-#: addressbook/gui/component/e-address-popup.c:1028
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Gehitu kontaktuei"
 
-#: addressbook/gui/component/e-address-popup.c:1053
+#: addressbook/gui/component/e-address-popup.c:1056
 msgid "Merge E-Mail Address"
 msgstr "Fusionatu helbide elektronikoa"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Disable Queries"
 msgstr "Desgaitu kontsultak"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr "Gaitu kontsultak (Arriskutsua!)"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editatu helbide-liburua"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Helbide-liburuko helbideen pop-up-erako fabrika"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -1036,10 +1029,9 @@ msgstr "Bat"
 msgid "S_earch scope: "
 msgstr "Bilaketa _barrutia: "
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1256
+#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 msgid "Searching"
 msgstr "Bilaketa"
 
@@ -1239,11 +1231,11 @@ msgstr "_Deskarga-muga"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Edizioa"
 
@@ -1290,21 +1282,25 @@ msgstr "Orokorra"
 msgid "searching-tab"
 msgstr "Bilaketa"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Hautatu kontaktuak helbide-liburutik"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Kendu denak"
+#: addressbook/gui/component/select-names/e-select-names.c:650
+#, fuzzy
+msgid "Find contact in"
+msgstr "bidaltzaileak hau dauka"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Kendu"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Kendu denak"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
@@ -1329,14 +1325,10 @@ msgstr "Kontaktu izengabea"
 msgid "Source"
 msgstr "Iturburua"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Hautatu kontaktuak helbide-liburutik"
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Find contact in"
-msgstr "bidaltzaileak hau dauka"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -1413,7 +1405,7 @@ msgid "D_epartment:"
 msgstr "_Saila:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:197
+#: calendar/gui/dialogs/task-editor.c:200
 msgid "Details"
 msgstr "Xehetasunak"
 
@@ -1484,11 +1476,13 @@ msgid "_Categories..."
 msgstr "Ka_tegoriak..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
-#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "E_zabatu..."
 
@@ -1533,15 +1527,15 @@ msgid "_Web page address:"
 msgstr "_Web orriaren helbidea:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
+#: addressbook/gui/widgets/e-minicard.c:183
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #, fuzzy
 msgid "Editable"
 msgstr "Gaitu"
@@ -2570,18 +2564,18 @@ msgstr "Zimbawe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #, fuzzy
 msgid "Book"
 msgstr "Bodo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
+#: addressbook/gui/widgets/e-minicard-widget.c:93
 #, fuzzy
 msgid "Card"
 msgstr "Autokoa"
@@ -2815,7 +2809,7 @@ msgstr "Zerrenda berria"
 msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 msgid "Save List as VCard"
 msgstr "Gorde zerrenda VCard gisa"
 
@@ -2862,7 +2856,7 @@ msgstr ""
 "badago karpeta honetan. Hala ere gehitu nahi duzu?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
@@ -2881,10 +2875,10 @@ msgid "%d cards"
 msgstr "%d txartel"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #, fuzzy
 msgid "Query"
 msgstr "Quimper"
@@ -2894,118 +2888,118 @@ msgstr "Quimper"
 msgid "Error getting book view"
 msgstr "Errorea %s abiaraztean"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 #, fuzzy
 msgid "Model"
 msgstr "Molde"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Errorea txartela aldatzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr "Behar bezala egin da"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1210
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card not found"
 msgstr "Ez da txartela aurkitu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:785
-#: camel/camel-service.c:875 camel/camel-service.c:917
-#: camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
+#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autentifikazioa behar da"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 msgid "Other error"
 msgstr "Beste errore bat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 #, fuzzy
 msgid "_Discard"
 msgstr "Dinard"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 msgid "Error adding card"
 msgstr "Errorea txartela gehitzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 msgid "Error removing card"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, fuzzy, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -3014,139 +3008,138 @@ msgstr ""
 "%d txartel txartelak izatea eskatu duzu. Hori dela-eta %d leiho berri\n"
 "agertuko dira pantailan. Ziur zaude txartel horiek bistaratu nahi dituzula?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 msgid "Move card to"
 msgstr "Eraman txartela hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 msgid "Copy card to"
 msgstr "Kopiatu txartela hemen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 msgid "Move cards to"
 msgstr "Eraman txartelak hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 msgid "Copy cards to"
 msgstr "Kopiatu txartelak hemen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 msgid "Multiple VCards"
 msgstr "VCard anitz"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, c-format
 msgid "VCard for %s"
 msgstr "%s(r)en VCard-a"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Mota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.c:398
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Helbide-liburua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-#: addressbook/gui/widgets/e-addressbook-view.c:895
-#: addressbook/gui/widgets/e-addressbook-view.c:1879
+#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1883
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gorde VCard gisa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 #, fuzzy
 msgid "New Contact..."
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #, fuzzy
 msgid "Import..."
 msgstr "_Inportatu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Bilatu kontaktuak"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Helbide-liburuaren iturburuak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Birbidali kontaktua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Send Message to Contact"
 msgstr "Bidali mezua kontaktuari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Inprimatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Print Envelope"
 msgstr "Inprimatu gutun-azala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 msgid "Copy to folder..."
 msgstr "Kopiatu karpeta honetan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 msgid "Move to folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:912
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ebaki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: calendar/gui/e-cal-view.c:1109
 #, fuzzy
 msgid "Current View"
 msgstr "_Uneko ikuspegia"
@@ -3155,7 +3148,7 @@ msgstr "_Uneko ikuspegia"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:949
+#: addressbook/gui/widgets/e-addressbook-view.c:953
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3163,11 +3156,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:954
+#: addressbook/gui/widgets/e-addressbook-view.c:958
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1352
+#: addressbook/gui/widgets/e-addressbook-view.c:1356
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3235,36 +3228,46 @@ msgstr "Beste telefono bat"
 msgid "Primary Phone"
 msgstr "Telefono nagusia"
 
-#: addressbook/gui/widgets/e-minicard-control.c:204
-#, c-format
-msgid "and %d other cards."
-msgstr "eta beste %d txartel."
-
-#: addressbook/gui/widgets/e-minicard-control.c:206
-msgid "and one other card."
-msgstr "eta beste txartel bat."
-
-#: addressbook/gui/widgets/e-minicard-control.c:318
-msgid "Save in addressbook"
-msgstr "Gorde helbide-liburuan"
-
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #, fuzzy
 msgid "Width"
 msgstr "Zabalera:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #, fuzzy
 msgid "Height"
 msgstr "Altuera:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Ezabatuta"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Zereginen ordena"
+
+#: addressbook/gui/widgets/e-minicard-control.c:204
+#, c-format
+msgid "and %d other cards."
+msgstr "eta beste %d txartel."
+
+#: addressbook/gui/widgets/e-minicard-control.c:206
+msgid "and one other card."
+msgstr "eta beste txartel bat."
+
+#: addressbook/gui/widgets/e-minicard-control.c:318
+msgid "Save in addressbook"
+msgstr "Gorde helbide-liburuan"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3284,11 +3287,6 @@ msgstr "Testu-tamai_na"
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-#, fuzzy
-msgid "Column Width"
-msgstr "Columbia"
-
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3318,15 +3316,10 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adrar"
 
-#: addressbook/gui/widgets/e-minicard.c:169
-#, fuzzy
-msgid "Selected"
-msgstr "Ezabatuta"
-
-#: addressbook/gui/widgets/e-minicard.c:176
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
 #, fuzzy
-msgid "Has Cursor"
-msgstr "Zereginen ordena"
+msgid "Column Width"
+msgstr "Columbia"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3337,20 +3330,20 @@ msgstr "Txartelen ikuspegia"
 msgid "GTK Tree View"
 msgstr "Astearen ikuspegia"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Inprimatu gutun-azala"
-
-#: addressbook/printing/e-contact-print.c:1139
+#: addressbook/printing/e-contact-print.c:1158
 msgid "Print cards"
 msgstr "Inprimatu txartelak"
 
-#: addressbook/printing/e-contact-print.c:1204
-#: addressbook/printing/e-contact-print.c:1226
+#: addressbook/printing/e-contact-print.c:1224
+#: addressbook/printing/e-contact-print.c:1250
 msgid "Print card"
 msgstr "Inprimatu txartela"
 
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Inprimatu gutun-azala"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3520,6 +3513,63 @@ msgstr "Zabalera:"
 msgid "_Font..."
 msgstr "_Letra-tipoa..."
 
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "karpeta lokal eta urruneko karpeta aktibo guztiekin"
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "Txartelik ez"
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Barne-errorea"
+
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Hitzordu izengabea"
@@ -3649,28 +3699,30 @@ msgid "31st"
 msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:912
 msgid "High"
 msgstr "Handia"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
+#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Normala"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:910
 msgid "Low"
 msgstr "Txikia"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr "Definitu gabe"
 
@@ -3678,13 +3730,13 @@ msgstr "Definitu gabe"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr "Errorea egutegiaren zerbitzariarekin komunikatzean"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ezin izan da pilot-aren Calendar aplikazio-blokea irakurri"
 
@@ -3692,84 +3744,33 @@ msgstr "Ezin izan da pilot-aren Calendar aplikazio-blokea irakurri"
 msgid "Default Priority:"
 msgstr "Lehentasun lehenetsia:"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ezin izan da pilot-aren ToDo aplikazio-blokea irakurri"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Egutegiaren eta zereginen ezarpenak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Egutegiaren eta zereginen ezarpenak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution-en berri-editorea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution-en berri-editorea"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Alarma bidezko jakinarazpen-zerbitzurako fabrika"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Hasi:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Amaitu:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr "baliogabeko ordua"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s alarma"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Itxi"
 
@@ -3785,16 +3786,25 @@ msgstr "Alarma-errepikaren denbora (minututan)"
 msgid "_Edit appointment"
 msgstr "_Editatu hitzordua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr "Abisua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3806,7 +3816,7 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta   \n"
 "dago. Oroigarri normala bistaratuko da."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3823,71 +3833,87 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Alarma bidezko jakinarazpen-zerbitzurako fabrika"
+
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize Bonobo"
+msgstr "Ezin izan da Bonobo hasieratu"
+
+#: calendar/gui/alarm-notify/notify-main.c:176
 msgid "Could not initialize gnome-vfs"
 msgstr "Ezin izan da gnome-vfs hasieratu"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
+#: calendar/gui/alarm-notify/notify-main.c:185
 msgid "Could not create the alarm notify service factory"
 msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Laburpenak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Azalpenak hau dauka"
+#: calendar/gui/calendar-commands.c:376
+#, fuzzy
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Eragiketa honek betiko borratuko ditu egindakotzat markatutako zereginak. "
+"Jarraitzen baduzu, ezingo dituzu berreskuratu.\n"
+"\n"
+"Benetan borratu nahi dituzu?"
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Iruzkinak hau dauka"
+#: calendar/gui/calendar-commands.c:382
+#, fuzzy
+msgid "Purge events older than"
+msgstr "hau baino txikiagoa da"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
-msgid "Unmatched"
-msgstr "Ez dator bat"
+#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "egun "
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A, %Y %B %d"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
+#: calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%Y %B %d"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:518
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-commands.c:849
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Ezin izan da egutegiaren ikuspegia sortu.  Egiaztatu ORBit eta OAF "
 "konfigurazioa."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3908,11 +3934,11 @@ msgstr "Egu_tegi publikoaren URLa:"
 msgid "Public folder containing appointments and events"
 msgstr "Hitzorduak eta gertaerak dituen karpeta"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Zereginak"
@@ -3983,107 +4009,6 @@ msgstr "_Hitzordua"
 msgid "Create a new all-day appointment"
 msgstr "Sortu hitzordu berria"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr "Pribatua"
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Konfidentziala"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Publikoa"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "I"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "H"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "M"
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1204
-msgid "Busy"
-msgstr "Okupatuta"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr "Ez da hasi"
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr "Egiten ari da"
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr "Eginda"
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Kokaleku geografikoa formatu honetan idatzi behar da: \n"
-"\n"
-"45.436845,125.862501"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
-#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
-msgstr "Bat ere ez"
-
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr "Errepikatua"
-
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr "Esleitua"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
-msgstr "Bai"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
-msgstr "Ez"
-
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Egunaren ikuspegia"
@@ -4100,52 +4025,73 @@ msgstr "Astearen ikuspegia"
 msgid "Month View"
 msgstr "Hilabetearen ikuspegia"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "Ikuspegi pertsonalizatua"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Laburpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Azalpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Iruzkinak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
+msgid "Unmatched"
+msgstr "Ez dator bat"
+
+#: calendar/gui/comp-editor-factory.c:462
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Errorea egutegiaren zerbitzariarekin komunikatzean"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Baimena ukatuta"
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:125
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "Egutegiak bistaratuko duen URIa"
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:178
 #, fuzzy
 msgid "The type of view to show"
 msgstr "Aldatu ikuspegia -> %s"
 
-#: calendar/gui/dialogs/alarm-options.c:420
+#: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Audio alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:429
+#: calendar/gui/dialogs/alarm-options.c:475
 msgid "Message Alarm Options"
 msgstr "Mezu-alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:438
+#: calendar/gui/dialogs/alarm-options.c:484
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Posta-alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:447
+#: calendar/gui/dialogs/alarm-options.c:493
 msgid "Program Alarm Options"
 msgstr "Programa-alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:456
+#: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
 msgstr "Alarma ezezagunen aukerak"
 
@@ -4184,10 +4130,6 @@ msgstr "Bidali"
 msgid "With these arguments:"
 msgstr "Argumentu hauekin:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "egun "
-
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr ""
@@ -4200,7 +4142,8 @@ msgstr "bider, maiztasun honekin:"
 msgid "hours"
 msgstr "ordu "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minutu "
 
@@ -4214,11 +4157,11 @@ msgstr "Oinarriak"
 msgid "Date/Time:"
 msgstr "Data/Ordua:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr "Bistaratu mezua"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr "Jo soinua"
 
@@ -4226,7 +4169,7 @@ msgstr "Jo soinua"
 msgid "Reminders"
 msgstr "Oroigarriak"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr "Exekutatu programa"
 
@@ -4237,7 +4180,8 @@ msgstr "Bidali mezua"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Laburpena:"
 
@@ -4321,7 +4265,7 @@ msgstr "egun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr "Ostirala"
 
@@ -4335,7 +4279,7 @@ msgstr "minutu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr "Astelehena"
 
@@ -4346,7 +4290,7 @@ msgstr "_Ig."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr "Larunbata"
 
@@ -4360,7 +4304,7 @@ msgstr "Erakutsi aste-_zenbakiak data-nabigatzailean"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr "Igandea"
 
@@ -4380,7 +4324,7 @@ msgstr "Z_ereginen zerrenda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr "Osteguna"
 
@@ -4398,7 +4342,7 @@ msgstr "Ordu-formatua:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr "Asteartea"
 
@@ -4408,12 +4352,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr "Asteazkena"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Work Week"
 msgstr "Lan-astea"
 
@@ -4528,75 +4472,50 @@ msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Ziur zaude egunkariko sarrera hau bertan behera utzi eta ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Gertaera ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Zeregina ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Egunkariko sarrera ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea itxi?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea itxi?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Gertaera hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Zeregin hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Egunkariko sarrera hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Errore ezezaguna: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
-msgid " to "
-msgstr "- "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
-msgid " (Completed "
-msgstr "(Eginda "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
-msgid "Completed "
-msgstr "Eginda "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
-msgid " (Due "
-msgstr "(Falta: "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
-msgid "Due "
-msgstr "Falta: "
-
 #: calendar/gui/dialogs/comp-editor.c:334
 #, fuzzy
 msgid "Could not update invalid object"
@@ -4644,21 +4563,47 @@ msgid "No summary"
 msgstr "Laburpenik ez"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
-#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/dialogs/comp-editor.c:1406
-#: calendar/gui/dialogs/comp-editor.c:1432
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1459
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Errore ezezaguna: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
+msgid " to "
+msgstr "- "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
+msgid " (Completed "
+msgstr "(Eginda "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
+msgid "Completed "
+msgstr "Eginda "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
+msgid " (Due "
+msgstr "(Falta: "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
+msgid "Due "
+msgstr "Falta: "
+
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4767,31 +4712,31 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Oroigarria"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Errepikapena"
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Antolaketa"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Bilera"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Hasiera-data"
@@ -4829,9 +4774,9 @@ msgid "Classification"
 msgstr "Sailkapena"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Kon_fidentziala"
+#, fuzzy
+msgid "Co_nfidential"
+msgstr "Konfidentziala"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4857,7 +4802,6 @@ msgid "Pu_blic"
 msgstr "_Publikoa"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Erakutsi ordua honela"
 
@@ -4874,75 +4818,34 @@ msgstr "_Amaiera-ordua:"
 msgid "_Start time:"
 msgstr "_Hasiera-ordua:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr "Bat ere ez"
+
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr "Pertsona hori lehendik dago bileran!"
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:630
 msgid "_Delegate To..."
 msgstr "_Delegatu ..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Partaidea"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-#, fuzzy
-msgid "Click here to add an attendee"
-msgstr "* Egin klik hemen kontaktua gehitzeko *"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Izen arrunta"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegatzailea"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegatua"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Hizkuntza"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Kidea"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Egoera"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4953,7 +4856,7 @@ msgid "_Change Organizer"
 msgstr "_Aldatu antolatzailea"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Gonbidatu beste batzuk..."
 
@@ -5112,7 +5015,7 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5139,53 +5042,83 @@ msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Zereginari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Eginda "
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#, fuzzy, no-c-format
+msgid "% _Complete"
 msgstr "% Osatuta"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
-msgstr "Osatze-data:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311
+msgid "Completed"
+msgstr "Eginda"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
+msgid "In Progress"
+msgstr "Egiten ari da"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305
+msgid "Not Started"
+msgstr "Ez da hasi"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Lanean"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
-msgstr "URLa:"
+#, fuzzy
+msgid "_Date Completed:"
+msgstr "Osatze-data:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Lehentasuna:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Egoera:"
 
-#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "_Web orriaren helbidea:"
+
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: calendar/gui/dialogs/task-editor.c:204
-#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.c:480
+#: calendar/gui/dialogs/task-page.c:482
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.c:542
+msgid "Due date is before start date!"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "Kon_fidentziala"
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Azalpena:"
@@ -5198,227 +5131,262 @@ msgstr "Ha_siera-data:"
 msgid "_Due Date:"
 msgstr "_Mugaeguna:"
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr "%d egun"
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr "egun bat"
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr "%d aste"
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr "aste bat"
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr "%d ordu"
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr "ordubete"
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutu"
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr "minutu bat"
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundo"
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr "segundo bat"
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr "Bidali mezua"
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr "Egin beharreko ekintza ezezaguna"
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s hitzordua hasi aurretik"
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s hitzordua hasi ondoren"
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s hitzorduaren hasieran"
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s hitzordua amaitu aurretik"
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s hitzordua amaitu ondoren"
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s hitzorduaren amaieran"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr "%s - %s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
+msgid "Public"
+msgstr "Publikoa"
+
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
+msgid "Private"
+msgstr "Pribatua"
+
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
+msgid "Confidential"
+msgstr "Konfidentziala"
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr "%0"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr "%10"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr "%20"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr "%30"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr "%40"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr "%50"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr "%60"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr "%70"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr "%80"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr "%90"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1933
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:393
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Okupatuta"
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
-#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Ireki"
 
-#: calendar/gui/e-calendar-table.c:959
+#: calendar/gui/e-calendar-table.c:989
 #, fuzzy
-msgid "_Save as..."
-msgstr "Gorde honela..."
+msgid "Open _Web Page"
+msgstr "_Ireki mezua"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Save As..."
+msgstr "_Gorde honela..."
+
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
+#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Inprimatu..."
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
-#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "E_baki"
 
-#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
+#: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "Ko_piatu"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
-#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
+#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1001
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Esleitu zeregina"
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
-#: calendar/gui/e-week-view.c:4335
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Osatuta"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmak"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr "Eginda"
 
@@ -5427,12 +5395,13 @@ msgid "Completion Date"
 msgstr "Egite-data"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr "Mugaeguna"
+#, fuzzy
+msgid "Description"
+msgstr "Azalpena:"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
-msgstr "Amaiera-eguna"
+msgid "Due Date"
+msgstr "Mugaeguna"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
@@ -5442,598 +5411,650 @@ msgstr "Kokaleku geografikoa"
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Hasiera-data"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Egoera"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Laburpena"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Zereginen ordena"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %Y/%m/%d %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr "kolorea"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %Y/%m/%d %I:%M:%S %p"
+#: calendar/gui/e-calendar-table.etspec.h:20
+#, fuzzy
+msgid "component"
+msgstr "Hitzordua"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Data formatu honetan idatzi behar da: \n"
-"\n"
-"%s"
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Ezezaguna"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutu-zatiketa"
+#: calendar/gui/e-cal-model.c:828
+msgid "Recurring"
+msgstr "Errepikatua"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
-msgid "%A %d %B"
-msgstr "%A, %B %d"
+#: calendar/gui/e-cal-model.c:830
+msgid "Assigned"
+msgstr "Esleitua"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%b %d"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "Yes"
+msgstr "Bai"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "No"
+msgstr "Ez"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "I"
 
-#: calendar/gui/e-day-view.c:3694
-msgid "New _Appointment"
-msgstr "Hitz_ordu berria"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "H"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "M"
 
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
+#: calendar/gui/e-cal-model-tasks.c:550
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Kokaleku geografikoa formatu honetan idatzi behar da: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+msgid "New _Appointment..."
+msgstr "Hitz_ordu berria..."
+
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Inprimatu..."
-
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
+#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
-#: ui/evolution-calendar.xml.h:34
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
+#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
 #: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Postaren ezarpenak..."
 
-#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
-#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr "_Gorde honela..."
-
-#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
+#: calendar/gui/e-cal-view.c:1139
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Antolatu _bilera"
 
-#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
+#: calendar/gui/e-cal-view.c:1140
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
+#: calendar/gui/e-cal-view.c:1145
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: calendar/gui/e-itip-control.c:706
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %Y/%m/%d %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %Y/%m/%d %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Data formatu honetan idatzi behar da: \n"
+"\n"
+"%s"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
+msgid "%A %d %B"
+msgstr "%A, %B %d"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%b %d"
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutu-zatiketa"
+
+#: calendar/gui/e-itip-control.c:676
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Errepikapen _soila"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 #, fuzzy
 msgid "Every day"
 msgstr "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d egun"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "Every week"
 msgstr "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d aste"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 #, fuzzy
 msgid "Every week on "
 msgstr "Evergreen"
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d aste"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 #, fuzzy
 msgid " and "
 msgstr "Harea"
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 #, fuzzy
 msgid "every month"
 msgstr "Hi_labete"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 #, fuzzy
 msgid "Every year"
 msgstr "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Amaiera: <b>"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Eginda "
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1005
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr "<i>Bat ere ez</i>"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 #, fuzzy
 msgid "Location:"
 msgstr "K_okalekua:"
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 msgid "Status:"
 msgstr "Egoera:"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Onartua"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Ukatua"
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
-#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 msgid "Update"
 msgstr "Eguneratu"
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ados"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 msgid "Accept"
 msgstr "Onartu"
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 msgid "Decline"
 msgstr "Ukatu"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/e-itip-control.c:1172
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1309
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 msgid "Meeting Update Request"
 msgstr "Bilera-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1381
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 msgid "Task Update Request"
 msgstr "Zeregin-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1402
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>(e)k libre/okupatuta eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Errorea izan da datuak deskargatzean"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
 
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea dagoelako!\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 msgid "Attendee status could not be updated!\n"
 msgstr "Partaidearen egoera ezin izan da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Hautatu karpeta"
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Hautatu karpeta"
@@ -6075,251 +6096,283 @@ msgstr "data-amaiera"
 msgid "date-start"
 msgstr "data-hasiera"
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr "Mahaiburuak"
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
-msgid "Required Participants"
-msgstr "Beharrezko partaideak"
-
-#: calendar/gui/e-meeting-model.c:81
-msgid "Optional Participants"
-msgstr "Aukerako partaideak"
-
-#: calendar/gui/e-meeting-model.c:82
-#, fuzzy
-msgid "Resources"
-msgstr "Baliabidea"
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
-msgid "Individual"
-msgstr "Indibiduala"
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
-msgid "Group"
-msgstr "Taldea"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
-msgid "Resource"
-msgstr "Baliabidea"
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
-msgid "Room"
-msgstr "Gela"
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
-msgid "Chair"
-msgstr "Mahaiburua"
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
-msgid "Required Participant"
-msgstr "Beharrezko partaidea"
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
-msgid "Optional Participant"
-msgstr "Aukerako partaidea"
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
-msgid "Non-Participant"
-msgstr "Ez-partaidea"
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
-msgid "Needs Action"
-msgstr "Ekintza behar du"
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Behin-behinekoa"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
-msgid "Delegated"
-msgstr "Delegatua"
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-msgid "In Process"
-msgstr "Egiten ari da"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
-msgid "%a %m/%d/%Y"
-msgstr "%a, %Y/%m/%d"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Bulegotik kanpo"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Ez dago informaziorik"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "_Options"
 msgstr "Au_kerak"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _Only Working Hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Erakutsi _txikiagotuta"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update Free/Busy"
 msgstr "_Eguneratu Libre/okupatuta"
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "Au_tomatikoki hautatu"
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
+#: calendar/gui/e-meeting-time-sel.c:541
 msgid "_All People and Resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
-#: calendar/gui/e-meeting-time-sel.c:563
+#: calendar/gui/e-meeting-time-sel.c:550
 msgid "All _People and One Resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:572
+#: calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required People"
 msgstr "_Beharrezko pertsonak"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "Required People and _One Resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "Meeting _start time:"
 msgstr "Bilera _hasteko ordua:"
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Meeting _end time:"
 msgstr "Bilera amai_tzeko ordua:"
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
-#: calendar/gui/gnome-cal.c:2017
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2054
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2087
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a, %Y/%m/%d"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Partaidea"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Egin klik hemen kontaktua gehitzeko *"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Izen arrunta"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegatzailea"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegatua"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Hizkuntza"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Kidea"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
+msgstr "baliogabeko ordua"
+
+#: calendar/gui/e-tasks.c:221
+#, fuzzy
+msgid "Start Date:"
+msgstr "Ha_siera-data:"
+
+#: calendar/gui/e-tasks.c:237
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Mugaeguna:"
+
+#. write priority
+#: calendar/gui/e-tasks.c:265
+#, fuzzy
+msgid "Priority:"
+msgstr "_Lehentasuna:"
+
+#. URL
+#: calendar/gui/e-tasks.c:321
+#, fuzzy
+msgid "Web Page:"
+msgstr "Orrialdea"
+
+#: calendar/gui/e-tasks.c:702
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ezin izan dira zereginak kargatu`%s'(e)n"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:746
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s'kargatzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Errorea %s abiaraztean"
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:899
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Egite-data"
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:922
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1017
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/e-week-view.c:3581
-msgid "New _Appointment..."
-msgstr "Hitz_ordu berria..."
-
-#: calendar/gui/gnome-cal.c:1481
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s'irekitzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/gnome-cal.c:1556
+#: calendar/gui/gnome-cal.c:1772
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s alarma"
 
-#: calendar/gui/gnome-cal.c:1748
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1757
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1988
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s - egutegia irekitzen"
 
-#: calendar/gui/gnome-cal.c:2028
+#: calendar/gui/gnome-cal.c:2197
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s karpeta irekitzen"
 
+#: calendar/gui/gnome-cal.c:3094
+#, fuzzy, c-format
+msgid "Purging event %s"
+msgstr "%s eskaneatzen"
+
+#: calendar/gui/gnome-cal.c:3178
+#, fuzzy
+msgid "Purging"
+msgstr "Turin"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Egutegiaren eta zereginen ezarpenak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Egutegiaren eta zereginen ezarpenak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-en berri-editorea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution-en berri-editorea"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "apirila"
@@ -6428,7 +6481,7 @@ msgstr "Libre/okupatuta informazioa (%s - %s)"
 msgid "iCalendar information"
 msgstr "iCalendar informazioa"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaidea izan behar duzu."
 
@@ -6461,82 +6514,81 @@ msgid "Sa"
 msgstr "Lr"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1882
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hautatutako eguna (%a, %Y %b %d)"
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr "%a, %b %d"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr "%a, %Y %d"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1919
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Hautatutako astea (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1927
 msgid "Selected month (%b %Y)"
 msgstr "Hautatutako hilabetea (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1934
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2262
 msgid "Task"
 msgstr "Zeregina"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2321
 #, c-format
 msgid "Status: %s"
 msgstr "Egoera: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2338
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Lehentasuna:"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Osatutako ehunekoa: %i"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2362
 #, c-format
 msgid "URL: %s"
 msgstr "URLa: %s"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriak: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2387
 msgid "Contacts: "
 msgstr "Kontaktuak "
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2559
 msgid "Print Item"
 msgstr "Inprimatu elementua"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2632
 msgid "Print Setup"
 msgstr "Prestatu inprimaketa"
 
@@ -6544,7 +6596,7 @@ msgstr "Prestatu inprimaketa"
 msgid "The URI of the tasks folder to display"
 msgstr "Bistaratu beharreko zeregin-karpetaren URIa"
 
-#: calendar/gui/tasks-control.c:465
+#: calendar/gui/tasks-control.c:448
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6556,11 +6608,11 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/tasks-control.c:468
+#: calendar/gui/tasks-control.c:451
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
-#: calendar/gui/tasks-control.c:610
+#: calendar/gui/tasks-control.c:593
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Inprimatu txartelak"
@@ -8267,28 +8319,28 @@ msgstr "Pazifikoa/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifikoa/Yap"
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:167
 msgid "Signing is not supported by this cipher"
 msgstr "Zifraketa honek ez du sinatzerik onartzen"
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:207
 msgid "Verifying is not supported by this cipher"
 msgstr "Zifraketa honek ez du egiaztatzerik onartzen"
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:251
 msgid "Encryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du enkriptatzerik onartzen"
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:293
 msgid "Decryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:331
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:363
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
@@ -8328,7 +8380,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Zerbitzariarekin birsinkronizatzen"
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "%s karpeta biltegiratzen"
@@ -8349,57 +8405,57 @@ msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 msgid "Syncing folders"
 msgstr "Karpetak sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 msgid "Unable to open spool folder"
 msgstr "Ezin da spool-karpeta ireki"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 msgid "Unable to process spool folder"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) mezua lortzen"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr "Ezin da mezua ireki"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, c-format
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
@@ -8423,7 +8479,36 @@ msgstr "Argumentu baliogabeak"
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
 
-#: camel/camel-folder-search.c:346
+#: camel/camel-folder.c:585
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
+
+#: camel/camel-folder.c:1163
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
+
+#: camel/camel-folder.c:1203
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
+
+#: camel/camel-folder.c:1321
+msgid "Moving messages"
+msgstr "Mezuak eramaten"
+
+#: camel/camel-folder.c:1321
+#, fuzzy
+msgid "Copying messages"
+msgstr "Mezuak %s(e)n kopiatzen"
+
+#: camel/camel-folder.c:1571
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "%d mezu berreskuratzen"
+
+#: camel/camel-folder-search.c:348
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8432,7 +8517,7 @@ msgstr ""
 "Ezin izan da bilaketa-adierazpena analizatu: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:356
+#: camel/camel-folder-search.c:358
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8441,39 +8526,15 @@ msgstr ""
 "Errorea bilaketa-adierazpena exekutatzean: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
 
-#: camel/camel-folder-search.c:653
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Kontsulta egiten goiburuko ezezagunean: %s"
 
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
-
-#: camel/camel-folder.c:1161
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
-
-#: camel/camel-folder.c:1201
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
-
-#: camel/camel-folder.c:1319
-msgid "Moving messages"
-msgstr "Mezuak eramaten"
-
-#: camel/camel-folder.c:1319
-#, fuzzy
-msgid "Copying messages"
-msgstr "Mezuak %s(e)n kopiatzen"
-
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8499,7 +8560,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
 
@@ -8555,26 +8616,6 @@ msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ezin da mezua egiaztatu: ezin izan da aldi baterako fitxategia sortu: %s"
 
-#: camel/camel-lock-client.c:111
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ezin da blokeo-laguntzailearentzat kanalizaziorik eraiki: %s"
-
-#: camel/camel-lock-client.c:124
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ezin da blokeo-laguntzailearen fork-a egin: %s"
-
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Ezin izan da '%s' blokeatu: protokolo-errorea blokeo-laguntzailearekin"
-
-#: camel/camel-lock-client.c:215
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Ezin izan da '%s' blokeatu"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8597,6 +8638,26 @@ msgstr "Huts egin du fcntl(2) erabiliz blokeatzean: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Huts egin du flock(2) erabiliz blokeatzean: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ezin da blokeo-laguntzailearentzat kanalizaziorik eraiki: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ezin da blokeo-laguntzailearen fork-a egin: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Ezin izan da '%s' blokeatu: protokolo-errorea blokeo-laguntzailearekin"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Ezin izan da '%s' blokeatu"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8665,11 +8726,11 @@ msgstr "Huts egin du desenkriptatzean: Ezezaguna"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Huts egin du desenkriptatzean: Ezezaguna"
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 #, fuzzy
 msgid "parse error"
 msgstr "Beste errore bat"
@@ -8743,11 +8804,11 @@ msgstr ""
 "Aukera honek zerbitzariarekin konektatuko zaitu CRAM-MD5 pasahitz segurua "
 "erabiliz, zerbitzariak onartzen badu."
 
-#: camel/camel-sasl-digest-md5.c:46
+#: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:50
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8843,7 +8904,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1207
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -8906,23 +8967,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr "POP SMTPren aurretik"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Aukera honek POP konexioa baimenduko du SMTPrekin saiatu aurretik"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
 msgstr "POP Source URI"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP Before SMTP auth using an unknown transport"
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP Before SMTP auth using a non-pop source"
 
@@ -8931,57 +8992,57 @@ msgstr "POP Before SMTP auth using a non-pop source"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Adierazpen erregularraren konpilazioak huts egin du: %s: %s"
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLak erabiltzaile-izenaren osagaia behar du"
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:285
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLak ostalari-osagaia behar du"
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:293
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLak bide-izenaren osagaia behar du"
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:738
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:783 camel/camel-service.c:915
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Huts egin du izen-bilaketan: %s"
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
 
-#: camel/camel-service.c:818
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
 
-#: camel/camel-service.c:880
+#: camel/camel-service.c:860
 #, fuzzy
 msgid "Resolving address"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:949
+#: camel/camel-service.c:929
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:952
+#: camel/camel-service.c:932
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
@@ -8994,12 +9055,12 @@ msgstr "Karpeta birtualen posta-hornitzailea"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Mezuak beste karpeta-multzo bateko kontsulta gisa irakurtzeko"
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ez dago hornitzailerik `%s' protokolorako"
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9045,142 +9106,142 @@ msgstr "Huts egin du mezua deskodetzean."
 msgid "Failed to verify certificates."
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:212
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Sinadura-fitxategia:"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Errorea %s kargatzean"
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 #, fuzzy
 msgid "Out of memory"
 msgstr "Bulegotik kanpo"
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 #, fuzzy
 msgid "Certificate Revoked"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "Argumentu baliogabea"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9193,15 +9254,15 @@ msgstr ""
 "Hatz-marka:        %s\n"
 "Sinadura:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr "ONA"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr "TXARRA"
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9219,7 +9280,7 @@ msgstr ""
 "Hala ere onartu nahi duzu?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9234,28 +9295,28 @@ msgstr ""
 "\n"
 "Onartu nahi duzu?"
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9267,17 +9328,17 @@ msgstr "_Ziurtagiri-IDa:"
 msgid "Could not parse URL `%s'"
 msgstr "Ezin izan da `%s' URLa analizatu"
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Errorea %s abiaraztean"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s mezurik ez dago %s(e)n"
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
@@ -9306,12 +9367,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2806
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2809
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean: %s"
@@ -9348,38 +9409,38 @@ msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ustekabeko baiezko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ezin izan da %s(r)en laburpena kargatu"
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr "Karpeta deuseztatu egin da eta berriro sortu zerbitzarian."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr "Aldatutako mezuen bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1883
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9388,24 +9449,24 @@ msgstr ""
 "Ezin da mezua hartu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Ez dago horrelako mezurik"
 
-#: camel/providers/imap/camel-imap-folder.c:1943
-#: camel/providers/imap/camel-imap-folder.c:2539
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr "Mezu hau orain ez dago erabilgarri "
 
-#: camel/providers/imap/camel-imap-folder.c:2203
-#: camel/providers/imap/camel-imap-folder.c:2273
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr "Mezu berrien laburpen-informazioa bilatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:2577
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
@@ -9455,92 +9516,108 @@ msgstr "Izena"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplikatu iragazkiak zerbitzari honetako sarrerako ontziko mezu berriei"
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "_Automatikoki begiratu mezu berririk"
+
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP zerbitzarietan posta irakurri eta gordetzeko."
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Pasahitza"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s zerbitzua %s(e)rako %s(e)n"
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/imap/camel-imap-store.c:589
+#: camel/providers/imap/camel-imap-store.c:821
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Konexioa etenda"
 
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:655
+#: camel/providers/imap/camel-imap-store.c:686
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %s"
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/pop3/camel-pop3-store.c:220
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Eragiketa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:687
 #: camel/providers/pop3/camel-pop3-store.c:261
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:824
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
+
+#: camel/providers/imap/camel-imap-store.c:1237
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "%s IMAP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s motako autentifikazioa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en IMAP pasahitza"
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9551,42 +9628,70 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1660
+#: camel/providers/imap/camel-imap-store.c:1802
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2003
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Karpeta-izenak ezin du Itzulera karaktererik eduki."
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2015
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2051
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Mezu-biltegiratzea"
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Ezin izan da POP zerbitzariarekin konektatu %s(e)n."
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "Bidali mezua kontaktuari"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:379
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:383
+#: camel/providers/local/camel-local-folder.c:386
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Ezin da postontzia ireki: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:390
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9644,50 +9749,54 @@ msgid ""
 msgstr ""
 "Posta lokala irakurri eta gordetzeko mbox spool fitxategi estandarretan."
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s gordetze-erroa ez da bide-izen absolutua"
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s gordetze-erroa ez da direktorio erregularra"
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Biltegi lokalek ez dute sarrerako ontzirik"
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s posta-fitxategi lokala"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'laburpen-fitxategia ezabatu: %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'indize-fitxategia ezabatu: %s"
@@ -9701,17 +9810,17 @@ msgstr "Ezin izan da laburpena gorde: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ezin zaio mezua gehitu laburpenari: arrazoi ezezaguna"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
 msgstr "Maildir mezua eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ezin zaio mezua erantsi maildir karpetari: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr "Mezu-eduki baliogabea"
 
@@ -9727,7 +9836,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9792,29 +9901,29 @@ msgstr "Mezu berrien bila eskaneatzen"
 msgid "Storing folder"
 msgstr "Karpeta biltegiratzen"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ezin da karpeta-blokeoa sortu %s(e)n: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:289
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ezin da postontzia ireki: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:349
 msgid "Mail append cancelled"
 msgstr "Posta eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:352
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ezin zaio mezua erantsi mbox fitxategiari: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9823,15 +9932,15 @@ msgstr ""
 "Ezin da mezua hartu: %s %s karpetatik\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Mezu-eraikuntzak huts egin du: Postontzia hondatuta?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9840,7 +9949,16 @@ msgstr ""
 "Ezin izan da `%s' fitxategia ireki:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr ""
+"Ezin izan da %s direktorioa sortu:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9849,14 +9967,15 @@ msgstr ""
 "Ezin izan da `%s' fitxategia sortu:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ez da fitxategi erregularra."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9865,11 +9984,36 @@ msgstr ""
 "Ezin izan da `%s' karpeta ezabatu:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' karpeta ez dago hutsik. Ez da ezabatu."
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Ezin da izen horretako karpetarik sortu"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "Ezin izan da %s direktorioa sortu: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Ezin da karpeta hartu: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:427
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -9901,7 +10045,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Ezin da aldi baterako postontzia ireki: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ezin izan da itxi %s iturburu-karpeta: %s"
@@ -9918,38 +10062,38 @@ msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Sinkronizatu arren, laburpena eta karpeta ez datoz bat"
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errorea aldi baterako postontzian idaztean: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Huts egin du aldi baterako postontzian idaztean: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
 msgstr "MH mezua eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
@@ -10029,6 +10173,61 @@ msgstr ""
 "Ezin izan da %s spool-karpeta sinkronizatu: %s\n"
 "Karpeta hondatuta egon liteke, kopia `%s'(e)n gorde da"
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "Idatzi %s@%s(r)en NNTP pasahitza"
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr "Zerbitzariak erabiltzaile-izena ezetsi du"
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+msgid "Failed to send username to server"
+msgstr "Huts egin du erabiltzaile-izena zerbitzarira bidaltzean"
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr "Zerbitzariak erabiltzaile-izena/pasahitza ezetsi du"
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr "Barne-errorea: uid formatu baliogabean: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Ezin da %s mezua hartu: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Erabiltzaileak bertan behera utzi du"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr "Ezin izan da talde-zerrenda hartu zerbitzaritik."
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr "Ezin da %s(r)en talde-zerrendaren fitxategia kargatu: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr "Ezin da %s(r)en talde-zerrendaren fitxategia gorde: %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET berriak"
@@ -10038,22 +10237,22 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Hau USENET berri-taldeetako mezuak irakurri eta bidaltzeko hornitzailea da."
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET berriak %s bidez"
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -10061,37 +10260,37 @@ msgstr ""
 "Aukera honek NNTP zerbitzariarekin autentifikatuko du testu arrunteko "
 "pasahitzaren bidez."
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, c-format
 msgid "No such folder: %s"
 msgstr "Karpeta ez dago: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Ezin izan da taldea hartu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komandoak huts egin du: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Mezu berrien bila eskaneatzen"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Zerbitzari-erantzun ezezaguna: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 msgid "Use cancel"
 msgstr "Utzi bertan behera"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Eragiketak huts egin du: %s"
@@ -10100,13 +10299,6 @@ msgstr "Eragiketak huts egin du: %s"
 msgid "Retrieving POP summary"
 msgstr "POP laburpena berreskuratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-msgid "User cancelled"
-msgstr "Erabiltzaileak bertan behera utzi du"
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -10116,34 +10308,22 @@ msgstr "Ezin da POP laburpena hartu: %s"
 msgid "Expunging deleted messages"
 msgstr "Ezabatutako mezuak betiko borratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ez dago %s uid-a duen mezurik"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP mezua berreskuratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Ezin da %s mezua hartu: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 msgid "Unknown reason"
 msgstr "Arrazoi ezezaguna"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Mezu-biltegiratzea"
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Utzi mezuak zerbitzarian"
@@ -10310,147 +10490,147 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP erabiliz urruneko mailhub batekin konektatuta posta banatzeko.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaxi-errorea; komandoa ezezaguna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintaxi-errorea parametroetan edo argumentuetan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Komandoa inplementatu gabe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Komando-parametroa inplementatu gabe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Sistema-egoera, edo sistema-laguntzaren erantzuna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Laguntza-mezua"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Zerbitzua prest"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Zerbitzua transmisio-kanala ixten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Zerbitzua ez dago erabilgarri; transmisio kanala ixten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Eskatutako posta-ekintza ondo; eginda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "Erabiltzailea ez da lokala;<forward-path>-era birbidaliko da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Ez da egin eskatutako posta-ekintza: postontzia ez dago erabilgarri"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ez da egin eskatutako ekintza: postontzia ez dago erabilgarri"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Eskatutako ekintza abortatu egin da: errorea prozesatzean"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "Erabiltzailea ez da lokala; proba egin <forward-path>-ekin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Ez da egin eskatutako ekintza: sistema-biltegia ez da nahikoa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "Eskatutako posta-ekintza abortatu egin da: biltegi-esleipena gaindituta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Ez da egin eskatutako ekintza: postontzi-izena ez da onartu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Hasi posta-sarrera; bukatu <CRLF>.<CRLF>-rekin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Transakzioak huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Pasahitz-trantsizioa behar da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Autentifikazio-mekanismoa ahulegia da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Eskatutako autentifikazio-mekanismoak beharrezkoa du enkriptatzea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Aldi baterako autentifikazioak huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autentifikazioa behar da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:298
 #, fuzzy
 msgid "Welcome response error"
 msgstr "QUIT erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:343
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:372
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "%s SMTP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10461,88 +10641,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posta-banaketa %s bidez"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr "Ezin da mezua bidali: bidaltzailearen helbidea ez da baliozkoa."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ezin da mezua bidali: erabiltzaile bat edo gehiago baliogabeak dira"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr "SMTP Agurra"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "Errorea SASL autentifikazio-objektua sortzean."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "AUTH eskaerak huts egin du."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
@@ -10550,68 +10730,67 @@ msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 msgid "DATA response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA bidalketa denboraz kanpo: mezuaren amaiera: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 msgid "DATA termination response error"
 msgstr "DATA amaitze-erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "RSET response error"
 msgstr "RSET erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "QUIT response error"
 msgstr "QUIT erantzunaren errorea"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:103
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "eranskina"
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Kendu hautatutako elementuak eranskin-zerrendatik"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Gehitu eranskina..."
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Erantsi fitxategi bat mezuari"
 
@@ -10644,92 +10823,12 @@ msgstr "MIME mota:"
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Egin klik hemen helbide-liburura joateko"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Erantzun honi:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Nork:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Gaia:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Nori: "
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Idatzi mezuaren hartzaileak"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Idatzi hartzaileen zerrendan agertu gabe mezuaren kopia jasoko dutenen "
-"helbideak."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-#, fuzzy
-msgid "Post To:"
-msgstr "Porto"
-
-#: composer/e-msg-composer-hdrs.c:553
-#, fuzzy
-msgid "Posting destination"
-msgstr "Azalpenik ez"
-
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
-#, fuzzy
-msgid "Attach file(s)"
-msgstr "Erantsi fitxategi bat"
-
-#: composer/e-msg-composer.c:535
+#: composer/e-msg-composer.c:562
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Ezin izan da PGP sinadura-testuingurua sortu."
 
-#: composer/e-msg-composer.c:814
+#: composer/e-msg-composer.c:841
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10738,30 +10837,30 @@ msgstr ""
 "Errorea %s fitxategia irakurtzean:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1177
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr "Fitxategia badago; gainidatzi?"
 
-#: composer/e-msg-composer.c:1195
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errorea fitxategia gordetzean: %s"
 
-#: composer/e-msg-composer.c:1218
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errorea fitxategia kargatzean: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errorea fitxategia atzitzean: %s"
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Ezin da mezua editoretik berreskuratu"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10770,7 +10869,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10779,7 +10878,7 @@ msgstr ""
 "Ezin da fitxategia trunkatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1287
+#: composer/e-msg-composer.c:1325
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10788,7 +10887,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1296
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10797,7 +10896,7 @@ msgstr ""
 "Errorea mezua automatikoki gordetzean: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10805,7 +10904,7 @@ msgstr ""
 "Aurreko saioko fitxategi gorde gabeak aurkitu ditu Ximian Evolution-ek.\n"
 "Berreskuratzen saiatu nahi duzu?"
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1594
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10816,29 +10915,29 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: composer/e-msg-composer.c:1593
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: composer/e-msg-composer.c:2017
+#: composer/e-msg-composer.c:2054
 #, fuzzy
 msgid "Signature:"
 msgstr "Gorde sinadura"
 
-#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Prestatu mezua"
 
-#: composer/e-msg-composer.c:2934
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10846,7 +10945,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da helbidea hautatzeko kontrola aktibatu."
 
-#: composer/e-msg-composer.c:2962
+#: composer/e-msg-composer.c:3030
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10857,7 +10956,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:3029
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10865,12 +10964,94 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:4045
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
+#: composer/e-msg-composer-hdrs.c:290
+#, fuzzy
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+"Identitatea konfiguratu behar duzu\n"
+"mezua idatzi ahal izateko."
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Egin klik hemen helbide-liburura joateko"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Erantzun honi:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Nork:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Gaia:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Nori: "
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Idatzi mezuaren hartzaileak"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Idatzi hartzaileen zerrendan agertu gabe mezuaren kopia jasoko dutenen "
+"helbideak."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-hdrs.c:553
+#, fuzzy
+msgid "Posting destination"
+msgstr "Azalpenik ez"
+
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
+msgstr "Erantsi fitxategi bat"
+
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution-en talde-lanerako tresna"
@@ -11034,7 +11215,7 @@ msgstr ""
 "Izen hori duen fitxategia badago lehendik.\n"
 "Gainidatzi?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "Fitxategia gainidatzi?"
 
@@ -11056,90 +11237,212 @@ msgstr "Sinkronizatu kategoriak:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %Y/%m/%d %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %Y/%m/%d %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %Y/%m/%d %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %Y/%m/%d %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%Y/%m/%d %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%Y/%m/%d %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%I %p"
 
+#: executive-summary/component/component-factory.c:151
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Ezin da hasieratu Evolution-en laneko laburpena egiteko osagaia."
+
+#: executive-summary/component/e-summary.c:925
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Ezin da HTML fitxategia ireki:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:939
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+"Errorea datuak irakurtzean:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr "Fitxategiak ez du lekurik zerbitzuentzat.\n"
+
+#: executive-summary/component/e-summary-callbacks.c:125
+#, fuzzy
+msgid "Select a service"
+msgstr "Hautatu fitxategia"
+
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+"Beste HTML orri bat hauta dezakezu Laneko Laburpenaren atzeko planorako.\n"
+"\n"
+"Utzi hutsik lehenetsirako"
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr "Ireki %s GNOME aplikazio lehenetsiarekin"
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr "Ireki %s GNOME web arakatzaile lehenetsiarekin"
+
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Send an email to %s"
+msgstr "Bidali mezua -> %s"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Change the view to %s"
+msgstr "Aldatu ikuspegia -> %s"
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr "Exekutatu %s"
+
+#: executive-summary/component/e-summary-url.c:75
+#, c-format
+msgid "Close %s"
+msgstr "Itxi %s"
+
+#: executive-summary/component/e-summary-url.c:76
+#, c-format
+msgid "Move %s to the left"
+msgstr "Eraman %s ezkerrera"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr "Eraman %s eskuinera"
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr "Eraman %s aurreko errenkadara"
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr "Eraman %s hurrengo errenkadara"
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Birkonfiguratu /%s"
+
+#
+#: executive-summary/component/e-summary-url.c:553
+msgid "page"
+msgstr "orrialdea"
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+msgid "Error"
+msgstr "Errorea"
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr "Eguneratu automatikoki"
+
+#: executive-summary/test-service/rdf-summary.c:785
+msgid "Update now"
+msgstr "Eguneratu orain"
+
+#: executive-summary/test-service/rdf-summary.c:795
+msgid "Update every "
+msgstr "Eguneratze-maiztasuna"
+
 #: filter/filter-datespec.c:65
 #, fuzzy
 msgid "1 second ago"
@@ -11266,89 +11569,6 @@ msgstr "Zehaztu fitxategi-izena:"
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Errorea '%s' adierazpen erregularrean:\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
-msgid "Important"
-msgstr "Garrantzitsua"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
-#, fuzzy
-msgid "Later"
-msgstr "geroago"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Proba"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Iragazkiari izena eman behar diozu."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Arau-izena: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Izengabea"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Baldin eta"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Exekutatu ekintzak"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "irizpide guztiak betetzen badira"
-
-#: filter/filter-rule.c:800
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "irizpideren bat betetzen bada"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "sarrerakoa"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "irteerakoa"
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Konparazio-ordua:"
@@ -11454,6 +11674,89 @@ msgstr "karpeta lokal guztiekin"
 msgid "years"
 msgstr "urte "
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Errorea '%s' adierazpen erregularrean:\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+msgid "Important"
+msgstr "Garrantzitsua"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1458
+#, fuzzy
+msgid "Later"
+msgstr "geroago"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Proba"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Iragazkiari izena eman behar diozu."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Arau-izena: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Izengabea"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Baldin eta"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Exekutatu ekintzak"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "irizpide guztiak betetzen badira"
+
+#: filter/filter-rule.c:800
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "irizpideren bat betetzen bada"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "sarrerakoa"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "irteerakoa"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11478,226 +11781,226 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "hau dauka"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiatu karpeta honetan"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Jasotze-data"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Bidaltze-data"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ez dauka hau"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ez da honela amaitzen"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ez dago"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "ez dago"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ez da honen antzekoa"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ez da honela hasten"
-
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
 msgstr "Ez"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:13
 msgid "Draft"
 msgstr "Zirriborroa"
 
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "honela amaitzen da"
-
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Exist"
 msgstr "Bai"
 
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "badago"
-
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:15
 msgid "Expression"
 msgstr "Adierazpena"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:16
 msgid "Follow Up"
 msgstr "Jarraitu"
 
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "da"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "honen ondorengoa da"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "honen aurrekoa da"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "Banderaduna da"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "hau baino handiagoa da"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "hau baino txikiagoa da"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ez da"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "ez da Banderaduna"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:19
 msgid "Mailing list"
 msgstr "Posta-zerrenda"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:20
 msgid "Message Body"
 msgstr "Mezuaren gorputza"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:21
 msgid "Message Header"
 msgstr "Mezuaren goiburukoa"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:22
 msgid "Move to Folder"
 msgstr "Eraman karpeta honetara"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Exekutatu shell komandoa"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:24
 #, fuzzy
 msgid "Play Sound"
 msgstr "Jo soinua:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Irakurrita"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:26
 msgid "Recipients"
 msgstr "Hartzailea"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:27
 msgid "Regex Match"
 msgstr "Adierazpen erregularra"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:28
 msgid "Replied to"
 msgstr "Erantzunda"
 
-#: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "hau baino handiagoa da"
-
-#: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "hau baino txikiagoa da"
-
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuazioa"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+#: filter/libfilter-i18n.h:30
 msgid "Sender"
 msgstr "Bidaltzailea"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:31
 msgid "Set Status"
 msgstr "Ezarri egoera"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:32
 #, fuzzy
 msgid "Shell Command"
 msgstr "Exekutatu shell komandoa"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:33
 msgid "Size (kB)"
 msgstr "Tamaina (kB)"
 
-#: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "honen antzekoa da"
-
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:34
 msgid "Source Account"
 msgstr "Iturburu-kontua"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:35
 msgid "Specific header"
 msgstr "Goiburuko espezifikoa"
 
-#: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "honela hasten da"
-
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:37
 msgid "Stop Processing"
 msgstr "Gelditu prozesatzea"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Gaia"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "Unset Status"
 msgstr "Ezarri egoera"
 
-#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: filter/libfilter-i18n.h:40
+msgid "contains"
+msgstr "hau dauka"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not contain"
+msgstr "ez dauka hau"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
+msgstr "ez da honela amaitzen"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not exist"
+msgstr "ez dago"
+
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "does not return"
+msgstr "ez dago"
+
+#: filter/libfilter-i18n.h:45
+msgid "does not sound like"
+msgstr "ez da honen antzekoa"
+
+#: filter/libfilter-i18n.h:46
+msgid "does not start with"
+msgstr "ez da honela hasten"
+
+#: filter/libfilter-i18n.h:47
+msgid "ends with"
+msgstr "honela amaitzen da"
+
+#: filter/libfilter-i18n.h:48
+msgid "exists"
+msgstr "badago"
+
+#: filter/libfilter-i18n.h:49
+msgid "is Flagged"
+msgstr "Banderaduna da"
+
+#: filter/libfilter-i18n.h:50
+msgid "is after"
+msgstr "honen ondorengoa da"
+
+#: filter/libfilter-i18n.h:51
+msgid "is before"
+msgstr "honen aurrekoa da"
+
+#: filter/libfilter-i18n.h:52
+msgid "is greater than"
+msgstr "hau baino handiagoa da"
+
+#: filter/libfilter-i18n.h:53
+msgid "is less than"
+msgstr "hau baino txikiagoa da"
+
+#: filter/libfilter-i18n.h:54
+msgid "is not Flagged"
+msgstr "ez da Banderaduna"
+
+#: filter/libfilter-i18n.h:55
+msgid "is not"
+msgstr "ez da"
+
+#: filter/libfilter-i18n.h:56
+msgid "is"
+msgstr "da"
+
+#: filter/libfilter-i18n.h:57
+#, fuzzy
+msgid "returns greater than"
+msgstr "hau baino handiagoa da"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns less than"
+msgstr "hau baino txikiagoa da"
+
+#: filter/libfilter-i18n.h:59
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
+msgstr "honen antzekoa da"
+
+#: filter/libfilter-i18n.h:61
+msgid "starts with"
+msgstr "honela hasten da"
+
+#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:916
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11767,10 +12070,9 @@ msgid "Scanning %s"
 msgstr "%s eskaneatzen"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Posta"
 
@@ -11837,7 +12139,7 @@ msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Zakarrontzia"
 
@@ -11852,7 +12154,7 @@ msgid "Scanning directory"
 msgstr "Direktorioa eskaneatzen"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:541
+#: shell/e-shell-startup-wizard.c:556
 msgid "Starting import"
 msgstr "Inportatzen hasten"
 
@@ -11889,110 +12191,41 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Egutegi-hobespenak"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Sortu edo editatu posta-kontuak eta bestelako hobespenak"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution "
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution-en mezu-prestatzailea."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution-en mezu-prestatzailea."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "Posta konfiguratzeko interfazea"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Posta-karpetak bistaratzeko Evolution-en osagaia."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution-en postaren laneko laburpenaren osagaia."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
-msgid "Mail Accounts"
-msgstr "Kontuak"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-#, fuzzy
-msgid "Mail Preferences"
-msgstr "Egutegi-hobespenak"
-
-#: mail/component-factory.c:117
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Posta duen karpeta"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Publikoa"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Posta duen karpeta"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Zakarrontzi birtualak"
 
-#: mail/component-factory.c:119
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Zakarrontzi birtualaren karpeta"
 
-#: mail/component-factory.c:147
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Karpeta honek ezin du mezurik eduki."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Properties..."
 msgstr "Propietateak..."
 
-#: mail/component-factory.c:441
+#: mail/component-factory.c:444
 msgid "Change this folder's properties"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: mail/component-factory.c:819
+#: mail/component-factory.c:826
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -12000,251 +12233,123 @@ msgstr ""
 "Posta-ezarpen batzuk hondatuta daudela ematen du, begira ezazu dena ondo "
 "dagoen."
 
-#: mail/component-factory.c:1000
+#: mail/component-factory.c:1008
 msgid "You have not set a mail transport method"
 msgstr "Ez duzu ezarri posta garraiatzeko metodorik"
 
-#: mail/component-factory.c:1023
+#: mail/component-factory.c:1031
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1071
 msgid "_Mail Message"
 msgstr "_Posta-mezua"
 
-#: mail/component-factory.c:1064
+#: mail/component-factory.c:1072
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Prestatu mezua"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 #, fuzzy
 msgid "New Message Post"
 msgstr "Mezu berria"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1080
 #, fuzzy
 msgid "_Post Message"
 msgstr "Aurreko mezua"
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1081
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Posta-mezu berria"
 
-#: mail/component-factory.c:1365
+#: mail/component-factory.c:1373
 #, fuzzy
 msgid "Connecting..."
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: mail/component-factory.c:1376
+#: mail/component-factory.c:1384
 msgid "Cannot register storage with shell"
 msgstr "Ezin da biltegia shell-arekin erregistratu"
 
-#: mail/folder-browser-ui.c:486
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\" - propietateak"
-
-#: mail/folder-browser-ui.c:488
-msgid "Properties"
-msgstr "Propietateak"
-
-#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
-
-#: mail/folder-browser.c:782
-#, c-format
-msgid "%d new"
-msgstr "%d berri"
-
-#: mail/folder-browser.c:785 mail/folder-browser.c:793
-#: mail/folder-browser.c:796
-msgid ", "
-msgstr ", "
-
-#: mail/folder-browser.c:787
-#, c-format
-msgid "%d hidden"
-msgstr "%d ezkutu"
-
-#: mail/folder-browser.c:789
-#, c-format
-msgid "%d visible"
-msgstr "%d ikusgarri"
-
-#: mail/folder-browser.c:794
-#, c-format
-msgid "%d selected"
-msgstr "%d hautatuta"
-
-#: mail/folder-browser.c:799
-#, c-format
-msgid "%d unsent"
-msgstr "%d bidali gabe"
-
-#: mail/folder-browser.c:801
-#, c-format
-msgid "%d sent"
-msgstr "%d bidali"
-
-#: mail/folder-browser.c:803
-#, c-format
-msgid "%d total"
-msgstr "%d guztira"
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Karpeta-informazioa hartzen"
 
-#: mail/folder-browser.c:1182
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 #, fuzzy
-msgid "Create _Virtual Folder From Search..."
-msgstr "Sortu _karpeta birtuala mezutik"
-
-#: mail/folder-browser.c:1736
-msgid "VFolder on _Subject"
-msgstr "_Gaiaren araberako karpeta birtuala"
-
-#: mail/folder-browser.c:1737
-msgid "VFolder on Se_nder"
-msgstr "_Bidaltzailearen araberako karpeta birtuala"
-
-#: mail/folder-browser.c:1738
-msgid "VFolder on _Recipients"
-msgstr "_Hartzailearen araberako karpeta birtuala"
-
-#: mail/folder-browser.c:1739
-msgid "VFolder on Mailing _List"
-msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
-
-#: mail/folder-browser.c:1743
-msgid "Filter on Sub_ject"
-msgstr "G_aiaren araberako iragazkia"
-
-#: mail/folder-browser.c:1744
-msgid "Filter on Sen_der"
-msgstr "Bi_daltzailearen araberako iragazkia"
-
-#: mail/folder-browser.c:1745
-msgid "Filter on Re_cipients"
-msgstr "Hart_zailearen araberako iragazkia"
-
-#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
-msgid "Filter on _Mailing List"
-msgstr "Po_sta-zerrendaren araberako iragazkia"
-
-#: mail/folder-browser.c:1764
-msgid "_Edit as New Message..."
-msgstr "_Editatu mezu berri gisa..."
-
-#: mail/folder-browser.c:1766
-msgid "_Print"
-msgstr "_Inprimatu"
-
-#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
-msgid "_Reply to Sender"
-msgstr "Erantzun bidal_tzaileari"
-
-#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
-msgid "Reply to _List"
-msgstr "Erantzun zerre_ndari"
+msgid "Composer Preferences"
+msgstr "Egutegi-hobespenak"
 
-#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
-msgid "Reply to _All"
-msgstr "Erantzun g_uztiei"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
 
-#: mail/folder-browser.c:1773
-msgid "_Forward"
-msgstr "_Birbidali"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-#: mail/folder-browser.c:1777
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
-msgid "Follo_w Up..."
-msgstr "Jarrait_u..."
+msgid "Configure your email accounts here"
+msgstr "Sortu edo editatu posta-kontuak eta bestelako hobespenak"
 
-#: mail/folder-browser.c:1778
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Fla_g Completed"
-msgstr "Bandera o_satuta"
+msgid "Evolution Mail"
+msgstr "Evolution "
 
-#: mail/folder-browser.c:1779
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "Cl_ear Flag"
-msgstr "Garbitu ban_dera"
-
-#. separator here?
-#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
-msgid "Mar_k as Read"
-msgstr "Mar_katu irakurritako gisa"
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
 
-#: mail/folder-browser.c:1784
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
-msgid "Mark as _Unread"
-msgstr "Markatu i_rakurri gabeko gisa"
-
-#: mail/folder-browser.c:1785
-msgid "Mark as _Important"
-msgstr "Markatu garrantz_itsu gisa"
+msgid "Evolution Mail component"
+msgstr "Evolution-en mezu-prestatzailea."
 
-#: mail/folder-browser.c:1786
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "_Mark as Unimportant"
-msgstr "Markatu ez-garra_ntzitsu gisa"
+msgid "Evolution Mail composer"
+msgstr "Evolution-en mezu-prestatzailea."
 
-#: mail/folder-browser.c:1791
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "U_ndelete"
-msgstr "_Desezabatu"
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
 
-#: mail/folder-browser.c:1795
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 #, fuzzy
-msgid "Mo_ve to Folder..."
-msgstr "Eraman karpeta honetara..."
-
-#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "K_opiatu karpeta honetan..."
+msgid "Evolution Mail configuration interface"
+msgstr "Posta konfiguratzeko interfazea"
 
-#: mail/folder-browser.c:1804
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Add Sender to Address_book"
-msgstr "Gehitu bidaltzailea _helbide-liburuan"
+msgid "Evolution Mail folder viewer"
+msgstr "Posta-karpetak bistaratzeko Evolution-en osagaia."
 
-#: mail/folder-browser.c:1808
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
 #, fuzzy
-msgid "Appl_y Filters"
-msgstr "Aplikatu iragazkiak"
+msgid "Evolution Mail preferences control"
+msgstr "Evolution-en postaren laneko laburpenaren osagaia."
 
-#: mail/folder-browser.c:1812
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 #, fuzzy
-msgid "Crea_te Rule From Message"
-msgstr "Sortu _araua mezutik"
+msgid "Mail Accounts"
+msgstr "Kontuak"
 
-#: mail/folder-browser.c:2071
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
 #, fuzzy
-msgid "VFolder on M_ailing List"
-msgstr "Posta-zerrendaren araberako karpeta birtuala"
-
-#: mail/folder-browser.c:2073
-#, fuzzy, c-format
-msgid "Filter on _Mailing List (%s)"
-msgstr "Posta-zerrendaren araberako iragazkia (%s)"
-
-#: mail/folder-browser.c:2074
-#, fuzzy, c-format
-msgid "VFolder on M_ailing List (%s)"
-msgstr "Posta-zerrendaren araberako karpeta birtuala (%s)"
-
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Lehenetsi"
-
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Karpeta-informazioa hartzen"
+msgid "Mail Preferences"
+msgstr "Egutegi-hobespenak"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12335,7 +12440,7 @@ msgstr "_Erabiltzaile-izena:"
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
-#: mail/mail-account-gui.c:1887
+#: mail/mail-account-gui.c:1886
 msgid "You may not create two accounts with the same name."
 msgstr "Ezin dituzu izen bereko bi kontu izan."
 
@@ -12367,17 +12472,17 @@ msgstr "Lehenetsi"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
+#: mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487
 #, fuzzy
 msgid "Account name"
 msgstr "_Kontu-izena:"
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -12422,222 +12527,6 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "Ez erakutsi mezu hau berriro."
-
-#: mail/mail-callbacks.c:190
-msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
-msgstr ""
-"Ez duzu konfiguratu posta-bezeroa.\n"
-"Konfiguratu egin behar duzu mezuak bidali,\n"
-"jaso edo prestatu ahal izateko.\n"
-"Orain konfiguratu nahi duzu?"
-
-#: mail/mail-callbacks.c:212
-#, fuzzy
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
-msgstr ""
-"Identitatea konfiguratu behar duzu\n"
-"mezua idatzi ahal izateko."
-
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-"Identitatea konfiguratu behar duzu\n"
-"mezua idatzi ahal izateko."
-
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-"Posta-garraioa konfiguratu behar duzu\n"
-"mezua idatzi ahal izateko."
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-#, fuzzy
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-msgstr ""
-"HTML formatuko mezua bidaltzera zoaz, baina hartzaile hauek ez dute HTML "
-"formatuko mezurik jaso nahi:\n"
-
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "Hala ere bidali nahi duzu?"
-
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Mezu honek ez du gairik.\n"
-"Ziur zaude bidali nahi duzula?"
-
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-"Mezua bidali behar diozun kontaktu-zerrenda helbidea ezkutuan edukitzeko "
-"konfiguratuta dagoenez, Bcc hartzaileak bakarrik izango ditu mezuak."
-
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "Mezu honek Bcc hartzaileak bakarrik ditu."
-
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-"Beharbada posta-zerbitzariak hartzaileak agerian utziko ditu Apparently-To "
-"goiburukoa gehituz.\n"
-"Hala ere bidali nahi duzu?"
-
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Hartzaileak zehaztu behar dituzu mezua bidaltzeko."
-
-#: mail/mail-callbacks.c:724
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Ezin da kontu honetako zirriborroen karpeta ireki.\n"
-"Zirriborroen karpeta lehenetsia erabili nahi duzu?"
-
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr "bidaltzaile ezezaguna"
-
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr ""
-"Jatorrizko mezua:\n"
-"data: %a, %Y-%m-%d %H:%M, egilea: %%s"
-
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "Eraman mezua(k) hona"
-
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "Kopiatu mezua(k) hemen"
-
-#: mail/mail-callbacks.c:2344
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "Ziur zaude %d mezuak editatu nahi dituzula?"
-
-#: mail/mail-callbacks.c:2360
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
-msgstr ""
-"Zirriborroen karpetan gordetako mezuak bakarrik\n"
-"edita ditzakezu."
-
-#: mail/mail-callbacks.c:2393
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-"Bidalitako mezuen karpetako mezuak bakarrik\n"
-"bidal ditzakezu berriro."
-
-#: mail/mail-callbacks.c:2403
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
-
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr "Ez duzu mezurik hautatu"
-
-#: mail/mail-callbacks.c:2465
-#, fuzzy, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"Ezin da mezua hartu: %s\n"
-"  %s"
-
-#: mail/mail-callbacks.c:2470
-#, fuzzy, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"%s badago lehendik\n"
-"Gainidatzi nahi duzu?"
-
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr "Gorde mezua honela..."
-
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr "Gorde mezuak honela..."
-
-#: mail/mail-callbacks.c:2686
-#, fuzzy
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"Eragiketa honek betiko borratuko ditu ezabatutako gisa markatutako mezuak. "
-"Jarraitzen baduzu, ezingo dituzu berreskuratu.\n"
-"\n"
-"Benetan borratu nahi dituzu?"
-
-#: mail/mail-callbacks.c:2781
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Errorea iragazki-informazioa kargatzean:\n"
-"%s"
-
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr "Iragazkiak"
-
-#: mail/mail-callbacks.c:2830
-#, c-format
-msgid "Page %d of %d"
-msgstr "%d/%d orria"
-
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr "Inprimatu mezua"
-
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr "Huts egin du mezua inprimatzean"
-
-#: mail/mail-callbacks.c:3147
-#, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "Ziur zaude %d mezuak leiho banatan ireki nahi dituzula?"
-
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 #, fuzzy
@@ -12669,11 +12558,19 @@ msgstr "Gehitu irizpidea"
 msgid "Signature(s)"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Zerbitzua egiaztatzen"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Zerbitzariarekin konektatzen..."
+
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identitatea"
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:369
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -12684,12 +12581,12 @@ msgstr ""
 "eremuak bete gabe utz ditzakezu.\n"
 "Betetzen badituzu, datu horiek zuk bidaltzen dituzun mezuetan agertuko dira."
 
-#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:377
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12699,16 +12596,16 @@ msgstr ""
 "bazaude, galdetu sistemaren\n"
 "administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:384
 msgid "Please select among the following options"
 msgstr "Hautatu ondorengo aukeretako bat"
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:387
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:389
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12718,11 +12615,11 @@ msgstr ""
 "bazaude, galdetu\n"
 "sistema-administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Kontuaren kudeaketa"
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:396
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12739,14 +12636,6 @@ msgstr ""
 "Bistaratzeko \n"
 "bakarrik erabiliko da kontu-izen hori."
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Zerbitzua egiaztatzen"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Zerbitzariarekin konektatzen..."
-
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Begiratu zein mota onartzen diren"
@@ -12877,6 +12766,10 @@ msgstr ""
 msgid "De_fault"
 msgstr "Le_henetsi"
 
+#: mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Lehenetsi"
+
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
@@ -13368,219 +13261,25 @@ msgstr "Erabili konexio segurua (_SSL)"
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
-#, fuzzy
-msgid "color"
-msgstr "kolorea"
-
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "azalpena"
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr "Ezin izan da S/MIME sinadura-testuingurua sortu."
-
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
-msgstr "Ezin izan da S/MIME ziurtagiri-testuingurua sortu."
-
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr "Ezin izan da S/MIME enkriptatze-testuingurua sortu."
-
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
-msgstr "Ezin izan da S/MIME gutun-azal testuingurua sortu."
-
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
-
-#: mail/mail-display.c:197
-#, fuzzy, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Izen hori duen fitxategia badago lehendik.\n"
-"Gainidatzi?"
-
-#: mail/mail-display.c:336
-msgid "Save Attachment"
-msgstr "Gorde eranskina"
-
-#: mail/mail-display.c:409
-#, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "Ezin izan da aldi baterako `%s' fitxategia sortu: %s"
-
-#: mail/mail-display.c:457
-#, fuzzy
-msgid "Save Attachment..."
-msgstr "Gorde eranskina"
-
-#: mail/mail-display.c:458
-msgid "View Inline"
-msgstr "Ikusi barnean"
-
-#: mail/mail-display.c:459
-#, c-format
-msgid "Open in %s..."
-msgstr "Ireki honekin: %s..."
-
-#: mail/mail-display.c:515
-#, c-format
-msgid "View Inline (via %s)"
-msgstr "Ikusi barnean (%s bidez)"
-
-#: mail/mail-display.c:519
-msgid "Hide"
-msgstr "Ezkutatu"
-
-#: mail/mail-display.c:539
-msgid "External Viewer"
-msgstr "Kanpoko ikustailea"
-
-#: mail/mail-display.c:1368
-#, fuzzy
-msgid "Downloading images"
-msgstr "Kargatu iru_diak"
-
-#: mail/mail-display.c:1545
-msgid "Loading message content"
-msgstr "Mezuaren edukia kargatzen"
-
-#: mail/mail-display.c:1887
-#, fuzzy
-msgid "Overdue:"
-msgstr "A_tzeratutako zereginak:"
-
-#: mail/mail-display.c:1891
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %P"
-msgstr "%b %d %l:%M %p"
-
-#: mail/mail-display.c:2255
-msgid "Open Link in Browser"
-msgstr "Ireki esteka arakatzailean"
-
-#: mail/mail-display.c:2256
-msgid "Copy Link Location"
-msgstr "Kopiatu estekaren helbidea"
-
-#: mail/mail-display.c:2258
-msgid "Save Link as (FIXME)"
-msgstr "Gorde esteka honela (FIXME) "
-
-#: mail/mail-display.c:2260
-msgid "Save Image as..."
-msgstr "Gorde irudia honela..."
-
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:832
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "%s eskaneatzen"
 
-#: mail/mail-format.c:665
-#, c-format
-msgid "%s attachment"
-msgstr "%s eranskina"
-
-#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
-#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
-
-#: mail/mail-format.c:785 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
-
-#: mail/mail-format.c:871
-msgid "Bad Address"
-msgstr "Helbide okerra"
-
-#: mail/mail-format.c:912 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Nork"
-
-#: mail/mail-format.c:916
-msgid "Reply-To"
-msgstr "Erantzun honi"
-
-#: mail/mail-format.c:921 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Nori"
-
-#: mail/mail-format.c:926
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/mail-format.c:931
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/mail-format.c:1482
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Mezu honek sinadura digitala du.Informazio gehiago ikusteko, egin klik "
-"giltzarrapoaren ikonoan."
-
-#: mail/mail-format.c:1510
-#, fuzzy
-msgid "Could not create a PGP verfication context"
-msgstr "Ezin izan da PGP egiaztapen-testuingurua sortu."
-
-#: mail/mail-format.c:1518
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
-
-#: mail/mail-format.c:1525
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa dela."
-
-#: mail/mail-format.c:1789
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP gunerako erakuslea (%s)"
-
-#: mail/mail-format.c:1800
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
-
-#: mail/mail-format.c:1803
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "(%s) fitxategi lokalerako erakuslea"
-
-#: mail/mail-format.c:1830
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "(%s)urruneko datuetarako erakuslea"
-
-#: mail/mail-format.c:1836
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
-
-#: mail/mail-format.c:1838
-msgid "Malformed external-body part."
-msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
-
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:711
 msgid "Reconfiguring folder"
 msgstr "Karpeta birkonfiguratzen"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:792
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13589,22 +13288,22 @@ msgstr ""
 "Ezin da gorde karpetaren metainformazioa; beharbada karpeta\n"
 "hau ezingo duzu gehiago ireki: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:848
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ezin da karpetaren metainformazioa gorde %s(e)n: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:900
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ezin dira %s karpetaren metadatuak ezabatu: %s"
 
-#: mail/mail-local.c:1323
+#: mail/mail-local.c:1363
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" karpeta\"%s\" formatura aldatzen"
 
-#: mail/mail-local.c:1348
+#: mail/mail-local.c:1388
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13612,16 +13311,16 @@ msgstr ""
 "Aurrerantzean ezin baduzu postontzi hau ireki,\n"
 "eskuz konpondu beharko duzu."
 
-#: mail/mail-local.c:1448
+#: mail/mail-local.c:1488
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Birkonfiguratu /%s"
 
-#: mail/mail-local.c:1512
+#: mail/mail-local.c:1552
 msgid "You cannot change the format of a non-local folder."
 msgstr "Ezin duzu aldatu lokala ez den karpeta baten formatua."
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:259
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13630,7 +13329,7 @@ msgstr ""
 "Errorea '%s' saiatu denean:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:262
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13639,118 +13338,131 @@ msgstr ""
 "Errorea eragiketa egitean:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:913
 msgid "Working"
 msgstr "Lanean"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:87
 msgid "Filtering Folder"
 msgstr "Karpeta iragazten"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-ops.c:550 mail/mail-ops.c:579
-msgid "However, the message was successfully sent."
-msgstr "Hala ere, mezua ongi bidali da."
+#: mail/mail-ops.c:557
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
+
+#: mail/mail-ops.c:578
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: mail/mail-ops.c:587
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:629
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" bidaltzen"
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:747
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:768
 msgid "Complete."
 msgstr "Osatuta."
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:943
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1244
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1359
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1582
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
+#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1666
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "%s inportatzen %s gisa."
 
-#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1742
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua berreskuratzen"
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1814
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d mezu berreskuratzen"
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d mezu gordetzen"
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1946
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13759,7 +13471,7 @@ msgstr ""
 "Ezin da sortu irteerako fitxategia: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13768,11 +13480,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2062
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13781,107 +13493,75 @@ msgstr ""
 "Ezin da irteerako fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s(e)tik deskonektatzen"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2240
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Mezu izengabea)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Mezu izengabea"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Mezu hutsa"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "Bilatu mezuan"
-
-#: mail/mail-search.c:320
-msgid "Case Sensitive"
-msgstr "Maiuskula/minuskula"
-
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "Bilatu aurrerantz"
-
-#: mail/mail-search.c:342
-msgid "Find:"
-msgstr "Bilatu:"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Bat datozenak:"
-
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr "Bertan behera uzten..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Zerbitzaria: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Bide-izena: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:259
 #, c-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:308
 msgid "Send & Receive Mail"
 msgstr "Mezuak bidali eta jaso"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Utzi dena"
 
-#: mail/mail-send-recv.c:389
+#: mail/mail-send-recv.c:390
 msgid "Updating..."
 msgstr "Eguneratzen..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:229
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:262
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:264
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:287
 msgid "_Remember this password"
 msgstr "Gogora_tu pasahitz hau"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:288
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Gogoratu pasahitz hau saio hau amaitu arte"
@@ -13932,21 +13612,17 @@ msgstr "Birbidalitako mezua - %s"
 msgid "Forwarded message"
 msgstr "Birbidalitako mezua"
 
-#: mail/mail-tools.c:438
-msgid "Forwarded Message"
-msgstr "Birbidalitako mezua"
-
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Karpeta birtuala konfiguratzen: %s"
 
-#: mail/mail-vfolder.c:210
+#: mail/mail-vfolder.c:209
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 
-#: mail/mail-vfolder.c:468
+#: mail/mail-vfolder.c:467
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13959,100 +13635,95 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:776
 msgid "VFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:834
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:873
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "'%s' kBirtuala editatu nahian dabil, baina ez dago."
 
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:965
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Gairik ez)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - Mezua"
-
-#: mail/message-list.c:741
+#: mail/message-list.c:900
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: mail/message-list.c:742
+#: mail/message-list.c:901
 msgid "Seen"
 msgstr "Ikusita"
 
-#: mail/message-list.c:743
+#: mail/message-list.c:902
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:903
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:904
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:908
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:909
 msgid "Lower"
 msgstr "Txikia"
 
-#: mail/message-list.c:754
+#: mail/message-list.c:913
 msgid "Higher"
 msgstr "Handia"
 
-#: mail/message-list.c:755
+#: mail/message-list.c:914
 msgid "Highest"
 msgstr "Handiena"
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1231
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1238
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1247
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1259
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1267
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1269
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3062
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
+
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Noizko: "
@@ -14069,6 +13740,10 @@ msgstr "Banderaduna"
 msgid "Follow Up Flag"
 msgstr "Jarraitu banderari"
 
+#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Nork"
+
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
@@ -14082,6 +13757,10 @@ msgstr "Jasotze-data"
 msgid "Size"
 msgstr "Tamaina"
 
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Nori"
+
 #: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
@@ -14102,7 +13781,7 @@ msgstr "Jarraitu"
 msgid "For Your Information"
 msgstr "Iturburu-informazioa"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
 msgid "Forward"
 msgstr "Birbidali"
 
@@ -14110,11 +13789,11 @@ msgstr "Birbidali"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
 msgid "Reply"
 msgstr "Erantzun"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
 msgid "Reply to All"
 msgstr "Erantzun denei"
 
@@ -14149,39 +13828,6 @@ msgstr "Noizko: "
 msgid "_Flag:"
 msgstr "Fitxategi-izena:"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "\"%2$s\"(e)ko %1$s(r)en azpian dauden karpetak eskaneatzen"
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "\"%s\"(e)ko erro-mailako karpetan eskaneatzen"
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "\"%s\" karpetan harpidetzen"
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "\"%s\" karpetaren harpidetza kentzen"
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Karpeta"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "Ez da zerbitzaririk hautatu"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Hautatu zerbitzari bat."
-
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -14198,18 +13844,128 @@ msgid "S_erver:"
 msgstr "Zer_bitzariaren izena:"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Scanning folders ..."
-msgstr "Gorde karpetan..."
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
 msgstr "Harpidetza _kendu"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Evolution-en laburpena daukan karpeta"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %Y %B %e"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Itxaron..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Inprimatu laburpena"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Huts egin du laburpena inprimatzean"
+
+#: my-evolution/e-summary-calendar.c:384
+msgid "Appointments"
+msgstr "Hitzorduak"
+
+#: my-evolution/e-summary-calendar.c:392
+#, fuzzy
+msgid "No appointments."
+msgstr "Hitzordurik ez"
+
+#: my-evolution/e-summary-calendar.c:409
+msgid "%k:%M %d %B"
+msgstr "%k:%M %B %d"
+
+#: my-evolution/e-summary-calendar.c:411
+#, fuzzy
+msgid "%l:%M%p %d %B"
+msgstr "%l:%M %B %d"
+
+#: my-evolution/e-summary-calendar.c:429
+msgid "No description"
+msgstr "Azalpenik ez"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Posta-laburpena"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com-en Eguneko Hitza"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Eguneko aipuak"
+
+#: my-evolution/e-summary-preferences.c:565
+#, fuzzy
+msgid "New News Feed"
+msgstr "Berri-iturriak"
+
+#: my-evolution/e-summary-preferences.c:581
+#, fuzzy
+msgid "_URL:"
+msgstr "URLa:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Errorea RDF deskargatzean"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Berri-iturriak"
+
+#: my-evolution/e-summary-shown.c:496
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Shannon"
+
+#: my-evolution/e-summary-tasks.c:349
+msgid "No tasks"
+msgstr "Zereginik ez"
+
+#: my-evolution/e-summary-tasks.c:387
+#, fuzzy
+msgid "blue"
+msgstr "Ambler"
+
+#: my-evolution/e-summary-tasks.c:387
+msgid "(No Description)"
+msgstr "(Azalpenik ez)"
+
+#: my-evolution/e-summary-weather.c:72
+msgid "My Weather"
+msgstr "Eguraldia"
+
+#: my-evolution/e-summary-weather.c:261
+msgid "There was an error downloading data for"
+msgstr "Errorea izan da datuak deskargatzean"
+
+#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Eguraldia"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:582
+msgid "KBOS"
+msgstr "KBOS"
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
@@ -24023,116 +23779,6 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Evolution-en laburpena daukan karpeta"
-
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr "Hitzorduak"
-
-#: my-evolution/e-summary-calendar.c:389
-#, fuzzy
-msgid "No appointments."
-msgstr "Hitzordurik ez"
-
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr "%k:%M %B %d"
-
-#: my-evolution/e-summary-calendar.c:408
-#, fuzzy
-msgid "%l:%M%P %d %B"
-msgstr "%l:%M %B %d"
-
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr "Azalpenik ez"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Posta-laburpena"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com-en Eguneko Hitza"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Eguneko aipuak"
-
-#: my-evolution/e-summary-preferences.c:565
-#, fuzzy
-msgid "New News Feed"
-msgstr "Berri-iturriak"
-
-#: my-evolution/e-summary-preferences.c:581
-#, fuzzy
-msgid "_URL:"
-msgstr "URLa:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Errorea RDF deskargatzean"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Berri-iturriak"
-
-#: my-evolution/e-summary-shown.c:496
-#, fuzzy
-msgid "All"
-msgstr "McAllen"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "Shannon"
-
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr "Zereginik ez"
-
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr "(Azalpenik ez)"
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Eguraldia"
-
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr "Errorea izan da datuak deskargatzean"
-
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Eguraldia"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr "KBOS"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %Y %B %e"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Itxaron..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Inprimatu laburpena"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Huts egin du laburpena inprimatzean"
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " °F"
@@ -25398,24 +25044,27 @@ msgstr "E_gun bat"
 msgid "_Show full path for folders"
 msgstr "_Erakutsi karpeten bide-izen osoa"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
+#: notes/component-factory.c:27
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Berria"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#: notes/component-factory.c:27
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution-en shell-a."
+msgid "Create a new note"
+msgstr "Sortu karpeta berria"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#: notes/component-factory.c:152
 #, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Ezin da Evolution-en karpeta-informazioaren osagaia hasieratu."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#: notes/main.c:30
 #, fuzzy
-msgid "Folder Settings"
-msgstr "Postaren ezarpenak"
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Laneko laburpena egiteko osagaiak ezin izan du Bonobo hasieratu.\n"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25512,6 +25161,50 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Hauei esker daukazu:"
 
+#: shell/e-shell.c:175
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Aktibazio-sistemak eman duen errorea:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Ezin da biltegi lokala ezarri -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"\"%s\" motako karpetak maneiatzen dituen Evolution osagaia\n"
+"ustekabean itxi da. Evolution-etik irten eta berriro sartu beharko \n"
+"duzu datu horiek berriro atzitzeko."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Argumentu baliogabeak"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Ezin da OAFen erregistratu"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Ez da aurkitu konfigurazioko datu-basea"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Errore generikoa"
+
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
@@ -25609,27 +25302,32 @@ msgstr ""
 "Ezin izan da karpetaren izena aldatu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:538
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:541
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Karpetaren izena aldatu"
 
-#: shell/e-shell-folder-commands.c:553
+#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:590
+#: shell/e-shell-folder-commands.c:587
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25674,11 +25372,19 @@ msgstr ""
 "Ez badakizu, \"Automatikoa\" hauta dezakezu eta Evolution saiatuko da "
 "bideratzen."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
 msgid "Please select the information that you would like to import:"
 msgstr "Hautatu inportatu nahi duzun informazioa:"
 
-#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
+#: shell/e-shell-importer.c:151
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25687,22 +25393,22 @@ msgstr ""
 "%s inportatzen\n"
 "%d elementua inportatzen."
 
-#: shell/e-shell-importer.c:317
+#: shell/e-shell-importer.c:323
 #, fuzzy
 msgid "Select importer"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:458
+#: shell/e-shell-importer.c:464
 #, c-format
 msgid "File %s does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
-#: shell/e-shell-importer.c:518
+#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
+#: shell/e-shell-importer.c:524
 msgid "Evolution Error"
 msgstr "Evolution errorea "
 
-#: shell/e-shell-importer.c:475
+#: shell/e-shell-importer.c:481
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25711,11 +25417,11 @@ msgstr ""
 "Ez dago %s maneiatzeko\n"
 "gai den inportatzailerik"
 
-#: shell/e-shell-importer.c:484
+#: shell/e-shell-importer.c:490
 msgid "Importing"
 msgstr "Inportatzen"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25724,17 +25430,17 @@ msgstr ""
 "%s inportatzen.\n"
 "%s abiarazten"
 
-#: shell/e-shell-importer.c:503
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid "Error starting %s"
 msgstr "Errorea %s abiaraztean"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:523
 #, c-format
 msgid "Error loading %s"
 msgstr "Errorea %s kargatzean"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:540
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25743,31 +25449,35 @@ msgstr ""
 "%s inportatzen\n"
 "1. elementua inportatzen."
 
-#: shell/e-shell-importer.c:588
+#: shell/e-shell-importer.c:594
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: shell/e-shell-importer.c:637
-msgid "Filename:"
+#: shell/e-shell-importer.c:643
+#, fuzzy
+msgid "_Filename:"
 msgstr "Fitxategi-izena:"
 
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: shell/e-shell-importer.c:651
-msgid "File type:"
+#: shell/e-shell-importer.c:658
+#, fuzzy
+msgid "File _type:"
 msgstr "Fitxategi-mota:"
 
-#: shell/e-shell-importer.c:676
-msgid "Import data and settings from older programs"
+#: shell/e-shell-importer.c:684
+#, fuzzy
+msgid "Import data and settings from _older programs"
 msgstr "Inportatu programa zaharretako datuak eta ezarpenak"
 
-#: shell/e-shell-importer.c:680
-msgid "Import a single file"
+#: shell/e-shell-importer.c:687
+#, fuzzy
+msgid "Import a _single file"
 msgstr "Inportatu fitxategi bakarra"
 
-#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
+#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25775,25 +25485,26 @@ msgstr ""
 "Itxaron...\n"
 "Lehengo instalazio bila eskaneatzen"
 
-#: shell/e-shell-importer.c:749
+#: shell/e-shell-importer.c:758
 msgid "Starting Intelligent Importers"
 msgstr "Inportatzaile adimendunak abiarazten"
 
-#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
+#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
 
-#: shell/e-shell-importer.c:1047
+#: shell/e-shell-importer.c:1061
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:1048
+#: shell/e-shell-importer.c:1062
 msgid "Select a destination folder for importing this data"
 msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
 
-#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
-msgid "Import"
+#: shell/e-shell-importer.c:1193
+#, fuzzy
+msgid "_Import"
 msgstr "Inportatu"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25860,11 +25571,19 @@ msgstr ""
 "Ezin da sortu adierazitako karpeta:\n"
 "%s"
 
-#: shell/e-shell-user-creatable-items-handler.c:586
-#: shell/e-shell-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Berria"
+#: shell/e-shell-startup-wizard.c:771
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:782
+#, fuzzy
+msgid "Quit Assistant"
+msgstr "Laguntzailea"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25888,6 +25607,37 @@ msgstr "Karpeta-izenak ezin du Itzulera karaktererik eduki."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' eta '..' karpeta-izen erreserbatuak dira."
 
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Ez dago karpetarik bistaratuta)"
+
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(bat ere ez)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution linean dago. Egin klik botoi honetan lineaz kanpo lan "
+"egiteko."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution lineaz kanpo dago. Egin klik botoi honetan linean lan "
+"egiteko."
+
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
@@ -25939,80 +25689,13 @@ msgstr "_Lan egin lineaz kanpo"
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ez dago karpetarik bistaratuta)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(bat ere ez)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution linean dago. Egin klik botoi honetan lineaz kanpo lan "
-"egiteko."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution lineaz kanpo dago. Egin klik botoi honetan linean lan "
-"egiteko."
-
-#: shell/e-shell.c:175
-#, fuzzy, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Aktibazio-sistemak eman duen errorea:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ezin da biltegi lokala ezarri -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"\"%s\" motako karpetak maneiatzen dituen Evolution osagaia\n"
-"ustekabean itxi da. Evolution-etik irten eta berriro sartu beharko \n"
-"duzu datu horiek berriro atzitzeko."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Argumentu baliogabeak"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Ezin da OAFen erregistratu"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Ez da aurkitu konfigurazioko datu-basea"
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Errorea lasterbideak gordetzean."
 
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Errore generikoa"
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Lasterbideak"
 
 #: shell/e-shortcuts-view.c:80
 #, fuzzy
@@ -26134,19 +25817,6 @@ msgstr "_Kendu"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Kendu lasterbide hau lasterbide-barratik"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Errorea lasterbideak gordetzean."
-
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Lasterbideak"
-
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Chico"
-
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Errorerik ez"
@@ -26203,6 +25873,15 @@ msgstr "Ezin da izen horretako karpetarik sortu"
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Chico"
+
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Karpeta"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -26217,103 +25896,103 @@ msgstr "%s (%%%d osatuta)"
 msgid "<click here to select a folder>"
 msgstr "<egin klik hemen karpeta hautatzeko>"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Errore ezezaguna."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Osagai-sistemak eman duen errorea:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Aktibazio-sistemak eman duen errorea:\n"
-"%s"
-
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr "CORBA errorea"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1189
 msgid "Interrupted"
 msgstr "Etenda"
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1191
 msgid "Invalid argument"
 msgstr "Argumentu baliogabea"
 
-#: shell/evolution-shell-component.c:1190
+#: shell/evolution-shell-component.c:1193
 msgid "Already has an owner"
 msgstr "Badu jabea"
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1195
 msgid "No owner"
 msgstr "Jaberik ez"
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1197
 msgid "Not found"
 msgstr "Ez da aurkitu"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1199
 msgid "Unsupported type"
 msgstr "Onartzen ez den mota"
 
-#: shell/evolution-shell-component.c:1198
+#: shell/evolution-shell-component.c:1201
 msgid "Unsupported schema"
 msgstr "Onartzen ez den eskema"
 
-#: shell/evolution-shell-component.c:1200
+#: shell/evolution-shell-component.c:1203
 msgid "Unsupported operation"
 msgstr "Onartzen ez den eragiketa"
 
-#: shell/evolution-shell-component.c:1202
+#: shell/evolution-shell-component.c:1205
 msgid "Internal error"
 msgstr "Barne-errorea"
 
-#: shell/evolution-shell-component.c:1206
+#: shell/evolution-shell-component.c:1209
 msgid "Exists"
 msgstr "Badago"
 
-#: shell/evolution-shell-component.c:1208
+#: shell/evolution-shell-component.c:1211
 msgid "Invalid URI"
 msgstr "URI baliogabea"
 
-#: shell/evolution-shell-component.c:1212
+#: shell/evolution-shell-component.c:1215
 msgid "Has subfolders"
 msgstr "Azpikarpetak ditu"
 
-#: shell/evolution-shell-component.c:1214
+#: shell/evolution-shell-component.c:1217
 msgid "No space left"
 msgstr "Ez dago lekurik"
 
-#: shell/evolution-shell-component.c:1216
+#: shell/evolution-shell-component.c:1219
 msgid "Old owner has died"
 msgstr "Jabe zaharra hil egin da"
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Errore ezezaguna."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Osagai-sistemak eman duen errorea:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Aktibazio-sistemak eman duen errorea:\n"
+"%s"
+
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Proba-mota:"
@@ -26434,6 +26113,25 @@ msgstr ""
 "\n"
 "Egin klik \"Amaitu\" botoian, ezarpenak gordetzeko. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution-en shell-a."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Postaren ezarpenak"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Egin klik \"Inportatu\"n fitxategia Evolution-era inportatzen hasteko."
@@ -26472,6 +26170,10 @@ msgstr ""
 msgid "Importers"
 msgstr "Inportatzaileak"
 
+#: shell/importer/intelligent.c:191
+msgid "Import"
+msgstr "Inportatu"
+
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Ez inportatu"
@@ -26661,7 +26363,7 @@ msgstr "Eraman kontaktua(k) beste karpeta batera..."
 msgid "Move to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "Itsatsi arbela"
 
@@ -26669,9 +26371,9 @@ msgstr "Itsatsi arbela"
 msgid "Previews the contacts to be printed"
 msgstr "Inprimatuko diren kontaktuen aurrebista eskaintzen du"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "_Inprimatzeko aurrebista"
 
@@ -26715,17 +26417,21 @@ msgstr "Utzi kargatzeari"
 msgid "View the current contact"
 msgstr "Ikusi uneko kontaktua"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Ekintzak"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "K_opiatu karpeta honetan..."
+
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Birbidali kontaktua..."
 
@@ -26796,46 +26502,61 @@ msgstr "Joan data jakin batera"
 msgid "Go to today"
 msgstr "_Joan gaurko egunera"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "_Hilabetea"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
 msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Inprimatu egutegi hau"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Argitaratu egutegi honen libre/okupatuta informazioa"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#, fuzzy
+msgid "Purg_e"
+msgstr "Bourges"
+
+#: ui/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Purge old appointments and meetings"
+msgstr "Hitzorduak eta gertaerak dituen karpeta"
+
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Show as list"
+msgstr "Erakutsi xehetasunak"
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr "Erakutsi egun bat"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr "Erakutsi hilabete bat"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr "Erakutsi aste bat"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Erakutsi lan-astea"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Week"
 msgstr "Astea"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Itxi"
@@ -26844,7 +26565,7 @@ msgstr "Itxi"
 msgid "Close this item"
 msgstr "Itxi elementu hau"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Ezabatu elementu hau"
 
@@ -26857,48 +26578,59 @@ msgstr "Tresna-barra nagusia"
 msgid "Preview the printed item"
 msgstr "Inprimatutako elementuaren aurrebista ikusi"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Inprimatu elementu hau"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Gorde"
-
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
-msgstr "Gorde honela..."
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Gorde hone_la..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Gorde eta itxi"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save and _Close"
+msgstr "Gorde eta itxi"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
 msgstr "Gorde elementua eta itxi elkarrizketa-koadroa"
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr "Gorde elementu hau diskoan"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "Fi_txategia"
 
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Gorde"
+
 #: ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "E_baki"
 
@@ -26922,51 +26654,39 @@ msgstr "Hautatu _dena"
 msgid "Select all text"
 msgstr "Hautatu kontaktu guztiak"
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr "Inprimatu _gutun-azala..."
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Gorde hone_la..."
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
 msgstr "Gorde kontaktua eta itxi elkarrizketa-koadroa"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
 msgstr "Bidali _mezua kontaktuari..."
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Gorde"
-
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
 msgstr "Ezabatu zerrenda hau"
 
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
-msgstr "Ezabatu..."
-
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
 msgstr "Gorde zerrenda eta itxi elkarrizketa-koadroa"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."
 msgstr "Bidali _zerrenda beste norbaiti..."
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
 msgid "Send _message to list..."
 msgstr "Bidali _mezua zerrendara..."
 
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Ezabatu..."
+
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Bertan behera utzi _bilera"
@@ -27042,7 +26762,7 @@ msgstr "Betiko kendu ezabatutako mezu guztiak karpeta guztietatik"
 
 #: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "Post New Message"
+msgid "Post Ne_w Message"
 msgstr "Mezu berria"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -27079,16 +26799,21 @@ msgstr "Au_rrebistako panela"
 msgid "Change the properties of this folder"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Itsatsi arbeleko mezua"
 
+#: ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "E_xpunge"
+msgstr "_Borratu betiko"
+
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Ezkutatu _hautatutako mezuak"
@@ -27107,14 +26832,15 @@ msgid ""
 msgstr "Ezkutatu ezabatutako mezuak, marratuta erakutsi beharrean"
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as R_ead"
+#, fuzzy
+msgid "Mark All as _Read"
 msgstr "_Markatu denak irakurritako gisa"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Markatu ikusgai dauden mezu guztiak irakurritako gisa"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Itsatsi arbeleko mezua"
@@ -27159,26 +26885,37 @@ msgstr "Aldi baterako ezkutatu hautatutako mezuak"
 msgid "Threaded Message list"
 msgstr "Hari bateko mezuen zerrenda"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
-msgid "_Expunge"
-msgstr "_Borratu betiko"
-
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Karpeta"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Alderantzikatu hautapena"
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propietateak..."
 
-#: ui/evolution-mail-list.xml.h:31
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "_Hariko mezuen zerrenda"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Itxi leiho hau"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "_Itxi"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "I_kusi"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -27199,414 +26936,425 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Aplikatu iragazki-arauak hautatutako mezuei"
 
 #: ui/evolution-mail-message.xml.h:5
+#, fuzzy
+msgid "Caret _Mode"
+msgstr "Testu-tamai_na"
+
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Prestatu hautatutako mezuaren hartzaile guztientzako erantzuna"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Prestatu hautatutako mezuaren posta-zerrendarentzako erantzuna"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Prestatu hautatutako mezuaren bidaltzailearentzako erantzuna"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr "Sortu _karpeta birtuala mezutik"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Sortu araua bidaltzaile hau duten mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Sortu araua hartzaile hauek dituzten mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Sortu araua posta-zerrenda honetako mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr "Sortu araua gai hau duten mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr "Sortu karpeta birtuala hartzaile hauentzat"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr "Sortu karpeta birtuala posta-zerrenda honentzat"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr "Sortu karpeta birtuala bidaltzaile honentzat"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr "Sortu karpeta birtuala gai honentzat"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Txikitu testuaren tamaina"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Bistaratu hurrengo mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Bistaratu hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Bistaratu irakurri gabeko hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Bistaratu irakurri gabeko hurrengo haria"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Bistaratu aurreko mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Bistaratu aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Bistaratu irakurri gabeko aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "F_orward"
 msgstr "Birbidali"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "_Posta-zerrendaren araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Bi_daltzailearen araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Hart_zailearen araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "G_aiaren araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:37
 msgid "Flag selected message(s) for follow-up"
 msgstr "Markatu hautatutako mezuak jarraipena egiteko"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:38
 msgid "Follow _Up..."
 msgstr "Jarrait_u..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 msgid "Force images in HTML mail to be loaded"
 msgstr "Kargarazi HTML postako irudiak"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message in the body of a new message"
 msgstr "Birbidali hautatutako mezua beste mezu baten testuaren barnean"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message quoted like a reply"
 msgstr "Birbidali hautatutako mezua erantzun gisa aipatuta"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message to someone"
 msgstr "Birbidali hautatutako mezua norbaiti"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Birbidali hautatutako mezua norbaiti eranskin gisa"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:45
 msgid "Increase the text size"
 msgstr "Handitu testuaren tamaina"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:46
 msgid "Load _Images"
 msgstr "Kargatu iru_diak"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mar_k as Read"
+msgstr "Mar_katu irakurritako gisa"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark as I_mportant"
 msgstr "Markatu ga_rrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as U_nread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as Unimp_ortant"
 msgstr "Markatu ez-garran_tzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as having been read"
 msgstr "Markatu hautatutako mezua(k) irakurritako gisa"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as important"
 msgstr "Markatu hautatutako mezua(k) garrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Markatu hautatutako mezua(k) irakurri gabeko gisa"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Markatu hautatutako mezua(k) ez-garrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Markatu hautatutako mezuak ezabatzeko"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:56
 msgid "Move"
 msgstr "Eraman"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:57
 msgid "Move selected message(s) to another folder"
 msgstr "Eraman hautatutako mezua(k) beste karpeta batera"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Hurrengo mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Hurrengo haria"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Hurrengo irakurri gabeko mezua"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:62
 msgid "Open the selected message in a new window"
 msgstr "Ireki hautatutako mezua leiho berri batean"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:63
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Ireki hautatutako mezua mezu-prestatzailean, berriro bidaltzeko"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:64
 msgid "Original Si_ze"
 msgstr "Jatorrizko ta_maina"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Irakurri gabeko aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
-msgid "Post a Reply"
+msgid "Post a Repl_y"
 msgstr "Zereginaren erantzuna"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Aurreko mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:70
 msgid "Preview the message to be printed"
 msgstr "Inprimatuko den mezuaren aurrebista eskaintzen du"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:71
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:74
 msgid "Print this message"
 msgstr "Inprimatu mezu hau"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:75
 msgid "Re_direct"
 msgstr "Birbi_deratu"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:76
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Birbideratu (errebotatu) hautatutako mezua norbaiti"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:79
+msgid "Reply to _All"
+msgstr "Erantzun g_uztiei"
+
+#: ui/evolution-mail-message.xml.h:80
+msgid "Reply to _List"
+msgstr "Erantzun zerre_ndari"
+
+#: ui/evolution-mail-message.xml.h:81
 msgid "Reset the text to its original size"
 msgstr "Testua jatorrizko tamainan berrezartzen du"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch Message..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "S_earch in Message..."
 msgstr "Bi_latu mezuan..."
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:83
 msgid "S_maller"
 msgstr "T_xikiagoa"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
 msgid "Save the message as a text file"
 msgstr "Gorde mezua testu-fitxategi gisa"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:85
 msgid "Search for text in the body of the displayed message"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Konfiguratu orrialde-ezarpenak uneko inprimagailuarentzat"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show Email _Source"
 msgstr "Erakutsi posta-itur_burua"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show Full _Headers"
 msgstr "Erakutsi _goiburuko osoak"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
+
+#: ui/evolution-mail-message.xml.h:90
 msgid "Show message in the normal style"
 msgstr "Erakutsi mezua estilo normalean"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Show message with all email headers"
 msgstr "Erakutsi mezua posta-goiburuko guztiekin"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Erakutsi mezu-iturburua formatu gabe"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Text Si_ze"
 msgstr "Testu-tamai_na"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr "Desezabatu hautatutako mezuak"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "VFolder on Mailing _List..."
 msgstr "_Posta-zerrendaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "VFolder on Se_nder..."
 msgstr "_Bidaltzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "VFolder on _Recipients..."
 msgstr "_Hartzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "VFolder on _Subject..."
 msgstr "_Gaiaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Erantsita"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Create Filter From Message"
 msgstr "_Sortu iragazkia mezutik"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Forward Message"
 msgstr "_Birbidali mezua"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Go To"
 msgstr "Joan"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Inline"
 msgstr "_Barnean"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Larger"
 msgstr "_Handiagoa"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Next Message"
 msgstr "Hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Normal Display"
 msgstr "_Bistaratze normala"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Open Message"
 msgstr "_Ireki mezua"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Reply to Sender"
+msgstr "Erantzun bidal_tzaileari"
+
+#: ui/evolution-mail-message.xml.h:119
 #, fuzzy
 msgid "_Resend..."
 msgstr "I_zena aldatu..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Tresnak"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Undelete"
 msgstr "_Desezabatu"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Itxi leiho hau"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "_Itxi"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "I_kusi"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Erantsi"
@@ -27615,7 +27363,7 @@ msgstr "Erantsi"
 msgid "Attach a file"
 msgstr "Erantsi fitxategi bat"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Itxi uneko fitxategia"
 
@@ -27631,7 +27379,7 @@ msgstr "Enkriptatu mezu hau PGPrekin"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Enkriptatu mezu hau zure S/MIME enkriptatze-ziurtagiriarekin"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "For_matua"
 
@@ -27664,6 +27412,11 @@ msgstr "S/MIME enkriptatzea"
 msgid "S/MIME Sign"
 msgstr "S/MIME sinadura"
 
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Gorde"
+
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Gorde honela"
@@ -27677,7 +27430,7 @@ msgid "Save in folder..."
 msgstr "Gorde karpetan..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Gorde uneko fitxategia"
 
@@ -27694,7 +27447,7 @@ msgid "Send"
 msgstr "Bidali"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Bidali mezua HTML formatuan"
 
@@ -27760,7 +27513,7 @@ msgid "_From Field"
 msgstr "'Nork' e_remua"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Txertatu"
 
@@ -27776,11 +27529,11 @@ msgstr "'Erant_zun honi' eremua"
 msgid "_Security"
 msgstr "Se_gurtasuna"
 
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:10
 #, fuzzy
 msgid "Save the current file and close the window"
 msgstr "Gorde elementua eta itxi elkarrizketa-koadroa"
@@ -27857,16 +27610,21 @@ msgstr "Ezabatu hautatutako zereginak"
 msgid "Mar_k as Complete"
 msgstr "Markatu 'Osatuta' gisa"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Mark selected tasks as complete"
+msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
+
+#: ui/evolution-tasks.xml.h:11
 msgid "Paste task from the clipboard"
 msgstr "Itsatsi zeregina arbeletik"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Inprimatuko diren kontaktuen aurrebista eskaintzen du"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "Print the list of tasks"
 msgstr "Inprimatu mezu hau"
@@ -28134,27 +27892,33 @@ msgid "_Work Week View"
 msgstr "Lan-astearen ikuspegia"
 
 #: views/mail/galview.xml.h:1
-msgid "As Sent Folder"
+#, fuzzy
+msgid "As _Sent Folder"
 msgstr "Bidalitakoen karpeta gisa"
 
 #: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr "Jarraitze-banderaren arabera"
+#, fuzzy
+msgid "By S_tatus"
+msgstr "Egoeraren arabera"
 
 #: views/mail/galview.xml.h:3
-msgid "By Sender"
+#, fuzzy
+msgid "By Se_nder"
 msgstr "Bidaltzailearen arabera"
 
 #: views/mail/galview.xml.h:4
-msgid "By Status"
-msgstr "Egoeraren arabera"
+#, fuzzy
+msgid "By Su_bject"
+msgstr "Gaiaren arabera"
 
 #: views/mail/galview.xml.h:5
-msgid "By Subject"
-msgstr "Gaiaren arabera"
+#, fuzzy
+msgid "By _Follow Up Flag"
+msgstr "Jarraitze-banderaren arabera"
 
 #: views/mail/galview.xml.h:6
-msgid "Messages"
+#, fuzzy
+msgid "_Messages"
 msgstr "Mezuak"
 
 #: views/tasks/galview.xml.h:1
@@ -28217,20 +27981,20 @@ msgstr "Definitu ikuspegiak"
 
 #. 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:427
+#: widgets/misc/e-calendar-item.c:456
 msgid "MTWTFSS"
 msgstr "AAAOOLI"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
+#: widgets/misc/e-calendar-item.c:1174
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
 msgid "Now"
 msgstr "Orain"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
 msgid "Today"
 msgstr "Gaur"
 
@@ -28350,22 +28114,6 @@ msgstr "Gehitu gordetako bilaketei"
 msgid "_Advanced..."
 msgstr "Aurreratua..."
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr "Informazioa"
-
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr "Errorea"
-
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr "Galdera"
-
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr "Mezua"
-
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Bilatu"
@@ -28417,6 +28165,566 @@ msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 
+#~ msgid "That person is already attending the meeting!"
+#~ msgstr "Pertsona hori lehendik dago bileran!"
+
+#~ msgid "URL:"
+#~ msgstr "URLa:"
+
+#, fuzzy
+#~ msgid "_Save as..."
+#~ msgstr "Gorde honela..."
+
+#~ msgid "End Date"
+#~ msgstr "Amaiera-eguna"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Hitz_ordu berria"
+
+#~ msgid "Print..."
+#~ msgstr "Inprimatu..."
+
+#~ msgid "Chair Persons"
+#~ msgstr "Mahaiburuak"
+
+#~ msgid "Required Participants"
+#~ msgstr "Beharrezko partaideak"
+
+#~ msgid "Optional Participants"
+#~ msgstr "Aukerako partaideak"
+
+#, fuzzy
+#~ msgid "Resources"
+#~ msgstr "Baliabidea"
+
+#~ msgid "Individual"
+#~ msgstr "Indibiduala"
+
+#~ msgid "Group"
+#~ msgstr "Taldea"
+
+#~ msgid "Resource"
+#~ msgstr "Baliabidea"
+
+#~ msgid "Room"
+#~ msgstr "Gela"
+
+#~ msgid "Chair"
+#~ msgstr "Mahaiburua"
+
+#~ msgid "Required Participant"
+#~ msgstr "Beharrezko partaidea"
+
+#~ msgid "Optional Participant"
+#~ msgstr "Aukerako partaidea"
+
+#~ msgid "Non-Participant"
+#~ msgstr "Ez-partaidea"
+
+#~ msgid "Needs Action"
+#~ msgstr "Ekintza behar du"
+
+#~ msgid "Delegated"
+#~ msgstr "Delegatua"
+
+#~ msgid "In Process"
+#~ msgstr "Egiten ari da"
+
+#~ msgid "Properties for \"%s\""
+#~ msgstr "\"%s\" - propietateak"
+
+#~ msgid "Properties"
+#~ msgstr "Propietateak"
+
+#~ msgid "Could not create temporary directory: %s"
+#~ msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
+
+#~ msgid "%d new"
+#~ msgstr "%d berri"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "%d hidden"
+#~ msgstr "%d ezkutu"
+
+#~ msgid "%d visible"
+#~ msgstr "%d ikusgarri"
+
+#~ msgid "%d selected"
+#~ msgstr "%d hautatuta"
+
+#~ msgid "%d unsent"
+#~ msgstr "%d bidali gabe"
+
+#~ msgid "%d sent"
+#~ msgstr "%d bidali"
+
+#~ msgid "%d total"
+#~ msgstr "%d guztira"
+
+#, fuzzy
+#~ msgid "Create _Virtual Folder From Search..."
+#~ msgstr "Sortu _karpeta birtuala mezutik"
+
+#~ msgid "VFolder on _Subject"
+#~ msgstr "_Gaiaren araberako karpeta birtuala"
+
+#~ msgid "VFolder on Se_nder"
+#~ msgstr "_Bidaltzailearen araberako karpeta birtuala"
+
+#~ msgid "VFolder on _Recipients"
+#~ msgstr "_Hartzailearen araberako karpeta birtuala"
+
+#~ msgid "VFolder on Mailing _List"
+#~ msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
+
+#~ msgid "Filter on Sub_ject"
+#~ msgstr "G_aiaren araberako iragazkia"
+
+#~ msgid "Filter on Sen_der"
+#~ msgstr "Bi_daltzailearen araberako iragazkia"
+
+#~ msgid "Filter on Re_cipients"
+#~ msgstr "Hart_zailearen araberako iragazkia"
+
+#~ msgid "Filter on _Mailing List"
+#~ msgstr "Po_sta-zerrendaren araberako iragazkia"
+
+#~ msgid "_Edit as New Message..."
+#~ msgstr "_Editatu mezu berri gisa..."
+
+#~ msgid "_Print"
+#~ msgstr "_Inprimatu"
+
+#~ msgid "_Forward"
+#~ msgstr "_Birbidali"
+
+#, fuzzy
+#~ msgid "Follo_w Up..."
+#~ msgstr "Jarrait_u..."
+
+#, fuzzy
+#~ msgid "Fla_g Completed"
+#~ msgstr "Bandera o_satuta"
+
+#, fuzzy
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Garbitu ban_dera"
+
+#, fuzzy
+#~ msgid "Mark as _Unread"
+#~ msgstr "Markatu i_rakurri gabeko gisa"
+
+#~ msgid "Mark as _Important"
+#~ msgstr "Markatu garrantz_itsu gisa"
+
+#, fuzzy
+#~ msgid "_Mark as Unimportant"
+#~ msgstr "Markatu ez-garra_ntzitsu gisa"
+
+#, fuzzy
+#~ msgid "U_ndelete"
+#~ msgstr "_Desezabatu"
+
+#, fuzzy
+#~ msgid "Mo_ve to Folder..."
+#~ msgstr "Eraman karpeta honetara..."
+
+#, fuzzy
+#~ msgid "Add Sender to Address_book"
+#~ msgstr "Gehitu bidaltzailea _helbide-liburuan"
+
+#, fuzzy
+#~ msgid "Appl_y Filters"
+#~ msgstr "Aplikatu iragazkiak"
+
+#, fuzzy
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Sortu _araua mezutik"
+
+#, fuzzy
+#~ msgid "VFolder on M_ailing List"
+#~ msgstr "Posta-zerrendaren araberako karpeta birtuala"
+
+#, fuzzy
+#~ msgid "Filter on _Mailing List (%s)"
+#~ msgstr "Posta-zerrendaren araberako iragazkia (%s)"
+
+#, fuzzy
+#~ msgid "VFolder on M_ailing List (%s)"
+#~ msgstr "Posta-zerrendaren araberako karpeta birtuala (%s)"
+
+#~ msgid "Don't show this message again."
+#~ msgstr "Ez erakutsi mezu hau berriro."
+
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "Ez duzu konfiguratu posta-bezeroa.\n"
+#~ "Konfiguratu egin behar duzu mezuak bidali,\n"
+#~ "jaso edo prestatu ahal izateko.\n"
+#~ "Orain konfiguratu nahi duzu?"
+
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Identitatea konfiguratu behar duzu\n"
+#~ "mezua idatzi ahal izateko."
+
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Posta-garraioa konfiguratu behar duzu\n"
+#~ "mezua idatzi ahal izateko."
+
+#, fuzzy
+#~ msgid ""
+#~ "You are sending an HTML-formatted message. Please make sure that\n"
+#~ "the following recipients are willing and able to receive HTML mail:\n"
+#~ msgstr ""
+#~ "HTML formatuko mezua bidaltzera zoaz, baina hartzaile hauek ez dute HTML "
+#~ "formatuko mezurik jaso nahi:\n"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Hala ere bidali nahi duzu?"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Mezu honek ez du gairik.\n"
+#~ "Ziur zaude bidali nahi duzula?"
+
+#~ msgid ""
+#~ "Since the contact list you are sending to is configured to hide the "
+#~ "list's addresses, this message will contain only Bcc recipients."
+#~ msgstr ""
+#~ "Mezua bidali behar diozun kontaktu-zerrenda helbidea ezkutuan edukitzeko "
+#~ "konfiguratuta dagoenez, Bcc hartzaileak bakarrik izango ditu mezuak."
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "Mezu honek Bcc hartzaileak bakarrik ditu."
+
+#~ msgid ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "Beharbada posta-zerbitzariak hartzaileak agerian utziko ditu Apparently-"
+#~ "To goiburukoa gehituz.\n"
+#~ "Hala ere bidali nahi duzu?"
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "Hartzaileak zehaztu behar dituzu mezua bidaltzeko."
+
+#~ msgid ""
+#~ "Unable to open the drafts folder for this account.\n"
+#~ "Would you like to use the default drafts folder?"
+#~ msgstr ""
+#~ "Ezin da kontu honetako zirriborroen karpeta ireki.\n"
+#~ "Zirriborroen karpeta lehenetsia erabili nahi duzu?"
+
+#~ msgid "an unknown sender"
+#~ msgstr "bidaltzaile ezezaguna"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+#~ msgstr ""
+#~ "Jatorrizko mezua:\n"
+#~ "data: %a, %Y-%m-%d %H:%M, egilea: %%s"
+
+#~ msgid "Move message(s) to"
+#~ msgstr "Eraman mezua(k) hona"
+
+#~ msgid "Copy message(s) to"
+#~ msgstr "Kopiatu mezua(k) hemen"
+
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "Ziur zaude %d mezuak editatu nahi dituzula?"
+
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Zirriborroen karpetan gordetako mezuak bakarrik\n"
+#~ "edita ditzakezu."
+
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Bidalitako mezuen karpetako mezuak bakarrik\n"
+#~ "bidal ditzakezu berriro."
+
+#~ msgid "Are you sure you want to resend all %d messages?"
+#~ msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
+
+#~ msgid "No Message Selected"
+#~ msgstr "Ez duzu mezurik hautatu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Ezin da mezua hartu: %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "%s badago lehendik\n"
+#~ "Gainidatzi nahi duzu?"
+
+#~ msgid "Save Message As..."
+#~ msgstr "Gorde mezua honela..."
+
+#~ msgid "Save Messages As..."
+#~ msgstr "Gorde mezuak honela..."
+
+#, fuzzy
+#~ msgid ""
+#~ "This operation will permanently erase all messages marked as\n"
+#~ "deleted. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "Eragiketa honek betiko borratuko ditu ezabatutako gisa markatutako "
+#~ "mezuak. Jarraitzen baduzu, ezingo dituzu berreskuratu.\n"
+#~ "\n"
+#~ "Benetan borratu nahi dituzu?"
+
+#~ msgid ""
+#~ "Error loading filter information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Errorea iragazki-informazioa kargatzean:\n"
+#~ "%s"
+
+#~ msgid "Filters"
+#~ msgstr "Iragazkiak"
+
+#~ msgid "Page %d of %d"
+#~ msgstr "%d/%d orria"
+
+#~ msgid "Print Message"
+#~ msgstr "Inprimatu mezua"
+
+#~ msgid "Printing of message failed"
+#~ msgstr "Huts egin du mezua inprimatzean"
+
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr "Ziur zaude %d mezuak leiho banatan ireki nahi dituzula?"
+
+#~ msgid "Could not create a S/MIME signature context."
+#~ msgstr "Ezin izan da S/MIME sinadura-testuingurua sortu."
+
+#~ msgid "Could not create a S/MIME certsonly context."
+#~ msgstr "Ezin izan da S/MIME ziurtagiri-testuingurua sortu."
+
+#~ msgid "Could not create a S/MIME encryption context."
+#~ msgstr "Ezin izan da S/MIME enkriptatze-testuingurua sortu."
+
+#~ msgid "Could not create a S/MIME envelope context."
+#~ msgstr "Ezin izan da S/MIME gutun-azal testuingurua sortu."
+
+#~ msgid "Could not create a S/MIME decode context."
+#~ msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
+
+#, fuzzy
+#~ msgid ""
+#~ "File `%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Izen hori duen fitxategia badago lehendik.\n"
+#~ "Gainidatzi?"
+
+#~ msgid "Save Attachment"
+#~ msgstr "Gorde eranskina"
+
+#~ msgid "Could not create temporary file '%s': %s"
+#~ msgstr "Ezin izan da aldi baterako `%s' fitxategia sortu: %s"
+
+#, fuzzy
+#~ msgid "Save Attachment..."
+#~ msgstr "Gorde eranskina"
+
+#~ msgid "View Inline"
+#~ msgstr "Ikusi barnean"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Ireki honekin: %s..."
+
+#~ msgid "View Inline (via %s)"
+#~ msgstr "Ikusi barnean (%s bidez)"
+
+#~ msgid "Hide"
+#~ msgstr "Ezkutatu"
+
+#~ msgid "External Viewer"
+#~ msgstr "Kanpoko ikustailea"
+
+#, fuzzy
+#~ msgid "Downloading images"
+#~ msgstr "Kargatu iru_diak"
+
+#~ msgid "Loading message content"
+#~ msgstr "Mezuaren edukia kargatzen"
+
+#, fuzzy
+#~ msgid "Overdue:"
+#~ msgstr "A_tzeratutako zereginak:"
+
+#, fuzzy
+#~ msgid "by %B %d, %Y, %l:%M %P"
+#~ msgstr "%b %d %l:%M %p"
+
+#~ msgid "Open Link in Browser"
+#~ msgstr "Ireki esteka arakatzailean"
+
+#~ msgid "Copy Link Location"
+#~ msgstr "Kopiatu estekaren helbidea"
+
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Gorde esteka honela (FIXME) "
+
+#~ msgid "Save Image as..."
+#~ msgstr "Gorde irudia honela..."
+
+#~ msgid "%s attachment"
+#~ msgstr "%s eranskina"
+
+#~ msgid "Could not parse MIME message. Displaying as source."
+#~ msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
+
+#~ msgid "Bad Address"
+#~ msgstr "Helbide okerra"
+
+#~ msgid "Reply-To"
+#~ msgstr "Erantzun honi"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Mezu honek sinadura digitala du.Informazio gehiago ikusteko, egin klik "
+#~ "giltzarrapoaren ikonoan."
+
+#, fuzzy
+#~ msgid "Could not create a PGP verfication context"
+#~ msgstr "Ezin izan da PGP egiaztapen-testuingurua sortu."
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
+
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr ""
+#~ "Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa "
+#~ "dela."
+
+#~ msgid "Pointer to FTP site (%s)"
+#~ msgstr "FTP gunerako erakuslea (%s)"
+
+#~ msgid "Pointer to local file (%s) valid at site \"%s\""
+#~ msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
+
+#~ msgid "Pointer to local file (%s)"
+#~ msgstr "(%s) fitxategi lokalerako erakuslea"
+
+#~ msgid "Pointer to remote data (%s)"
+#~ msgstr "(%s)urruneko datuetarako erakuslea"
+
+#~ msgid "Pointer to unknown external data (\"%s\" type)"
+#~ msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
+
+#~ msgid "Malformed external-body part."
+#~ msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
+
+#~ msgid "However, the message was successfully sent."
+#~ msgstr "Hala ere, mezua ongi bidali da."
+
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Mezu izengabea)"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Mezu izengabea"
+
+#~ msgid "Empty Message"
+#~ msgstr "Mezu hutsa"
+
+#~ msgid "Find in Message"
+#~ msgstr "Bilatu mezuan"
+
+#~ msgid "Case Sensitive"
+#~ msgstr "Maiuskula/minuskula"
+
+#~ msgid "Search Forward"
+#~ msgstr "Bilatu aurrerantz"
+
+#~ msgid "Find:"
+#~ msgstr "Bilatu:"
+
+#~ msgid "Matches:"
+#~ msgstr "Bat datozenak:"
+
+#~ msgid "Forwarded Message"
+#~ msgstr "Birbidalitako mezua"
+
+#~ msgid "(No subject)"
+#~ msgstr "(Gairik ez)"
+
+#~ msgid "%s - Message"
+#~ msgstr "%s - Mezua"
+
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "\"%2$s\"(e)ko %1$s(r)en azpian dauden karpetak eskaneatzen"
+
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "\"%s\"(e)ko erro-mailako karpetan eskaneatzen"
+
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "\"%s\" karpetan harpidetzen"
+
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "\"%s\" karpetaren harpidetza kentzen"
+
+#~ msgid "No server has been selected"
+#~ msgstr "Ez da zerbitzaririk hautatu"
+
+#~ msgid "Please select a server."
+#~ msgstr "Hautatu zerbitzari bat."
+
+#, fuzzy
+#~ msgid "Scanning folders ..."
+#~ msgstr "Gorde karpetan..."
+
+#~ msgid "Save As..."
+#~ msgstr "Gorde honela..."
+
+#~ msgid "Information"
+#~ msgstr "Informazioa"
+
+#~ msgid "Question"
+#~ msgstr "Galdera"
+
+#~ msgid "Message"
+#~ msgstr "Mezua"
+
 #~ msgid "Search"
 #~ msgstr "Bilatu"
 
@@ -28868,9 +29176,6 @@ msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 #~ msgid "Cannot initialize Evolution's mail config component."
 #~ msgstr "Ezin da Evolution-en posta konfiguratzeko osagaia hasieratu."
 
-#~ msgid "Cannot initialize Evolution's folder info component."
-#~ msgstr "Ezin da Evolution-en karpeta-informazioaren osagaia hasieratu."
-
 #~ msgid "Factory to import mbox into Evolution"
 #~ msgstr "mbox Evolution-era inportatzeko fabrika"
 
@@ -28940,9 +29245,6 @@ msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 #~ msgid "Marquette"
 #~ msgstr "Marquette"
 
-#~ msgid "Executive summary component could not initialize Bonobo.\n"
-#~ msgstr "Laneko laburpena egiteko osagaiak ezin izan du Bonobo hasieratu.\n"
-
 #, fuzzy
 #~ msgid "Configuration control for Evolution folder settings."
 #~ msgstr "Evolution-en mezu-prestatzailerako fabrika."
@@ -29637,30 +29939,6 @@ msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 #~ msgid "Could not encrypt: encoding failed."
 #~ msgstr "Ezin izan da enkriptatu: kodetzeak huts egin du."
 
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "Idatzi %s@%s(r)en NNTP pasahitza"
-
-#~ msgid "Server rejected username"
-#~ msgstr "Zerbitzariak erabiltzaile-izena ezetsi du"
-
-#~ msgid "Failed to send username to server"
-#~ msgstr "Huts egin du erabiltzaile-izena zerbitzarira bidaltzean"
-
-#~ msgid "Server rejected username/password"
-#~ msgstr "Zerbitzariak erabiltzaile-izena/pasahitza ezetsi du"
-
-#~ msgid "Internal error: uid in invalid format: %s"
-#~ msgstr "Barne-errorea: uid formatu baliogabean: %s"
-
-#~ msgid "Could not get group list from server."
-#~ msgstr "Ezin izan da talde-zerrenda hartu zerbitzaritik."
-
-#~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr "Ezin da %s(r)en talde-zerrendaren fitxategia kargatu: %s"
-
-#~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr "Ezin da %s(r)en talde-zerrendaren fitxategia gorde: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Ezin izan da 'Nork' helbidea aurkitu mezuan"
 
@@ -29670,67 +29948,6 @@ msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "Evolution-en laneko laburpena egiteko osagaia."
 
-#~ msgid "Cannot initialize Evolution's Executive Summary component."
-#~ msgstr "Ezin da hasieratu Evolution-en laneko laburpena egiteko osagaia."
-
-#~ msgid ""
-#~ "You can select a different HTML page for the background of the Executive "
-#~ "Summary.\n"
-#~ "\n"
-#~ "Just leave it blank for the default"
-#~ msgstr ""
-#~ "Beste HTML orri bat hauta dezakezu Laneko Laburpenaren atzeko planorako.\n"
-#~ "\n"
-#~ "Utzi hutsik lehenetsirako"
-
-#~ msgid "Open %s with the default GNOME application"
-#~ msgstr "Ireki %s GNOME aplikazio lehenetsiarekin"
-
-#~ msgid "Open %s with the default GNOME web browser"
-#~ msgstr "Ireki %s GNOME web arakatzaile lehenetsiarekin"
-
-#~ msgid "Send an email to %s"
-#~ msgstr "Bidali mezua -> %s"
-
-#~ msgid "Run %s"
-#~ msgstr "Exekutatu %s"
-
-#~ msgid "Close %s"
-#~ msgstr "Itxi %s"
-
-#~ msgid "Move %s to the left"
-#~ msgstr "Eraman %s ezkerrera"
-
-#~ msgid "Move %s to the right"
-#~ msgstr "Eraman %s eskuinera"
-
-#~ msgid "Move %s into the previous row"
-#~ msgstr "Eraman %s aurreko errenkadara"
-
-#~ msgid "Move %s into the next row"
-#~ msgstr "Eraman %s hurrengo errenkadara"
-
-#
-#~ msgid "page"
-#~ msgstr "orrialdea"
-
-#~ msgid ""
-#~ "Cannot open the HTML file:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ezin da HTML fitxategia ireki:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Error reading data:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Errorea datuak irakurtzean:\n"
-#~ "%s"
-
-#~ msgid "File does not have a place for the services.\n"
-#~ msgstr "Fitxategiak ez du lekurik zerbitzuentzat.\n"
-
 #~ msgid ""
 #~ "Executive summary component could not initialize Bonobo.\n"
 #~ "If there was a warning message about the RootPOA, it probably means\n"
@@ -29758,15 +29975,6 @@ msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 #~ msgid "Test service"
 #~ msgstr "Proba-zerbitzua"
 
-#~ msgid "Update automatically"
-#~ msgstr "Eguneratu automatikoki"
-
-#~ msgid "Update now"
-#~ msgstr "Eguneratu orain"
-
-#~ msgid "Update every "
-#~ msgstr "Eguneratze-maiztasuna"
-
 #~ msgid "Enter folder URI"
 #~ msgstr "Idatzi karpetaren URIa"
 
diff --git a/po/fi.po b/po/fi.po
index 511ab14fd7..b1c6550f8f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-06-25 13:24-0400\n"
+"POT-Creation-Date: 2003-10-15 23:45+0200\n"
 "PO-Revision-Date: 2003-04-06 20:59+0300\n"
 "Last-Translator: Sami Pesonen <sampeson@iki.fi>\n"
 "Language-Team: Gnome Finnish Translation Team <laatu@gnome-fi.org>\n"
@@ -14,67 +14,201 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Evolutionin asennus"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Evolution"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
-msgid "Evolution VCard importer"
-msgstr "Evolution"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Koko nimi"
+
 #: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Osoite"
+
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Osoitteen nimike"
+
+#: addressbook/backend/ebook/e-card.c:1340
+#, fuzzy
+msgid "Phone"
+msgstr "Määrittelemätön"
+
 #: addressbook/backend/ebook/e-card.c:1347
+#: addressbook/backend/ebook/e-card-simple.c:62
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Sähköposti"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr "Ensisijainen"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Syntymäpäivä"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "Ensisij"
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL:"
 
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisaatio"
+
+#: addressbook/backend/ebook/e-card.c:1374
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organisaatio"
+
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Asema"
+
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rooli"
+
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
 #: addressbook/gui/contact-editor/e-contact-editor.c:1737
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Kutsumanimi"
+
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Puoliso"
+
+#: addressbook/backend/ebook/e-card.c:1430
+#: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniversary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1436
+#, fuzzy
+msgid "Mailer"
+msgstr "_Matkapuhelin"
+
+#: addressbook/backend/ebook/e-card.c:1443
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Calendar URI"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1450
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "Edellinen viesti"
+
+#: addressbook/backend/ebook/e-card.c:1457
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Kalenteri"
+
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Asiaan liittyvät yhteystiedot"
+
+#: addressbook/backend/ebook/e-card.c:1478
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Ryhmät"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Ryhmäluettelo"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "List"
+msgstr "Pakistan"
+
+#: addressbook/backend/ebook/e-card.c:1513
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Muu osoite"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Arbitrary"
+
+#: addressbook/backend/ebook/e-card.c:1527
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+#: addressbook/backend/ebook/e-card.c:1534
+#, fuzzy
+msgid "Last Use"
+msgstr "Liitä"
+
+#: addressbook/backend/ebook/e-card.c:1545
+#, fuzzy
+msgid "Use Score"
+msgstr "Peruuta"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
+msgstr "Ensisijainen"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
+msgstr "Ensisij"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -109,12 +243,6 @@ msgid "Home"
 msgstr "Koti"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisaatio"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr ""
 
@@ -233,21 +361,9 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Asema"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Asm"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr ""
-
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -258,12 +374,6 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr ""
 
@@ -272,32 +382,9 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Kutsumanimi"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Puoliso"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr ""
-
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr ""
@@ -321,11 +408,6 @@ msgid "icsCalendar"
 msgstr "Kalenteri"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr ""
 
@@ -333,12 +415,6 @@ msgstr ""
 msgid "Birth Date"
 msgstr "Syntymäpäivä"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Ryhmät"
-
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Sukunimi"
@@ -354,116 +430,33 @@ msgid "%x"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
+#: addressbook/backend/ebook/e-destination.c:709
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Nimetön kontaktiluettelo"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Koko nimi"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Osoite"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Osoitteen nimike"
-
-#: addressbook/backend/ebook/e-card.c:1340
-#, fuzzy
-msgid "Phone"
-msgstr "Määrittelemätön"
-
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Syntymäpäivä"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL:"
-
-#: addressbook/backend/ebook/e-card.c:1374
-#, fuzzy
-msgid "Organizational Unit"
-msgstr "Organisaatio"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rooli"
-
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr "_Matkapuhelin"
-
-#: addressbook/backend/ebook/e-card.c:1450
-#, fuzzy
-msgid "Free/Busy URL"
-msgstr "Edellinen viesti"
-
-#: addressbook/backend/ebook/e-card.c:1457
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 #, fuzzy
-msgid "ICS Calendar"
-msgstr "Kalenteri"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Asiaan liittyvät yhteystiedot"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Ryhmäluettelo"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
+msgid "Evolution LDIF importer"
+msgstr "Evolutionin asennus"
 
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1506
-#, fuzzy
-msgid "List"
-msgstr "Pakistan"
-
-#: addressbook/backend/ebook/e-card.c:1513
-#, fuzzy
-msgid "List Show Addresses"
-msgstr "Muu osoite"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Arbitrary"
-
-#: addressbook/backend/ebook/e-card.c:1527
-#, fuzzy
-msgid "ID"
-msgstr "I"
-
-#: addressbook/backend/ebook/e-card.c:1534
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Last Use"
-msgstr "Liitä"
+msgid "Evolution VCard Importer"
+msgstr "Evolution"
 
-#: addressbook/backend/ebook/e-card.c:1545
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 #, fuzzy
-msgid "Use Score"
-msgstr "Peruuta"
+msgid "Evolution VCard importer"
+msgstr "Evolution"
 
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:171
-msgid "Could not initialize Bonobo"
-msgstr "Bonobon alustus ei onnistunut"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -524,14 +517,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr ""
 
@@ -540,141 +533,6 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Tallenna osoitekirjaan"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:620
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Yhteystiedot"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP-palvelin"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Julkiset yhteystiedot"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Yhteystietoja sisältävä julkinen kansio"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "New Contact"
-msgstr "Uusi yhteystieto"
-
-#: addressbook/gui/component/addressbook-component.c:574
-msgid "_Contact"
-msgstr "_Yhteystieto"
-
-#: addressbook/gui/component/addressbook-component.c:575
-msgid "Create a new contact"
-msgstr "Luo uusi yhteystieto"
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
-msgstr "Uusi yhteystietoluettelo"
-
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "Contact _List"
-msgstr "_Yhteystietoluettelo"
-
-#: addressbook/gui/component/addressbook-component.c:579
-msgid "Create a new contact list"
-msgstr "Luo uusi yhteystietoluettelo"
-
-#: addressbook/gui/component/addressbook-config.c:206
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Yhdistäminen palvelimeen epäonnistui."
-
-#: addressbook/gui/component/addressbook-config.c:231
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr "Yhdistäminen palvelimeen epäonnistui."
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Tilin nimi"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Palvelimen nimi"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Muut yhteystiedot"
-
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -785,6 +643,103 @@ msgstr ""
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:628
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP-palvelin"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Julkiset yhteystiedot"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Yhteystietoja sisältävä julkinen kansio"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "New Contact"
+msgstr "Uusi yhteystieto"
+
+#: addressbook/gui/component/addressbook-component.c:582
+msgid "_Contact"
+msgstr "_Yhteystieto"
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "Create a new contact"
+msgstr "Luo uusi yhteystieto"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "New Contact List"
+msgstr "Uusi yhteystietoluettelo"
+
+#: addressbook/gui/component/addressbook-component.c:586
+msgid "Contact _List"
+msgstr "_Yhteystietoluettelo"
+
+#: addressbook/gui/component/addressbook-component.c:587
+msgid "Create a new contact list"
+msgstr "Luo uusi yhteystietoluettelo"
+
+#: addressbook/gui/component/addressbook-config.c:206
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Yhdistäminen palvelimeen epäonnistui."
+
+#: addressbook/gui/component/addressbook-config.c:231
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr "Yhdistäminen palvelimeen epäonnistui."
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Tilin nimi"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Palvelimen nimi"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Muut yhteystiedot"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -813,33 +768,71 @@ msgstr "Luo uusi yhteystieto \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Lisää osoite olemassaolevaan yhteystietoon \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:914
+#: addressbook/gui/component/e-address-popup.c:917
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:998
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-popup.c:1001
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1028
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Lisää yhteystietoihin"
 
-#: addressbook/gui/component/e-address-popup.c:1053
+#: addressbook/gui/component/e-address-popup.c:1056
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Disable Queries"
 msgstr "Älä salli kyselyjä"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr "Salli kyselyt (Vaarallista!)"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Tallenna osoitekirjaan"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -985,10 +978,9 @@ msgstr ""
 msgid "S_earch scope: "
 msgstr "_Etsi viestiä"
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1256
+#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
+#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
 #, fuzzy
 msgid "Searching"
 msgstr "Etsitään..."
@@ -1179,11 +1171,11 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Muokkaa"
 
@@ -1229,20 +1221,24 @@ msgstr "Yleiset"
 msgid "searching-tab"
 msgstr "Etsitään..."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Poista kaikki"
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Etsi yhteystieto"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Poista"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Poista kaikki"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
@@ -1267,14 +1263,10 @@ msgstr "Nimetön yhteystieto"
 msgid "Source"
 msgstr "Lähde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Etsi yhteystieto"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
 msgid "Find"
@@ -1349,7 +1341,7 @@ msgid "D_epartment:"
 msgstr "_Osasto:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:197
+#: calendar/gui/dialogs/task-editor.c:200
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
@@ -1420,11 +1412,13 @@ msgid "_Categories..."
 msgstr "Ry_hmät..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
-#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -1469,15 +1463,15 @@ msgid "_Web page address:"
 msgstr "_Kotisivun osoite:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
+#: addressbook/gui/widgets/e-minicard.c:183
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #, fuzzy
 msgid "Editable"
 msgstr "Käytä"
@@ -2509,17 +2503,17 @@ msgstr "Zimbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #: addressbook/gui/widgets/e-minicard-view.c:464
+#: addressbook/gui/widgets/e-minicard-view-widget.c:106
 msgid "Book"
 msgstr "Kirja"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
+#: addressbook/gui/widgets/e-minicard-widget.c:93
 msgid "Card"
 msgstr "Kortti"
 
@@ -2748,7 +2742,7 @@ msgstr "Uusi"
 msgid "Contact List Editor"
 msgstr "Yhteystiedonhallinta"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2790,7 +2784,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
@@ -2809,10 +2803,10 @@ msgid "%d cards"
 msgstr "%d korttia"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #: addressbook/gui/widgets/e-minicard-view.c:471
+#: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #, fuzzy
 msgid "Query"
 msgstr "Saksa"
@@ -2822,256 +2816,255 @@ msgstr "Saksa"
 msgid "Error getting book view"
 msgstr "Virhe %s:n käynnistyksessä"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 #, fuzzy
 msgid "Model"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1210
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:785
-#: camel/camel-service.c:875 camel/camel-service.c:917
-#: camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
+#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Peruutettu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Failed"
 msgstr "Todennus epäonnistui"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Addressbook does not exist"
 msgstr "Osoitekirjaa ei ole olemassa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 msgid "Other error"
 msgstr "Muu virhe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 #, fuzzy
 msgid "_Discard"
 msgstr "Tulosta kortti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 msgid "Error adding card"
 msgstr "Virhe kortin lisäämisessä"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 msgid "Error removing card"
 msgstr "Virhe kortin poistossa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 #, fuzzy
 msgid "Move card to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 #, fuzzy
 msgid "Copy card to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 #, fuzzy
 msgid "Move cards to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, c-format
 msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tyyppi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.c:398
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Osoitekirja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-#: addressbook/gui/widgets/e-addressbook-view.c:895
-#: addressbook/gui/widgets/e-addressbook-view.c:1879
+#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1883
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "New Contact..."
 msgstr "Uusi yhteystieto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "New Contact List..."
 msgstr "Uusi yhteystietoluettelo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #, fuzzy
 msgid "Import..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Search for Contacts..."
 msgstr "Etsi yhteystietoja..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Addressbook Sources..."
 msgstr "Osoitekirjan lähteet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Sähköpostiasetukset..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Send Message to Contact"
 msgstr "Lähetä viesti yhteystiedolle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Kopioi kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Siirrä kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:912
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopioi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Liitä"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Poista"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: calendar/gui/e-cal-view.c:1109
 #, fuzzy
 msgid "Current View"
 msgstr "_Nykyinen näkymä"
@@ -3080,7 +3073,7 @@ msgstr "_Nykyinen näkymä"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:949
+#: addressbook/gui/widgets/e-addressbook-view.c:953
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3088,11 +3081,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:954
+#: addressbook/gui/widgets/e-addressbook-view.c:958
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1352
+#: addressbook/gui/widgets/e-addressbook-view.c:1356
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3160,36 +3153,45 @@ msgstr "Muu puhelin"
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: addressbook/gui/widgets/e-minicard-control.c:204
-#, c-format
-msgid "and %d other cards."
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:206
-msgid "and one other card."
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-control.c:318
-msgid "Save in addressbook"
-msgstr "Tallenna osoitekirjaan"
-
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #, fuzzy
 msgid "Width"
 msgstr "Leveys:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:153
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #, fuzzy
 msgid "Height"
 msgstr "Korkeus:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:161
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Poistettu"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:204
+#, c-format
+msgid "and %d other cards."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:206
+msgid "and one other card."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:318
+msgid "Save in addressbook"
+msgstr "Tallenna osoitekirjaan"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3208,11 +3210,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-#, fuzzy
-msgid "Column Width"
-msgstr "Kolumbia"
-
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3233,14 +3230,10 @@ msgstr ""
 msgid "Adapter"
 msgstr "Sovitin"
 
-#: addressbook/gui/widgets/e-minicard.c:169
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
 #, fuzzy
-msgid "Selected"
-msgstr "Poistettu"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr ""
+msgid "Column Width"
+msgstr "Kolumbia"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3251,20 +3244,20 @@ msgstr ""
 msgid "GTK Tree View"
 msgstr "Viikko"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Tulosta kirjekuori"
-
-#: addressbook/printing/e-contact-print.c:1139
+#: addressbook/printing/e-contact-print.c:1158
 msgid "Print cards"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1204
-#: addressbook/printing/e-contact-print.c:1226
+#: addressbook/printing/e-contact-print.c:1224
+#: addressbook/printing/e-contact-print.c:1250
 msgid "Print card"
 msgstr "Tulosta kortti"
 
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Tulosta kirjekuori"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3434,6 +3427,63 @@ msgstr "Leveys:"
 msgid "_Font..."
 msgstr "_Kirjasin..."
 
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "Muu osoite"
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "Ei kortteja"
+
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "I/O-virhe"
+
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr ""
@@ -3563,28 +3613,30 @@ msgid "31st"
 msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:912
 msgid "High"
 msgstr "Korkea"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
+#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:910
 msgid "Low"
 msgstr "Matala"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
@@ -3592,13 +3644,13 @@ msgstr "Määrittelemätön"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3607,82 +3659,35 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "_Prioriteetti:"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalenteri ja tehtävät"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalenteri ja tehtävät"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolutionin tilimuokkain"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 #, fuzzy
 msgid "Starting:"
 msgstr "Asetukset"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 #, fuzzy
 msgid "Ending:"
 msgstr "Varjostus"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr "epäkelpo aika"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Sulje"
 
@@ -3698,16 +3703,25 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "_Muokkaa tapaamista"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr "Varoitus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3715,7 +3729,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3726,70 +3740,80 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tätä enää uudelleen"
 
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize Bonobo"
+msgstr "Bonobon alustus ei onnistunut"
+
+#: calendar/gui/alarm-notify/notify-main.c:176
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs:n alustus ei onnistunut"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
+#: calendar/gui/alarm-notify/notify-main.c:185
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Yhteenveto sisältää"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Kuvaus sisältää"
+#: calendar/gui/calendar-commands.c:376
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentti sisältää"
+#: calendar/gui/calendar-commands.c:382
+#, fuzzy
+msgid "Purge events older than"
+msgstr "on pienempi kuin"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
-msgid "Unmatched"
-msgstr ""
+#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "päivää"
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:485
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
+#: calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:497
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:518
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:849
+#: calendar/gui/calendar-commands.c:918
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3809,11 +3833,11 @@ msgstr "Tulosta kalenteri"
 msgid "Public folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Tehtävät"
@@ -3888,105 +3912,6 @@ msgstr "Koko _päivän tapaaminen"
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr "Henkilökohtainen"
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Luottamuksellinen"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Julkinen"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "P"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "I"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "L"
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-#, fuzzy
-msgid "Free"
-msgstr "Pe"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1204
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
-#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
-msgstr "Määrittelemätön"
-
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
-msgstr "Kyllä"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
-msgstr "Ei"
-
 #: calendar/gui/calendar-view-factory.c:118
 #, fuzzy
 msgid "Day View"
@@ -4007,53 +3932,74 @@ msgstr "Viikko"
 msgid "Month View"
 msgstr "Kuukausi"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/calendar-view-factory.c:130
+#, fuzzy
+msgid "List View"
+msgstr "_Nykyinen näkymä"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Yhteenveto sisältää"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Kuvaus sisältää"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentti sisältää"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:462
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:125
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:171
 msgid "The URI that the calendar will display"
 msgstr "URI jonka kalenteri näyttää"
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:178
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:420
+#: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:429
+#: calendar/gui/dialogs/alarm-options.c:475
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Vastaanottajat"
 
-#: calendar/gui/dialogs/alarm-options.c:438
+#: calendar/gui/dialogs/alarm-options.c:484
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Näytä asetukset"
 
-#: calendar/gui/dialogs/alarm-options.c:447
+#: calendar/gui/dialogs/alarm-options.c:493
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:456
+#: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -4093,10 +4039,6 @@ msgstr "Lähetä"
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "päivää"
-
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr ""
@@ -4110,7 +4052,8 @@ msgstr "Päivitä joka"
 msgid "hours"
 msgstr "tuntia"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minuutti"
 
@@ -4125,12 +4068,12 @@ msgstr ""
 msgid "Date/Time:"
 msgstr "Päiväys & Aika"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 #, fuzzy
 msgid "Display a message"
 msgstr "Kirjoita viesti"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr ""
 
@@ -4138,7 +4081,7 @@ msgstr ""
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr "Aja ohjelma"
 
@@ -4149,7 +4092,8 @@ msgstr "Lähetä sähköpostia"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -4234,7 +4178,7 @@ msgstr "päivää"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr "Perjantai"
 
@@ -4250,7 +4194,7 @@ msgstr "minuutti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -4261,7 +4205,7 @@ msgstr "Su"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr "Lauantai"
 
@@ -4276,7 +4220,7 @@ msgstr "Näytä viikkonumerot"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -4296,7 +4240,7 @@ msgstr "Tehtävät"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr "Torstai"
 
@@ -4317,7 +4261,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr "Tiistai"
 
@@ -4327,12 +4271,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "Work Week"
 msgstr "Työviikk_o"
@@ -4454,76 +4398,50 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Haluatko varmasti peruuttaa ja poistaa tämän päiväkirjamerkinnän?"
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Tuntematon virhe: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
-msgid " (Completed "
-msgstr " (Valmis "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
-#, fuzzy
-msgid "Completed "
-msgstr "Valmis"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
-msgid "Due "
-msgstr ""
-
 #: calendar/gui/dialogs/comp-editor.c:334
 #, fuzzy
 msgid "Could not update invalid object"
@@ -4571,21 +4489,48 @@ msgid "No summary"
 msgstr "Ei kuvausta"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
-#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/dialogs/comp-editor.c:1406
-#: calendar/gui/dialogs/comp-editor.c:1432
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1459
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Tuntematon virhe: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
+msgid " (Completed "
+msgstr " (Valmis "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
+#, fuzzy
+msgid "Completed "
+msgstr "Valmis"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
+msgid "Due "
+msgstr ""
+
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4690,33 +4635,33 @@ msgstr "Poistettu"
 msgid "Enter Delegate"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 #, fuzzy
 msgid "Scheduling"
 msgstr "Varjostus"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
 msgid "Start date is wrong"
 msgstr ""
 
@@ -4753,9 +4698,8 @@ msgid "Classification"
 msgstr "Luokittelu"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
-msgid "Con_fidential"
+msgid "Co_nfidential"
 msgstr "Luottamuksellinen"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
@@ -4786,7 +4730,6 @@ msgid "Pu_blic"
 msgstr "Ju_lkinen"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "Näytä"
@@ -4804,78 +4747,35 @@ msgstr "_Loppumisaika:"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
+#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
+#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+msgid "None"
+msgstr "Määrittelemätön"
+
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:630
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Poista..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Osanottaja"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-#, fuzzy
-msgid "Delegated From"
-msgstr "Poistettu"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-#, fuzzy
-msgid "Delegated To"
-msgstr "Poistettu"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-#, fuzzy
-msgid "Member"
-msgstr "Joulukuu"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Tila"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4887,7 +4787,7 @@ msgid "_Change Organizer"
 msgstr "Organisoija:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr ""
 
@@ -5044,7 +4944,7 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5069,53 +4969,84 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Valmis"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#, fuzzy, no-c-format
+msgid "% _Complete"
 msgstr "% Valmis"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311
+msgid "Completed"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
+msgid "In Progress"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305
+msgid "Not Started"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Date Completed:"
+msgstr " (Valmis "
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Prioriteetti:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "_Kotisivun osoite:"
+
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:204
-#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.c:480
+#: calendar/gui/dialogs/task-page.c:482
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.c:542
+msgid "Due date is before start date!"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:4
+#, fuzzy
+msgid "Con_fidential"
+msgstr "Luottamuksellinen"
+
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Kuvaus:"
@@ -5128,228 +5059,264 @@ msgstr "_Alkamispäivä:"
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr "%d päivää"
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr "1 päivä"
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr "%d viikkoa"
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr "1 viikko"
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr "%d tuntia"
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr "1 tunti"
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuuttia"
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr "1 minuutti"
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekuntia"
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr "1 sekunti"
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr "Lähetä sähköpostia"
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s ennen tapaamisen alkua"
 
-#: calendar/gui/e-alarm-list.c:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s tapaamisen alun jälkeen"
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s tapaamisen alussa"
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s ennen tapaamisen loppumista"
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s tapaamisen päättymisen jälkeen"
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s tapaamisen lopussa"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
+#: calendar/gui/e-cal-model.c:287
+msgid "Public"
+msgstr "Julkinen"
+
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
+msgid "Private"
+msgstr "Henkilökohtainen"
+
+#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
+msgid "Confidential"
+msgstr "Luottamuksellinen"
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1933
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
+#, fuzzy
+msgid "Free"
+msgstr "Pe"
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:393
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
-#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Avaa"
 
-#: calendar/gui/e-calendar-table.c:959
+#: calendar/gui/e-calendar-table.c:989
 #, fuzzy
-msgid "_Save as..."
-msgstr "Tallenna nimellä..."
+msgid "Open _Web Page"
+msgstr "_Avaa viesti"
+
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Save As..."
+msgstr "Tallenna _nimellä..."
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
+#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
-#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
+#: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
-#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
+#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "L_iitä"
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Forward as iCalendar"
 msgstr "_Välitä iCalendar-muodossa"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Poista tehtävä"
 
-#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
-#: calendar/gui/e-week-view.c:4335
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Valmis"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr "Valmis"
 
@@ -5358,11 +5325,12 @@ msgid "Completion Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr ""
+#, fuzzy
+msgid "Description"
+msgstr "Kuvaus:"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
+msgid "Due Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:11
@@ -5373,622 +5341,671 @@ msgstr ""
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Tila"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Kuvaus"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr " "
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+#: calendar/gui/e-calendar-table.etspec.h:20
+#, fuzzy
+msgid "component"
+msgstr "Tapaaminen"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
+#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
+#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: calendar/gui/e-cal-model.c:828
+msgid "Recurring"
 msgstr ""
-"Päiväys tulee antaa seuraavassa muodossa: \n"
-"\n"
-"%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/e-cal-model.c:830
+msgid "Assigned"
 msgstr ""
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1421
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
-msgid "%A %d %B"
-msgstr "%A %d %B"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "Yes"
+msgstr "Kyllä"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
+#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
+msgid "No"
+msgstr "Ei"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "P"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "E"
 
-#: calendar/gui/e-day-view.c:3694
-msgid "New _Appointment"
-msgstr "Uusi t_apaaminen"
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr "I"
 
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "L"
+
+#: calendar/gui/e-cal-model-tasks.c:550
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+msgid "New _Appointment..."
+msgstr "Uusi t_apaaminen..."
+
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
 #, fuzzy
 msgid "New Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
 msgid "New Task"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Tulosta..."
-
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
+#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
 msgid "_Go to Date..."
 msgstr "Siirry _päivään..."
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
-#: ui/evolution-calendar.xml.h:34
+#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
+#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
 #: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Sähköpostiasetukset..."
 
-#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
-#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr "Tallenna _nimellä..."
-
-#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
+#: calendar/gui/e-cal-view.c:1139
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Varjostus"
 
-#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
+#: calendar/gui/e-cal-view.c:1140
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
+#: calendar/gui/e-cal-view.c:1145
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:706
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Päiväys tulee antaa seuraavassa muodossa: \n"
+"\n"
+"%s"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
+msgid "%A %d %B"
+msgstr "%A %d %B"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d %b"
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:676
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 #, fuzzy
 msgid "Every day"
 msgstr "Joka"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr " %d päivää"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "Every week"
 msgstr "Joka"
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr " %d viikkoa"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr " %d viikkoa"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 #, fuzzy
 msgid "every month"
 msgstr "Yksi kuukausi"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 #, fuzzy
 msgid "Every year"
 msgstr "Joka"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 msgid "<b>Ends:</b> "
 msgstr "<b>Loppuu:</b> "
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Completed:</b> "
 msgstr "<b>Valmis:</b> "
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Pakolliset tiedot"
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Kalenteri"
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1005
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 #, fuzzy
 msgid "Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
-#: calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
-#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:446
 #, fuzzy
 msgid "Declined"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
-#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 msgid "Update"
 msgstr "Päivitä"
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 #, fuzzy
 msgid "Decline"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1172
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Lähteen tiedot"
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> on julkaissut tapaamistietonsa."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pyytää %s läsnäoloa tapaamisessa."
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1309
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät tapaamistiedot."
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> on vastannut tapaamispyyntöön."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> on peruuttanut tapaamisen."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> on julkaissut tehtävätietonsa."
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 #, fuzzy
 msgid "Task Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pyytää %s tekemään työtehtävän."
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1381
 #, fuzzy
 msgid "Task Update"
 msgstr "Tehtävät"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät työtehtävätiedot."
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Tehtävät"
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> on vastannut työtehtävän antoon."
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 #, fuzzy
 msgid "Task Reply"
 msgstr "Vastaa"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1402
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Peruuta operaatio"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 msgid "Bad Task Message"
 msgstr "Huono tehtävä-sanoma"
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> on julkaissut vapaa/kiireinen-tietonsa."
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Lähteen tiedot"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pyytää sinun vapaa/varattu -tietoja."
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> on vastannut vapaa/varattu -kyselyyn."
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddya ei voitu ajaa."
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenteritiedostoa ei voitu päivittää!\n"
 
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 msgid "Attendee status could not be updated!\n"
 msgstr "Osallistujan tilan päivitys epäonnistui!\n"
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Lähetetty"
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Valitse kansio"
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Valitse kansio"
@@ -6030,259 +6047,283 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:79
-msgid "Chair Persons"
-msgstr "Toimi puheenjohtajana"
-
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
-#, fuzzy
-msgid "Required Participants"
-msgstr "Pakolliset tiedot"
-
-#: calendar/gui/e-meeting-model.c:81
-#, fuzzy
-msgid "Optional Participants"
-msgstr "Valinnaiset tiedot"
-
-#: calendar/gui/e-meeting-model.c:82
-#, fuzzy
-msgid "Resources"
-msgstr "Paperilähde:"
-
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
-msgid "Individual"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
-#, fuzzy
-msgid "Group"
-msgstr "Ryhmän nimi:"
-
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
-#, fuzzy
-msgid "Resource"
-msgstr "Paperilähde:"
-
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
-msgid "Room"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
-msgid "Chair"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
-msgid "Required Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
-msgid "Optional Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
-#, fuzzy
-msgid "Needs Action"
-msgstr "Lisää toiminto"
-
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
-#, fuzzy
-msgid "Delegated"
-msgstr "Poistettu"
-
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#, fuzzy
-msgid "In Process"
-msgstr "Ammatti"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
+#: calendar/gui/e-meeting-time-sel.c:541
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:563
+#: calendar/gui/e-meeting-time-sel.c:550
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:572
+#: calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
-#: calendar/gui/gnome-cal.c:2017
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2054
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2087
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Osanottaja"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#, fuzzy
+msgid "Delegated From"
+msgstr "Poistettu"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#, fuzzy
+msgid "Delegated To"
+msgstr "Poistettu"
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#, fuzzy
+msgid "Member"
+msgstr "Joulukuu"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
+msgstr "epäkelpo aika"
+
+#: calendar/gui/e-tasks.c:221
+#, fuzzy
+msgid "Start Date:"
+msgstr "_Alkamispäivä:"
+
+#: calendar/gui/e-tasks.c:237
+#, fuzzy
+msgid "Due Date:"
+msgstr "Päiväys:"
+
+#. write priority
+#: calendar/gui/e-tasks.c:265
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioriteetti:"
+
+#. URL
+#: calendar/gui/e-tasks.c:321
+#, fuzzy
+msgid "Web Page:"
+msgstr "Sivu"
+
+#: calendar/gui/e-tasks.c:702
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:746
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Virhe %s:n käynnistyksessä"
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:899
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:922
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1017
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3581
-msgid "New _Appointment..."
-msgstr "Uusi t_apaaminen..."
-
-#: calendar/gui/gnome-cal.c:1481
+#: calendar/gui/gnome-cal.c:1702
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1716
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1556
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Lisätään hälytyksiä %s varten"
 
-#: calendar/gui/gnome-cal.c:1748
+#: calendar/gui/gnome-cal.c:1964
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1757
+#: calendar/gui/gnome-cal.c:1970
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1988
+#: calendar/gui/gnome-cal.c:2176
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2028
+#: calendar/gui/gnome-cal.c:2197
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Synkronoidaan kansiota"
 
+#: calendar/gui/gnome-cal.c:3094
+#, fuzzy, c-format
+msgid "Purging event %s"
+msgstr "Lähetetään \"%s\""
+
+#: calendar/gui/gnome-cal.c:3178
+#, fuzzy
+msgid "Purging"
+msgstr "Turkkilainen"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalenteri ja tehtävät"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalenteri ja tehtävät"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolutionin tilimuokkain"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Huhtikuu"
@@ -6396,7 +6437,7 @@ msgstr "Lähteen tiedot"
 msgid "iCalendar information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6429,83 +6470,82 @@ msgid "Sa"
 msgstr "La"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1882
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1919
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1927
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1934
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2262
 #, fuzzy
 msgid "Task"
 msgstr "_Tehtävä"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2321
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Tila:"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2338
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioriteetti:"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2350
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2362
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2387
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2559
 msgid "Print Item"
 msgstr "Tulosta kohta"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2632
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
@@ -6513,7 +6553,7 @@ msgstr "Tulostusasetukset"
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:465
+#: calendar/gui/tasks-control.c:448
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6521,12 +6561,12 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:468
+#: calendar/gui/tasks-control.c:451
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Älä kysy tätä enää uudelleen"
 
-#: calendar/gui/tasks-control.c:610
+#: calendar/gui/tasks-control.c:593
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tulosta kortti"
@@ -8230,27 +8270,27 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:167
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:207
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:251
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:293
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:331
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:363
 msgid "You may not export keys with this cipher"
 msgstr ""
 
@@ -8283,7 +8323,11 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:351
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Poistetaan kansiota %s"
@@ -8304,57 +8348,57 @@ msgstr "Viestin salauksen purkaminen epäonnistui."
 msgid "Failed to create create child process '%s': %s"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestiä %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr "Viestiä ei voida avata"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viestiä %d / %d"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
@@ -8377,54 +8421,59 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:346
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:356
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:653
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
-#: camel/camel-folder.c:583
+#: camel/camel-folder.c:585
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1161
+#: camel/camel-folder.c:1163
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1201
+#: camel/camel-folder.c:1203
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1319
+#: camel/camel-folder.c:1321
 #, fuzzy
 msgid "Moving messages"
 msgstr "Lähetetään viestiä"
 
-#: camel/camel-folder.c:1319
+#: camel/camel-folder.c:1321
 #, fuzzy
 msgid "Copying messages"
 msgstr "Lähetetään viestiä"
 
+#: camel/camel-folder.c:1571
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Haetaan %d viesti(ä)"
+
+#: camel/camel-folder-search.c:348
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:358
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:650
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8450,7 +8499,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr "Peruutettu."
 
@@ -8507,45 +8556,45 @@ msgstr ""
 "Viestin allekirjoitusta ei voida varmentaa: väliaikaistiedostoa ei voitu "
 "luoda: %s"
 
-#: camel/camel-lock-client.c:111
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:124
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:215
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "Lukitus epäonnistui: %s"
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
+msgid "Could not lock '%s'"
+msgstr "Lukitus epäonnistui: %s"
 
 #: camel/camel-movemail.c:107
 #, c-format
@@ -8613,11 +8662,11 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 #, fuzzy
 msgid "parse error"
 msgstr "Muu virhe"
@@ -8682,11 +8731,11 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:46
+#: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:50
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8778,7 +8827,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1207
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8835,24 +8884,24 @@ msgstr "Tämä valitsin yhdistää palvelimeen yksinkertaista salasanaa käyttä
 msgid "PLAIN"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 #, fuzzy
 msgid "POP Source URI"
 msgstr "Lähde"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
@@ -8861,56 +8910,56 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:285
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:293
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:738
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:783 camel/camel-service.c:915
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Putken luonti epäonnistui: %s"
 
-#: camel/camel-service.c:818
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:880
+#: camel/camel-service.c:860
 #, fuzzy
 msgid "Resolving address"
 msgstr "Poistetaan kansiota %s"
 
-#: camel/camel-service.c:949
+#: camel/camel-service.c:929
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:952
+#: camel/camel-service.c:932
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8922,12 +8971,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:350 camel/camel-session.c:400
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:523
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8973,134 +9022,134 @@ msgstr "Viestin salauksen purkaminen epäonnistui."
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:212
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Kansion hakeminen ei onnistu: virheellinen toiminto tässä tallennuspaikassa"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kansion luominen ei onnistu: virheellinen tapahtuma tallennuspaikassa"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Allekirjoitustiedosto:"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Virhe %s:n lataamisessa"
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9109,15 +9158,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9130,7 +9179,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9140,28 +9189,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9173,17 +9222,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' jäsentäminen epäonnistui"
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Virhe %s:n käynnistyksessä"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Viestien kopioiminen tai siirtäminen ei onnistu virtuaalisiin kansioihin"
@@ -9211,12 +9260,12 @@ msgstr "Kansion nimeäminen ei onnistu: %s: kansiota ei löydy"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2806
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2809
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9255,62 +9304,62 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr "Etsitään muuttuneita viestejä"
 
-#: camel/providers/imap/camel-imap-folder.c:1883
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1943
-#: camel/providers/imap/camel-imap-folder.c:2539
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr "Tätä viestiä ei ole juuri nyt saatavilla"
 
-#: camel/providers/imap/camel-imap-folder.c:2203
-#: camel/providers/imap/camel-imap-folder.c:2273
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2577
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9360,87 +9409,103 @@ msgstr ""
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "T_arkasta onko uutta postia joka"
+
+#: camel/providers/imap/camel-imap-provider.c:65
 #, fuzzy
 msgid "IMAP"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:67
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Salasana"
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa käyttäen."
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:461
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/imap/camel-imap-store.c:589
+#: camel/providers/imap/camel-imap-store.c:821
+#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:655
+#: camel/providers/imap/camel-imap-store.c:686
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:687
 #: camel/providers/pop3/camel-pop3-store.c:261
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Todennus epäonnistui."
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:824
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+
+#: camel/providers/imap/camel-imap-store.c:1237
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9448,42 +9513,70 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1660
+#: camel/providers/imap/camel-imap-store.c:1802
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:2003
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2015
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:2051
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAPv4"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "Lähetä viesti yhteystiedolle"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:379
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:383
+#: camel/providers/local/camel-local-folder.c:386
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:390
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -9538,52 +9631,56 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-mbox-store.c:305
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:364
+#: camel/providers/local/camel-mbox-store.c:474
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:387
+#: camel/providers/local/camel-mbox-store.c:258
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:397
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9599,18 +9696,18 @@ msgstr ""
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr ""
 
@@ -9624,7 +9721,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:157
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9687,29 +9784,29 @@ msgstr "Etsitään uusia viestejä"
 msgid "Storing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:289
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:349
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:352
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:440
+#: camel/providers/local/camel-mbox-folder.c:471
+#: camel/providers/local/camel-mbox-folder.c:479
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9718,47 +9815,82 @@ msgstr ""
 "Viestin %s hakeminen kansiosta %s epäonnistui\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:472
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:480
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:149
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:166
+#, fuzzy, c-format
+msgid ""
+"Could not create directory `%s':\n"
+"%s"
+msgstr ""
+"Hakemistoa %s ei voitu luoda:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:178
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:229
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mbox-store.c:221
+#: camel/providers/local/camel-mbox-store.c:244
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:236
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
+#: camel/providers/local/camel-mbox-store.c:311
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Kansion luominen tällä nimellä ei onnistu"
+
+#: camel/providers/local/camel-mbox-store.c:324
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: camel/providers/local/camel-mbox-store.c:338
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:408
+#, fuzzy, c-format
+msgid "Could not rename %s to %s: %s"
+msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:427
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "Vastaanottajia ei ole määritelty"
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
@@ -9792,7 +9924,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
@@ -9809,41 +9941,41 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Lähetä viesti kontaktille"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
@@ -9921,6 +10053,64 @@ msgid ""
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+#, fuzzy
+msgid "Failed to send username to server"
+msgstr "Yhdistäminen palvelimeen epäonnistui."
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:114
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:155
+#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Viestin %s hakeminen ei onnistu: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+#, fuzzy
+msgid "User cancelled"
+msgstr "Peruutettu"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "Putken luonti epäonnistui: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, fuzzy, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
+
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Keskusteluryhmät"
@@ -9929,59 +10119,59 @@ msgstr "Keskusteluryhmät"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Tämä on USENET-keskusteluryhmien toimittaja."
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/providers/nntp/camel-nntp-summary.c:237
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Ei kyseistä viestiä: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
+#: camel/providers/nntp/camel-nntp-summary.c:241
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Putken luonti epäonnistui: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-summary.c:347
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:407
+#: camel/providers/nntp/camel-nntp-summary.c:508
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Etsii uusia viestejä"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
+#: camel/providers/nntp/camel-nntp-summary.c:523
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:569
 #, fuzzy
 msgid "Use cancel"
 msgstr "Peruuta"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:571
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
@@ -9990,14 +10180,6 @@ msgstr "Virhe tallennettaessa tiedostoa: %s"
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-#, fuzzy
-msgid "User cancelled"
-msgstr "Peruutettu"
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -10007,35 +10189,23 @@ msgstr "POP-yhteenvedon hakeminen ei onnistu: %s"
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viestiä %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Viestin %s hakeminen ei onnistu: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Tuntematon virhe"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr ""
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Jätä viestit palvelimelle"
@@ -10190,140 +10360,140 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:298
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:372
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Palveli_meni vaati todennuksen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10331,88 +10501,88 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Viestiä ei voida lähettää: yksi tai useampi viallinen vastaanottaja"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 #, fuzzy
 msgid "HELO response error"
 msgstr "Muu virhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1251
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10420,67 +10590,66 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1271
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1312
+#: camel/providers/smtp/camel-smtp-transport.c:1335
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1355
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1378
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1421
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:300
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Lisää liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Lisää viestiin liitetiedoston"
 
@@ -10513,91 +10682,12 @@ msgstr "MIME-tyyppi:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr ""
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Vastausosoite:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Lähettäjä:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Aihe:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Vastaanottaja:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Kopiot:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Piilokopiot:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Anna osoitteet joihin lähetetään kopiot viestistä ilman että muut "
-"vastaanottajat näkisivät tätä (Bcc)"
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-#, fuzzy
-msgid "Post To:"
-msgstr "_Portti:"
-
-#: composer/e-msg-composer-hdrs.c:553
-#, fuzzy
-msgid "Posting destination"
-msgstr "Kuvaus:"
-
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Liitä tiedosto(t)"
-
-#: composer/e-msg-composer.c:535
+#: composer/e-msg-composer.c:562
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Allekirjoitustiedoston luonti epäonnistui."
 
-#: composer/e-msg-composer.c:814
+#: composer/e-msg-composer.c:841
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10606,51 +10696,51 @@ msgstr ""
 "Tiedoston %s lukeminen epäonnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1177
+#: composer/e-msg-composer.c:1206
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:1195
+#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1218
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1309
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1287
+#: composer/e-msg-composer.c:1325
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1296
+#: composer/e-msg-composer.c:1334
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10659,7 +10749,7 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1431
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10667,7 +10757,7 @@ msgstr ""
 "Ximian Evolution on löytänyt tallentamattomia tiedostoja edelliseltä \n"
 "istunnolta. Haluatko koettaa niiden palauttamista?"
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1594
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10678,35 +10768,35 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1603
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
-#: composer/e-msg-composer.c:1593
+#: composer/e-msg-composer.c:1635
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:2017
+#: composer/e-msg-composer.c:2054
 #, fuzzy
 msgid "Signature:"
 msgstr "Tallenna allekirjoitus"
 
-#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
+#: composer/e-msg-composer.c:2971
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2934
+#: composer/e-msg-composer.c:3002
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2962
+#: composer/e-msg-composer.c:3030
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10717,7 +10807,7 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen epäonnistui:\n"
 "HTML-muokkainkomponentin käynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:3029
+#: composer/e-msg-composer.c:3100
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10725,12 +10815,91 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen epäonnistui:\n"
 "HTML-muokkainkomponentin käynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:4045
+#: composer/e-msg-composer.c:4110
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
+#: composer/e-msg-composer-hdrs.c:290
+#, fuzzy
+msgid "You need to configure an account before you can compose mail."
+msgstr "Sinun tulee luoda tili ennen kuin voit lähettää tätä viestiä."
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr ""
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Vastausosoite:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Lähettäjä:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Aihe:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Vastaanottaja:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Kopiot:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Piilokopiot:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Anna osoitteet joihin lähetetään kopiot viestistä ilman että muut "
+"vastaanottajat näkisivät tätä (Bcc)"
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+#, fuzzy
+msgid "Post To:"
+msgstr "_Portti:"
+
+#: composer/e-msg-composer-hdrs.c:553
+#, fuzzy
+msgid "Posting destination"
+msgstr "Kuvaus:"
+
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Liitä tiedosto(t)"
+
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10891,7 +11060,7 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
+#: e-util/e-dialog-utils.c:249
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
@@ -10914,90 +11083,210 @@ msgstr "Ryhmät"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr ""
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr ""
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr ""
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr ""
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr ""
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr ""
 
+#: executive-summary/component/component-factory.c:151
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#: executive-summary/component/e-summary.c:925
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Kansion nimeäminen ei onnistu:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:939
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Virhe %s:n lataamisessa"
+
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:125
+#, fuzzy
+msgid "Select a service"
+msgstr "Valitse tiedosto"
+
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Lähetä sähköpostia"
+
+#: executive-summary/component/e-summary-url.c:72
+#, fuzzy, c-format
+msgid "Change the view to %s"
+msgstr "Muuta tämän kansion nimeä"
+
+#: executive-summary/component/e-summary-url.c:73
+#, fuzzy, c-format
+msgid "Run %s"
+msgstr "URL: %s"
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Sulje"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Siirrä tämä kansio toiseen paikkaan"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Synkronoidaan kansiota"
+
+#: executive-summary/component/e-summary-url.c:553
+#, fuzzy
+msgid "page"
+msgstr "Sivu"
+
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+msgid "Error"
+msgstr "Virhe"
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+#, fuzzy
+msgid "Update now"
+msgstr "Päivitä"
+
+#: executive-summary/test-service/rdf-summary.c:795
+#, fuzzy
+msgid "Update every "
+msgstr "Päivitä"
+
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr "1 sekunti sitten"
@@ -11117,87 +11406,6 @@ msgstr "Tyylin nimi:"
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
-msgid "Important"
-msgstr ""
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
-#, fuzzy
-msgid "Work"
-msgstr "Työviikk_o"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1413
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1415
-#, fuzzy
-msgid "Later"
-msgstr "jälkeen"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:219
-#, fuzzy
-msgid "You must name this filter."
-msgstr "Muuta tämän kansion nimeä"
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Säännön nimi: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Nimetön"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Jos"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Suorita toiminnot"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "kaikki ehdot täytetään"
-
-#: filter/filter-rule.c:800
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "mikään ehdoista täyttyy"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "tulevat"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "lähtevät"
-
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr ""
@@ -11292,6 +11500,87 @@ msgstr ""
 msgid "years"
 msgstr "vuotta"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+msgid "Important"
+msgstr ""
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Työviikk_o"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1458
+#, fuzzy
+msgid "Later"
+msgstr "jälkeen"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr ""
+
+#: filter/filter-rule.c:219
+#, fuzzy
+msgid "You must name this filter."
+msgstr "Muuta tämän kansion nimeä"
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Säännön nimi: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Nimetön"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Jos"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Suorita toiminnot"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "kaikki ehdot täytetään"
+
+#: filter/filter-rule.c:800
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "mikään ehdoista täyttyy"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "tulevat"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "lähtevät"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11314,228 +11603,228 @@ msgid "Beep"
 msgstr "Piippaus"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "sisältää"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Poistettu"
 
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr ""
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ei sisällä"
+msgid "Draft"
+msgstr "Luonnos"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ei lopu merkkijonoon"
+msgid "Exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ei ole olemassa"
+msgid "Expression"
+msgstr ""
 
 #: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "ei ole olemassa"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
+msgid "Follow Up"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ei ala merkkijonolla"
+msgid "Label"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Luonnos"
+msgid "Message Body"
+msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "loppuu merkkijonoon"
+msgid "Message Header"
+msgstr "Viestin otsikko"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
+msgid "Move to Folder"
+msgstr "Siirrä kansioon"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Lähetä viesti kontaktille"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
+#, fuzzy
+msgid "Play Sound"
+msgstr "Puola"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Lue"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Vastaanottajat"
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "on"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "jälkeen"
+msgid "Replied to"
+msgstr ""
 
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "ennen"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
+msgid "Sender"
+msgstr "Lähettäjä"
author	Rodrigo Moya <rodrigo@src.gnome.org>	2003-10-16 06:23:14 +0800
committer	Rodrigo Moya <rodrigo@src.gnome.org>	2003-10-16 06:23:14 +0800
commit	8b7b352e60bba599989fd94c1c44c0e7f237ba44 (patch)
tree	52ee2d928eee785d55514f9f7bbaaec18c714b93 /po
parent	31691e6c2afa78eb71422bda60807122e88b3871 (diff)
download	gsoc2013-evolution-8b7b352e60bba599989fd94c1c44c0e7f237ba44.tar.gz gsoc2013-evolution-8b7b352e60bba599989fd94c1c44c0e7f237ba44.tar.zst gsoc2013-evolution-8b7b352e60bba599989fd94c1c44c0e7f237ba44.zip