[evolution] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit 7d812b33d944964ab8597361f44b473871eaba33
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Mon Aug 20 22:57:55 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1993 +++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 2002 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 1946 insertions(+), 2049 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index b563e25..5f9bcf0 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,13 +6,13 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010, 2012.
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
-#: ../shell/main.c:568
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.3.91\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 13:22+0800\n"
-"PO-Revision-Date: 2012-08-07 13:22+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
+"POT-Creation-Date: 2012-08-20 06:02+0000\n"
+"PO-Revision-Date: 2012-08-20 22:56+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -181,7 +181,7 @@ msgid ""
 msgstr "æèçäçéåéäåååçååãäçèåäéèåååæäåçæåçåï"
 
 #: ../addressbook/addressbook.error.xml.h:36
-#: ../mail/em-vfolder-editor-rule.c:388 ../widgets/table/e-table-config.ui.h:6
+#: ../mail/em-vfolder-editor-rule.c:391 ../widgets/table/e-table-config.ui.h:6
 msgid "_Add"
 msgstr "åå(_A)"
 
@@ -301,7 +301,7 @@ msgstr "éé(_H):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1819
+#: ../modules/itip-formatter/itip-view.c:1842
 msgid "_Calendar:"
 msgstr "èäæ(_C):"
 
@@ -405,8 +405,7 @@ msgstr "éåçåæ"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:705
-#: ../calendar/gui/e-calendar-view.c:2149 ../capplet/anjal-settings-main.c:83
-#: ../shell/main.c:131
+#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:129
 msgid "Birthday"
 msgstr "çæ"
 
@@ -799,22 +798,22 @@ msgid "Copy _Email Address"
 msgstr "èèéåéääå(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../widgets/misc/e-web-view.c:300 ../widgets/misc/e-web-view-gtkhtml.c:429
+#: ../widgets/misc/e-web-view.c:296 ../widgets/misc/e-web-view-gtkhtml.c:429
 msgid "Copy the email address to the clipboard"
 msgstr "èèéåéääåååèç"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../widgets/misc/e-web-view.c:305 ../widgets/misc/e-web-view-gtkhtml.c:434
+#: ../widgets/misc/e-web-view.c:301 ../widgets/misc/e-web-view-gtkhtml.c:434
 msgid "_Send New Message To..."
 msgstr "åéæéäè(_S)â"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:171
-#: ../widgets/misc/e-web-view.c:307 ../widgets/misc/e-web-view-gtkhtml.c:436
+#: ../widgets/misc/e-web-view.c:303 ../widgets/misc/e-web-view-gtkhtml.c:436
 msgid "Send a mail message to this address"
 msgstr "åééäåéåäå"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:333
-#: ../widgets/misc/e-web-view.c:1088 ../widgets/misc/e-web-view-gtkhtml.c:973
+#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:973
 #, c-format
 msgid "Click to mail %s"
 msgstr "æäääåééä %s"
@@ -866,7 +865,7 @@ msgstr "èåäè"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:673
 #: ../modules/calendar/e-cal-shell-view-actions.c:217
 #: ../modules/calendar/e-cal-shell-view-actions.c:246
-#: ../modules/calendar/e-cal-shell-view.c:631
+#: ../modules/calendar/e-cal-shell-view.c:548
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:546
 msgid "Calendar"
@@ -1531,8 +1530,8 @@ msgstr "èé(_D)"
 #: ../calendar/alarm-notify/alarm-queue.c:1755
 #: ../calendar/alarm-notify/alarm-queue.c:1765
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
-#: ../modules/itip-formatter/itip-view.c:1446
-#: ../modules/itip-formatter/itip-view.c:1546
+#: ../modules/itip-formatter/itip-view.c:1460
+#: ../modules/itip-formatter/itip-view.c:1569
 msgid "Location:"
 msgstr "äç:"
 
@@ -1866,7 +1865,7 @@ msgid ""
 msgstr "éèæääéèäèçéäãååæåäåæååéäéäã"
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3054
+#: ../modules/itip-formatter/itip-view.c:3078
 msgid "_Save"
 msgstr "åå(_S)"
 
@@ -1971,8 +1970,11 @@ msgid "Delete remote memo list &quot;{0}&quot;?"
 msgstr "åééçååéæå &quot;{0}&quot;ï"
 
 #: ../calendar/calendar.error.xml.h:72
+#| msgid ""
+#| "This will permanently remote the memo list &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remote the memo list &quot;{0}&quot; from the server. "
+"This will permanently remove the memo list &quot;{0}&quot; from the server. "
 "Are you sure you want to proceed?"
 msgstr "éææåäæåæéåéååéæå &quot;{0}&quot;ãäçåèççåï"
 
@@ -2443,7 +2445,7 @@ msgstr "ééçåçèç"
 #: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
 #: ../shell/e-shell-window-actions.c:1446
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:327 ../widgets/misc/e-web-view.c:1414
+#: ../widgets/misc/e-web-view.c:323 ../widgets/misc/e-web-view.c:1423
 #: ../widgets/misc/e-web-view-gtkhtml.c:456
 #: ../widgets/misc/e-web-view-gtkhtml.c:1299
 msgid "Copy the selection"
@@ -2452,7 +2454,7 @@ msgstr "èèéåçåå"
 #: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
 #: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1408 ../widgets/misc/e-web-view-gtkhtml.c:1293
+#: ../widgets/misc/e-web-view.c:1417 ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Cut the selection"
 msgstr "åäéåçå"
 
@@ -2469,7 +2471,7 @@ msgstr "æèæå"
 #: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
 #: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1420 ../widgets/misc/e-web-view-gtkhtml.c:1305
+#: ../widgets/misc/e-web-view.c:1429 ../widgets/misc/e-web-view-gtkhtml.c:1305
 msgid "Paste the clipboard"
 msgstr "èäåèççåå"
 
@@ -2625,7 +2627,7 @@ msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "åæææçææïåæææåæéçæåçææ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:3615
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
 msgid "attachment"
 msgstr "éä"
 
@@ -2815,7 +2817,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "äèåæççèääïåçääæåéä"
 
 #: ../calendar/gui/dialogs/event-page.c:663
-#: ../calendar/gui/dialogs/event-page.c:3138
+#: ../calendar/gui/dialogs/event-page.c:3143
 msgid "This event has reminders"
 msgstr "éåääåææé"
 
@@ -2824,80 +2826,80 @@ msgstr "éåääåææé"
 msgid "Or_ganizer:"
 msgstr "æèåéä(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:1296
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Event with no start date"
 msgstr "çéåææçää"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1304
 msgid "Event with no end date"
 msgstr "ççæææçää"
 
-#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/event-page.c:1477
 #: ../calendar/gui/dialogs/memo-page.c:732
 #: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "éåææéè"
 
-#: ../calendar/gui/dialogs/event-page.c:1482
+#: ../calendar/gui/dialogs/event-page.c:1487
 msgid "End date is wrong"
 msgstr "çæææéè"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/event-page.c:1510
 msgid "Start time is wrong"
 msgstr "éåæééè"
 
-#: ../calendar/gui/dialogs/event-page.c:1512
+#: ../calendar/gui/dialogs/event-page.c:1517
 msgid "End time is wrong"
 msgstr "çææééè"
 
-#: ../calendar/gui/dialogs/event-page.c:1675
+#: ../calendar/gui/dialogs/event-page.c:1680
 #: ../calendar/gui/dialogs/memo-page.c:771
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "An organizer is required."
 msgstr "éèäååéäã"
 
-#: ../calendar/gui/dialogs/event-page.c:1709
+#: ../calendar/gui/dialogs/event-page.c:1714
 #: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "æåéèäååæèã"
 
-#: ../calendar/gui/dialogs/event-page.c:1916
+#: ../calendar/gui/dialogs/event-page.c:1921
 msgid "_Delegatees"
 msgstr "äçè(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1918
+#: ../calendar/gui/dialogs/event-page.c:1923
 msgid "Atte_ndees"
 msgstr "åæè(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/dialogs/event-page.c:2998
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "çæéåèäæã%sãï%s"
 
-#: ../calendar/gui/dialogs/event-page.c:3409
+#: ../calendar/gui/dialogs/event-page.c:3423
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "åæåçæå %d å"
 
-#: ../calendar/gui/dialogs/event-page.c:3415
+#: ../calendar/gui/dialogs/event-page.c:3429
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "çæå %d åæ"
 
-#: ../calendar/gui/dialogs/event-page.c:3421
+#: ../calendar/gui/dialogs/event-page.c:3435
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "çæå %d åé"
 
-#: ../calendar/gui/dialogs/event-page.c:3440
+#: ../calendar/gui/dialogs/event-page.c:3454
 msgid "Customize"
 msgstr "èé"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3446
+#: ../calendar/gui/dialogs/event-page.c:3460
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "ææ"
@@ -3063,9 +3065,9 @@ msgstr "çæåã%sãéåååéï%s"
 #: ../em-format/e-mail-parser-inlinepgp-signed.c:96
 #: ../em-format/e-mail-parser-multipart-encrypted.c:122
 #: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:716 ../mail/e-mail-reader.c:1748
-#: ../mail/em-folder-tree.c:678 ../modules/itip-formatter/itip-view.c:4491
-#: ../modules/itip-formatter/itip-view.c:4889 ../plugins/face/face.c:174
+#: ../libemail-engine/mail-ops.c:720 ../mail/e-mail-reader.c:1727
+#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4524
+#: ../modules/itip-formatter/itip-view.c:4875 ../plugins/face/face.c:174
 #: ../smime/gui/certificate-manager.c:317
 msgid "Unknown error"
 msgstr "äæçéè"
@@ -3382,7 +3384,7 @@ msgstr "çé"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:345
 #: ../calendar/gui/e-task-table.c:579 ../calendar/gui/tasktypes.xml.h:19
-#: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
+#: ../mail/message-list.c:1275 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
 msgstr "é"
 
@@ -3390,7 +3392,7 @@ msgstr "é"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:347
 #: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-task-table.c:580
-#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
+#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1274
 #: ../widgets/misc/e-send-options.ui.h:5
 msgid "Normal"
 msgstr "äè"
@@ -3399,7 +3401,7 @@ msgstr "äè"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:349
 #: ../calendar/gui/e-task-table.c:581 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
+#: ../mail/message-list.c:1273 ../widgets/misc/e-send-options.ui.h:4
 msgid "Low"
 msgstr "ä"
 
@@ -3450,7 +3452,7 @@ msgstr "ååæ"
 #: ../calendar/gui/e-cal-model-tasks.c:495
 #: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
 #: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:869
+#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:879
 msgid "Canceled"
 msgstr "ååæ"
 
@@ -3648,7 +3650,7 @@ msgid "Gnome Calendar"
 msgstr "Gnome èäæ"
 
 #: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1086
+#: ../modules/calendar/e-cal-shell-view-private.c:1085
 msgid "%A %d %b %Y"
 msgstr "%Yå%mæ%dæ (%A)"
 
@@ -3658,19 +3660,19 @@ msgstr "%Yå%mæ%dæ (%A)"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1852
+#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1853
 #: ../calendar/gui/e-day-view-top-item.c:835
 #: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%a %d %b"
 msgstr "%mæ%dæ (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1093
-#: ../modules/calendar/e-cal-shell-view-private.c:1099
-#: ../modules/calendar/e-cal-shell-view-private.c:1102
+#: ../modules/calendar/e-cal-shell-view-private.c:1092
+#: ../modules/calendar/e-cal-shell-view-private.c:1098
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
 msgid "%a %d %b %Y"
 msgstr "%Yå%mæ%dæ (%a)"
 
@@ -3678,10 +3680,10 @@ msgstr "%Yå%mæ%dæ (%a)"
 #: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
 #: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1119
-#: ../modules/calendar/e-cal-shell-view-private.c:1130
-#: ../modules/calendar/e-cal-shell-view-private.c:1137
-#: ../modules/calendar/e-cal-shell-view-private.c:1140
+#: ../modules/calendar/e-cal-shell-view-private.c:1118
+#: ../modules/calendar/e-cal-shell-view-private.c:1129
+#: ../modules/calendar/e-cal-shell-view-private.c:1136
+#: ../modules/calendar/e-cal-shell-view-private.c:1139
 msgid "%d %b %Y"
 msgstr "%Yå%mæ%dæ"
 
@@ -3690,10 +3692,10 @@ msgstr "%Yå%mæ%dæ"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1868
+#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1869
 #: ../calendar/gui/e-day-view-top-item.c:839
 #: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1126
+#: ../modules/calendar/e-cal-shell-view-private.c:1125
 msgid "%d %b"
 msgstr "%mæ%dæ"
 
@@ -3823,8 +3825,8 @@ msgid "Due Date:"
 msgstr "ææææï"
 
 #: ../calendar/gui/e-cal-component-preview.c:317
-#: ../modules/itip-formatter/itip-view.c:1449
-#: ../modules/itip-formatter/itip-view.c:1555
+#: ../modules/itip-formatter/itip-view.c:1463
+#: ../modules/itip-formatter/itip-view.c:1578
 msgid "Status:"
 msgstr "çæï"
 
@@ -3862,7 +3864,7 @@ msgstr "éå"
 msgid "Completion date"
 msgstr "åæææ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:871
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:881
 msgid "Complete"
 msgstr "åæ"
 
@@ -3964,8 +3966,8 @@ msgstr "çæææ"
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
 #: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
 #: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3438
-#: ../modules/itip-formatter/itip-view.c:5969
+#: ../modules/itip-formatter/itip-view.c:3462
+#: ../modules/itip-formatter/itip-view.c:5962
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 msgid "Unknown"
 msgstr "äæ"
@@ -3999,14 +4001,14 @@ msgstr "æåéå %s"
 #: ../calendar/gui/e-cal-model.c:3559
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../modules/itip-formatter/itip-view.c:5957
+#: ../modules/itip-formatter/itip-view.c:5950
 msgid "Accepted"
 msgstr "æå"
 
 #: ../calendar/gui/e-cal-model.c:3560
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:5963
+#: ../modules/itip-formatter/itip-view.c:5956
 msgid "Declined"
 msgstr "åæ"
 
@@ -4020,7 +4022,7 @@ msgstr "æè"
 #: ../calendar/gui/e-cal-model.c:3562
 #: ../calendar/gui/e-meeting-list-view.c:225
 #: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../modules/itip-formatter/itip-view.c:5966
+#: ../modules/itip-formatter/itip-view.c:5959
 msgid "Delegated"
 msgstr "ååæ"
 
@@ -4074,14 +4076,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:773
+#: ../calendar/gui/e-day-view.c:1027 ../calendar/gui/e-week-view.c:773
 #: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
 #: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
 msgid "am"
 msgstr "äå"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:776
+#: ../calendar/gui/e-day-view.c:1030 ../calendar/gui/e-week-view.c:776
 #: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
 #: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
 msgid "pm"
@@ -4093,13 +4095,13 @@ msgstr "äå"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1835 ../calendar/gui/e-day-view-top-item.c:831
+#: ../calendar/gui/e-day-view.c:1836 ../calendar/gui/e-day-view-top-item.c:831
 #: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
 msgid "%A %d %B"
 msgstr "%mæ%dæ%A"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2670
+#: ../calendar/gui/e-day-view.c:2671
 #, c-format
 msgid "Week %d"
 msgstr "ç %d é"
@@ -4793,7 +4795,7 @@ msgstr "çæåæè"
 
 #: ../calendar/importers/icalendar-importer.c:468
 #: ../calendar/importers/icalendar-importer.c:905
-#: ../modules/itip-formatter/itip-view.c:5568
+#: ../modules/itip-formatter/itip-view.c:5564
 msgid "Opening calendar"
 msgstr "éåèäæ"
 
@@ -6518,277 +6520,6 @@ msgstr "ååæ/çåæ"
 msgid "Pacific/Yap"
 msgstr "ååæ/éæå"
 
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:161
-msgid "ID of the socket to embed in"
-msgstr "socket ç IDïååæ"
-
-#: ../capplet/anjal-settings-main.c:162
-msgid "socket"
-msgstr "socket"
-
-#: ../capplet/settings/mail-account-view.c:74
-msgid "Please enter your full name."
-msgstr "èèåäçååã"
-
-#: ../capplet/settings/mail-account-view.c:75
-msgid "Please enter your email address."
-msgstr "èèåäçéåéääåã"
-
-#: ../capplet/settings/mail-account-view.c:76
-msgid "The email address you have entered is invalid."
-msgstr "äèåçéåéääåæçæçã"
-
-#: ../capplet/settings/mail-account-view.c:77
-msgid "Please enter your password."
-msgstr "èèåäçåçã"
-
-#: ../capplet/settings/mail-account-view.c:245
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../capplet/settings/mail-account-view.c:335
-#: ../capplet/settings/mail-account-view.c:378
-msgid "Google"
-msgstr "Google"
-
-#: ../capplet/settings/mail-account-view.c:454
-#: ../capplet/settings/mail-account-view.c:558
-msgid "Always (SSL)"
-msgstr "æé (SSL)"
-
-#: ../capplet/settings/mail-account-view.c:457
-#: ../capplet/settings/mail-account-view.c:561
-msgid "When possible (TLS)"
-msgstr "åèçè (TLS)"
-
-#: ../capplet/settings/mail-account-view.c:460
-#: ../capplet/settings/mail-account-view.c:564
-#: ../mail/e-mail-config-defaults-page.c:729
-msgid "Never"
-msgstr "æä"
-
-#: ../capplet/settings/mail-account-view.c:468
-msgid "Personal details:"
-msgstr "åäèçèæï"
-
-#: ../capplet/settings/mail-account-view.c:475
-#: ../widgets/misc/e-source-config.c:683 ../widgets/misc/e-source-config.c:687
-msgid "Name:"
-msgstr "åçï"
-
-#: ../capplet/settings/mail-account-view.c:484
-msgid "Email address:"
-msgstr "Email äåï"
-
-#: ../capplet/settings/mail-account-view.c:494
-msgid "Details:"
-msgstr "èçèæï"
-
-#: ../capplet/settings/mail-account-view.c:502
-#: ../mail/e-mail-config-summary-page.c:409
-msgid "Receiving"
-msgstr "ææä"
-
-#: ../capplet/settings/mail-account-view.c:509
-msgid "Server type:"
-msgstr "äæåéåï"
-
-#: ../capplet/settings/mail-account-view.c:518
-msgid "Server address:"
-msgstr "äæåäåï"
-
-#: ../capplet/settings/mail-account-view.c:527
-#: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
-msgid "Username:"
-msgstr "äçèåçï"
-
-#: ../capplet/settings/mail-account-view.c:536
-msgid "Use encryption:"
-msgstr "äçååï"
-
-#: ../capplet/settings/mail-account-view.c:569
-#: ../mail/e-mail-config-summary-page.c:421
-msgid "Sending"
-msgstr "åéä"
-
-#: ../capplet/settings/mail-account-view.c:615
-msgid ""
-"To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
-msgstr "èäçéåéåéäçåäéèåèåäååèãèåäéæääçéåéääåååçïæåæåèäæåææçèååãåææåçæèååæéåæéïäåéèäçèååèçäæåèçèæã"
-
-#: ../capplet/settings/mail-account-view.c:617
-msgid ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
-msgstr "ææïæåçæèåæåäçéäèååãèåäéèåååãæåæääååèåçèçèæåèéåïäæääæåèéèæèååã"
-
-#: ../capplet/settings/mail-account-view.c:619
-msgid "You can specify more options to configure the account."
-msgstr "äåäæåæåçäèåéååèçééã"
-
-#: ../capplet/settings/mail-account-view.c:621
-msgid ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
-msgstr "çåæåéèäçèååæèåééäãæååçåèçæéåèåïäæäæèææååäéèçèã"
-
-#: ../capplet/settings/mail-account-view.c:622
-msgid "You can specify your default settings for your account."
-msgstr "äåäæåèååèçéèèååã"
-
-#: ../capplet/settings/mail-account-view.c:623
-msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
-msgstr "åæååèäéçåäæåååéäåææäéçæéã"
-
-#: ../capplet/settings/mail-account-view.c:638
-#: ../mail/e-mail-config-identity-page.c:640
-msgid "Identity"
-msgstr "èå"
-
-#: ../capplet/settings/mail-account-view.c:638
-msgid "Next - Receiving mail"
-msgstr "ääæ - ææéä"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Receiving mail"
-msgstr "ææéä"
-
-#: ../capplet/settings/mail-account-view.c:639
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Next - Sending mail"
-msgstr "ääæ - åééä"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Back - Identity"
-msgstr "ääæ - èå"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Next - Receiving options"
-msgstr "ääæ - ææéé"
-
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Receiving options"
-msgstr "ææéé"
-
-#: ../capplet/settings/mail-account-view.c:640
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Back - Receiving mail"
-msgstr "ääæ - ææéä"
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Sending mail"
-msgstr "åééä"
-
-#: ../capplet/settings/mail-account-view.c:642
-#: ../capplet/settings/mail-account-view.c:643
-msgid "Next - Review account"
-msgstr "ääæ - æéåè"
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Next - Defaults"
-msgstr "ääæ - èçèæ"
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Back - Receiving options"
-msgstr "ääæ - ææéé"
-
-#: ../capplet/settings/mail-account-view.c:643
-#: ../mail/e-mail-config-defaults-page.c:812
-msgid "Defaults"
-msgstr "éèå"
-
-#: ../capplet/settings/mail-account-view.c:643
-msgid "Back - Sending mail"
-msgstr "ääæ - åééä"
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Review account"
-msgstr "æéåè"
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Finish"
-msgstr "åæ"
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Back - Sending"
-msgstr "ääæ - åé"
-
-#: ../capplet/settings/mail-account-view.c:822
-msgid "Setup Google contacts with Evolution"
-msgstr "å Google èçäåå Evolution"
-
-#: ../capplet/settings/mail-account-view.c:823
-msgid "Setup Google calendar with Evolution"
-msgstr "å Google ææåå Evolution"
-
-#: ../capplet/settings/mail-account-view.c:828
-msgid "You may need to enable IMAP access."
-msgstr "äåèéèåç IMAP ååã"
-
-#: ../capplet/settings/mail-account-view.c:836
-msgid "Google account settings:"
-msgstr "Google åèèååï"
-
-#: ../capplet/settings/mail-account-view.c:862
-msgid "Setup Yahoo calendar with Evolution"
-msgstr "å Yahoo èäæåå Evolution"
-
-#: ../capplet/settings/mail-account-view.c:866
-msgid ""
-"Yahoo calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. So please confirm and re-enter the calendar name if it is not "
-"correct."
-msgstr "Yahoo èäææååç åå_åæãæåååèçæéåèäæçåçãåæèçèåïåææéèèéæèåèäæçåçã"
-
-#: ../capplet/settings/mail-account-view.c:875
-msgid "Yahoo account settings:"
-msgstr "Yahoo åèèååï"
-
-#: ../capplet/settings/mail-account-view.c:889
-msgid "Yahoo Calendar name:"
-msgstr "Yahoo èäæåçï"
-
-#: ../capplet/settings/mail-account-view.c:1088
-msgid "Password:"
-msgstr "åçï"
-
-#: ../capplet/settings/mail-account-view.c:1143
-#: ../capplet/settings/mail-settings-view.c:260
-msgid "Close Tab"
-msgstr "ééåé"
-
-#: ../capplet/settings/mail-account-view.c:1155
-msgid "Account Wizard"
-msgstr "åèçé"
-
-#: ../capplet/settings/mail-capplet-shell.c:209
-msgid "Evolution account assistant"
-msgstr "Evolution åèåç"
-
-#: ../capplet/settings/mail-settings-view.c:145
-#, c-format
-msgid "Modify %s..."
-msgstr "äæ %sâ"
-
-#: ../capplet/settings/mail-settings-view.c:147
-msgid "Add a new account"
-msgstr "ååæçåè"
-
-#: ../capplet/settings/mail-settings-view.c:189
-msgid "Account management"
-msgstr "åèçç"
-
-#: ../capplet/settings/mail-settings-view.c:272
-msgid "Settings"
-msgstr "èåå"
-
 #: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "ååææâ"
@@ -7173,7 +6904,7 @@ msgstr "Evolution éééç"
 msgid "Calendar event notifications"
 msgstr "èäæääéç"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:935
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:936
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
@@ -9152,7 +8883,7 @@ msgstr "ææéæåèççååèæå"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser åèççååèæåã"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:314
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:311
 msgid "Start in offline mode"
 msgstr "äéçæååå"
 
@@ -9297,7 +9028,7 @@ msgid "Bcc"
 msgstr "åäåæ"
 
 #: ../em-format/e-mail-formatter.c:1373
-#: ../em-format/e-mail-formatter-quote-headers.c:166
+#: ../em-format/e-mail-formatter-quote-headers.c:165
 #: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
 #: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
 #: ../smime/lib/e-cert.c:1125
@@ -9355,7 +9086,7 @@ msgstr "åéåæåå RFC822 éä"
 
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1238
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1255
 #: ../modules/cal-config-google/e-google-chooser.c:209
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/menus/gal-define-views-dialog.c:352
@@ -9393,9 +9124,9 @@ msgid "S/MIME encrpyted"
 msgstr "S/MIME åå"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:177
+#: ../em-format/e-mail-formatter-quote-headers.c:176
 #: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1048
+#: ../modules/mail/em-mailer-prefs.c:1121
 msgid "Mailer"
 msgstr "åäè"
 
@@ -10019,7 +9750,7 @@ msgstr "åæçåäåæäçéç"
 #: ../filter/e-filter-rule.c:835 ../libemail-engine/camel-null-store.c:28
 #: ../mail/e-mail-config-summary-page.c:139
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
-#: ../widgets/misc/e-mail-signature-combo-box.c:318
+#: ../widgets/misc/e-mail-signature-combo-box.c:369
 msgid "None"
 msgstr "ææ"
 
@@ -10120,7 +9851,7 @@ msgstr "äæåçæå"
 msgid "a time relative to the current time"
 msgstr "çåæçåæåçæå"
 
-#: ../filter/filter.ui.h:5
+#: ../filter/filter.ui.h:5 ../mail/mail-config.ui.h:78
 msgid "seconds"
 msgstr "ç"
 
@@ -10149,7 +9880,7 @@ msgstr "å"
 msgid "Show filters for mail:"
 msgstr "éçéäéæå:"
 
-#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:165
+#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:166
 msgid "_Filter Rules"
 msgstr "éæåèå(_F)"
 
@@ -10191,125 +9922,131 @@ msgstr "çæçéèçæäç (%d)"
 msgid "Saving message to folder '%s'"
 msgstr "ååéäåèæåã%sã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:557
+#: ../libemail-engine/e-mail-folder-utils.c:565
 msgid "Forwarded messages"
 msgstr "åèåçéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:667
-#: ../libemail-engine/e-mail-folder-utils.c:918
+#: ../libemail-engine/e-mail-folder-utils.c:675
+#: ../libemail-engine/e-mail-folder-utils.c:926
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "åå %d åéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:761
+#: ../libemail-engine/e-mail-folder-utils.c:769
 msgid "Scanning messages for duplicates"
 msgstr "ææéäæåæéè"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1169
+#: ../libemail-engine/e-mail-folder-utils.c:1177
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "çéèæåã%sã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1306
+#: ../libemail-engine/e-mail-folder-utils.c:1314
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "ææã%sãåçèçéã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1310
+#: ../libemail-engine/e-mail-folder-utils.c:1318
 msgid "File has been removed."
 msgstr "ææåçèçéã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1369
+#: ../libemail-engine/e-mail-folder-utils.c:1377
 msgid "Removing attachments"
 msgstr "æåçééä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1533
+#: ../libemail-engine/e-mail-folder-utils.c:1541
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "åå %d åéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1889 ../mail/em-folder-utils.c:609
+#: ../libemail-engine/e-mail-folder-utils.c:1897 ../mail/em-folder-utils.c:613
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "çæçèæå URIã%sã"
 
-#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-properties.c:333
+#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-properties.c:333
 #: ../mail/em-folder-tree-model.c:765
-#: ../modules/mail/e-mail-shell-view-private.c:1033
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:1045
 msgid "Inbox"
 msgstr "æäå"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1031
+#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:758
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 msgid "Drafts"
 msgstr "èç"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:769
-#: ../modules/mail/e-mail-shell-view-private.c:1035
+#: ../libemail-engine/e-mail-session.c:118 ../mail/em-folder-tree-model.c:769
+#: ../modules/mail/e-mail-shell-view-private.c:1036
 msgid "Outbox"
 msgstr "åäå"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-tree-model.c:773
-#: ../modules/mail/e-mail-shell-view-private.c:1037
+#: ../libemail-engine/e-mail-session.c:119 ../mail/em-folder-tree-model.c:773
+#: ../modules/mail/e-mail-shell-view-private.c:1038
 msgid "Sent"
 msgstr "ååé"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1049 ../plugins/templates/templates.c:1349
-#: ../plugins/templates/templates.c:1359
+#: ../plugins/templates/templates.c:1048 ../plugins/templates/templates.c:1345
+#: ../plugins/templates/templates.c:1355
 msgid "Templates"
 msgstr "çæ"
 
-#: ../libemail-engine/e-mail-session.c:1326
+#: ../libemail-engine/e-mail-session.c:1319
 #, c-format
 msgid "User cancelled operation"
 msgstr "äçèåæçæä"
 
-#: ../libemail-engine/e-mail-session.c:1451
+#: ../libemail-engine/e-mail-session.c:1489
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s éèåæ"
+
+#: ../libemail-engine/e-mail-session.c:1534
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "ææ UIDã%sãçèæäæ"
+
+#: ../libemail-engine/e-mail-session.c:1585
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "æææäççåäåïéäçèååçåæã"
 
-#: ../libemail-engine/e-mail-session.c:1464
+#: ../libemail-engine/e-mail-session.c:1598
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "æäååäççèåçïéäçèååçåæã"
 
-#: ../libemail-engine/e-mail-session.c:1626
+#: ../libemail-engine/e-mail-session-utils.c:540
 #, c-format
-msgid "%s authentication failed"
-msgstr "%s éèåæ"
-
-#: ../libemail-engine/e-mail-session.c:1671
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr "ææ UIDã%sãçèæäæ"
+#| msgid "No data source found for UID '%s'"
+msgid "No mail service found with UID '%s'"
+msgstr "ææ UIDã%sãçéäæå"
 
-#: ../libemail-engine/e-mail-session-utils.c:420
+#: ../libemail-engine/e-mail-session-utils.c:549
 #, c-format
-msgid "Cannot get transport for account '%s'"
-msgstr "äèåååèã%sãçåè"
+msgid "UID '%s' is not a mail transport"
+msgstr "UIDã%sãäæéäåè"
 
-#: ../libemail-engine/e-mail-session-utils.c:508
-#: ../libemail-engine/mail-ops.c:694
+#: ../libemail-engine/e-mail-session-utils.c:641
+#: ../libemail-engine/mail-ops.c:698
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "çæåçååéæåï%s"
 
-#: ../libemail-engine/e-mail-session-utils.c:537
-#: ../libemail-engine/e-mail-session-utils.c:571
-#: ../libemail-engine/mail-ops.c:711 ../libemail-engine/mail-ops.c:747
+#: ../libemail-engine/e-mail-session-utils.c:670
+#: ../libemail-engine/e-mail-session-utils.c:704
+#: ../libemail-engine/mail-ops.c:715 ../libemail-engine/mail-ops.c:751
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -10318,14 +10055,14 @@ msgstr ""
 "çæéåè %sï%s\n"
 "æéåèæåãåäåãèæåã"
 
-#: ../libemail-engine/e-mail-session-utils.c:591
-#: ../libemail-engine/mail-ops.c:769
+#: ../libemail-engine/e-mail-session-utils.c:724
+#: ../libemail-engine/mail-ops.c:773
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "çæéåèæåãåäåãèæåï%s"
 
-#: ../libemail-engine/e-mail-session-utils.c:821
-#: ../libemail-engine/mail-ops.c:897 ../libemail-engine/mail-ops.c:998
+#: ../libemail-engine/e-mail-session-utils.c:954
+#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
 msgid "Sending message"
 msgstr "æååééä"
 
@@ -10344,7 +10081,7 @@ msgstr "éæéçåã%sã"
 msgid "Preparing account '%s' for offline"
 msgstr "æååèã%sãéçåä"
 
-#: ../libemail-engine/mail-folder-cache.c:884
+#: ../libemail-engine/mail-folder-cache.c:885
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -10357,54 +10094,51 @@ msgstr "éæéæçéä"
 msgid "Fetching Mail"
 msgstr "ææéä"
 
-#: ../libemail-engine/mail-ops.c:908
+#: ../libemail-engine/mail-ops.c:916
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æååééä %d / %d"
 
-#. Translators: The string is distinguished by total
-#. * count of messages to be sent.  Failed messages is
-#. * always more than zero.
-#: ../libemail-engine/mail-ops.c:959
+#: ../libemail-engine/mail-ops.c:968
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "çæåé %d / %d åéä"
 
-#: ../libemail-engine/mail-ops.c:965
+#: ../libemail-engine/mail-ops.c:974
 msgid "Canceled."
 msgstr "ååæã"
 
-#: ../libemail-engine/mail-ops.c:967
+#: ../libemail-engine/mail-ops.c:976
 msgid "Complete."
 msgstr "åæã"
 
-#: ../libemail-engine/mail-ops.c:1079
+#: ../libemail-engine/mail-ops.c:1088
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "åéäçåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1080
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "åéäèèåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1197
+#: ../libemail-engine/mail-ops.c:1207
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æåèèèæåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1270
+#: ../libemail-engine/mail-ops.c:1281
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æçååååè '%s'"
 
-#: ../libemail-engine/mail-ops.c:1271
+#: ../libemail-engine/mail-ops.c:1282
 #, c-format
 msgid "Storing account '%s'"
 msgstr "åååè '%s'"
 
-#: ../libemail-engine/mail-ops.c:1345
+#: ../libemail-engine/mail-ops.c:1356
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æçã%sãçåæç"
@@ -10414,26 +10148,26 @@ msgstr "æçã%sãçåæç"
 msgid "Could not create spool directory '%s': %s"
 msgstr "çæåçæåååçéã%sãï%s"
 
-#: ../libemail-engine/mail-tools.c:112
+#: ../libemail-engine/mail-tools.c:111
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "æååèçåé mbox äæã%sãçéä"
 
-#: ../libemail-engine/mail-tools.c:224
+#: ../libemail-engine/mail-tools.c:229
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "èåçéä - %s"
 
-#: ../libemail-engine/mail-tools.c:226
+#: ../libemail-engine/mail-tools.c:231
 msgid "Forwarded message"
 msgstr "èåçéä"
 
-#: ../libemail-engine/mail-vfolder.c:129
+#: ../libemail-engine/mail-vfolder.c:130
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "èåæåèæåï %s"
 
-#: ../libemail-engine/mail-vfolder.c:282
+#: ../libemail-engine/mail-vfolder.c:283
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "ææã%sãçæåèæå- %s"
@@ -10443,7 +10177,7 @@ msgstr "ææã%sãçæåèæå- %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:647
+#: ../libemail-engine/mail-vfolder.c:648
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -10482,7 +10216,7 @@ msgstr "åèåç"
 
 #: ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3664
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3655
 #: ../mail/mail-config.ui.h:44
 msgid "Default"
 msgstr "éèå"
@@ -10515,7 +10249,7 @@ msgstr "æææäéåéääå"
 msgid "Missing domain in email address"
 msgstr "éåéääåçäçå"
 
-#: ../mail/e-mail-backend.c:726
+#: ../mail/e-mail-backend.c:734
 msgid "Unknown background operation"
 msgstr "äæçèææä"
 
@@ -10533,7 +10267,7 @@ msgstr "(ææäæ)"
 msgid "Evolution Account Assistant"
 msgstr "Evolution åèåç"
 
-#: ../mail/e-mail-config-auth-check.c:347
+#: ../mail/e-mail-config-auth-check.c:348
 msgid "Check for Supported Types"
 msgstr "ææææçéå"
 
@@ -10555,74 +10289,82 @@ msgstr ""
 msgid "Done"
 msgstr "åæ"
 
-#: ../mail/e-mail-config-defaults-page.c:527
+#: ../mail/e-mail-config-defaults-page.c:539
 msgid "Special Folders"
 msgstr "çæèæå"
 
-#: ../mail/e-mail-config-defaults-page.c:536
+#: ../mail/e-mail-config-defaults-page.c:548
 msgid "Draft Messages _Folder:"
 msgstr "èçéäèæå(_F):"
 
-#: ../mail/e-mail-config-defaults-page.c:546
+#: ../mail/e-mail-config-defaults-page.c:558
 msgid "Choose a folder for saving draft messages."
 msgstr "éæååèçéäçèæåã"
 
-#: ../mail/e-mail-config-defaults-page.c:560
+#: ../mail/e-mail-config-defaults-page.c:572
 msgid "Sent _Messages Folder:"
 msgstr "åééäèæå(_M):"
 
-#: ../mail/e-mail-config-defaults-page.c:570
+#: ../mail/e-mail-config-defaults-page.c:582
 msgid "Choose a folder for saving sent messages."
 msgstr "éæåååééäçèæåã"
 
-#: ../mail/e-mail-config-defaults-page.c:584
+#: ../mail/e-mail-config-defaults-page.c:596
 msgid "_Restore Defaults"
 msgstr "éåçéèå(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:598
+#: ../mail/e-mail-config-defaults-page.c:610
 msgid "Use a Real Folder for _Trash:"
 msgstr "åææäççåèæå(_T):"
 
-#: ../mail/e-mail-config-defaults-page.c:599
+#: ../mail/e-mail-config-defaults-page.c:611
 msgid "Choose a folder for deleted messages."
 msgstr "éæåééäçèæåã"
 
-#: ../mail/e-mail-config-defaults-page.c:608
+#: ../mail/e-mail-config-defaults-page.c:620
 msgid "Use a Real Folder for _Junk:"
 msgstr "ååéääççåèæå(_J):"
 
-#: ../mail/e-mail-config-defaults-page.c:609
+#: ../mail/e-mail-config-defaults-page.c:621
 msgid "Choose a folder for junk messages."
 msgstr "éæååéäçèæåã"
 
-#: ../mail/e-mail-config-defaults-page.c:626
+#: ../mail/e-mail-config-defaults-page.c:638
 msgid "Composing Messages"
 msgstr "æåçèéä"
 
-#: ../mail/e-mail-config-defaults-page.c:635
+#: ../mail/e-mail-config-defaults-page.c:647
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "äååéåæ (cc) ç(_S):"
 
-#: ../mail/e-mail-config-defaults-page.c:660
+#: ../mail/e-mail-config-defaults-page.c:672
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "äååéåäåæ (bcc) ç(_B):"
 
-#: ../mail/e-mail-config-defaults-page.c:695
+#: ../mail/e-mail-config-defaults-page.c:707
 msgid "Message Receipts"
 msgstr "éäåæ"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:716
 msgid "S_end message receipts:"
 msgstr "åééäåæ(_E):"
 
-#: ../mail/e-mail-config-defaults-page.c:735
+#: ../mail/e-mail-config-defaults-page.c:741
+msgid "Never"
+msgstr "æä"
+
+#: ../mail/e-mail-config-defaults-page.c:747
 msgid "Always"
 msgstr "æé"
 
-#: ../mail/e-mail-config-defaults-page.c:741
+#: ../mail/e-mail-config-defaults-page.c:753
 msgid "Ask for each message"
 msgstr "æåéäçèå"
 
+#: ../mail/e-mail-config-defaults-page.c:824
+msgid "Defaults"
+msgstr "éèå"
+
 #: ../mail/e-mail-config-identity-page.c:254
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -10681,6 +10423,10 @@ msgstr "åé(_G):"
 msgid "Add Ne_w Signature..."
 msgstr "ååæççåæ(_W)â"
 
+#: ../mail/e-mail-config-identity-page.c:640
+msgid "Identity"
+msgstr "èå"
+
 #: ../mail/e-mail-config-lookup-page.c:68
 msgid "Looking up account details..."
 msgstr "åæåèèçèæâ"
@@ -10824,6 +10570,14 @@ msgstr "ååï"
 msgid "Email Address:"
 msgstr "éåéääåï"
 
+#: ../mail/e-mail-config-summary-page.c:409
+msgid "Receiving"
+msgstr "ææä"
+
+#: ../mail/e-mail-config-summary-page.c:421
+msgid "Sending"
+msgstr "åéä"
+
 #: ../mail/e-mail-config-summary-page.c:433
 msgid "Server Type:"
 msgstr "äæåéåï"
@@ -10834,6 +10588,11 @@ msgstr "äæåéåï"
 msgid "Server:"
 msgstr "äæåï"
 
+#: ../mail/e-mail-config-summary-page.c:475
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+msgid "Username:"
+msgstr "äçèåçï"
+
 #: ../mail/e-mail-config-summary-page.c:496
 msgid "Security:"
 msgstr "ååæ:"
@@ -10861,35 +10620,35 @@ msgstr "æèäç"
 msgid "Account Editor"
 msgstr "åèçèå"
 
-#: ../mail/e-mail-display.c:121
+#: ../mail/e-mail-display.c:119
 msgid "_Add to Address Book..."
 msgstr "åååéèé(_A)â"
 
-#: ../mail/e-mail-display.c:128
+#: ../mail/e-mail-display.c:126
 msgid "_To This Address"
 msgstr "åéåäå(_T)"
 
-#: ../mail/e-mail-display.c:135
+#: ../mail/e-mail-display.c:133
 msgid "_From This Address"
 msgstr "åéåäå(_F)"
 
-#: ../mail/e-mail-display.c:142
+#: ../mail/e-mail-display.c:140
 msgid "Send _Reply To..."
 msgstr "åéåèå(_R)â"
 
-#: ../mail/e-mail-display.c:144
+#: ../mail/e-mail-display.c:142
 msgid "Send a reply message to this address"
 msgstr "åéåèéäåéåäå"
 
-#: ../mail/e-mail-display.c:151
+#: ../mail/e-mail-display.c:149
 msgid "Create Search _Folder"
 msgstr "åçæåèæå(_F)"
 
-#: ../mail/e-mail-display.c:161
+#: ../mail/e-mail-display.c:159
 msgid "Save _Image..."
 msgstr "åååç(_I)â"
 
-#: ../mail/e-mail-display.c:163
+#: ../mail/e-mail-display.c:161
 msgid "Save the image to a file"
 msgstr "ååçååçææ"
 
@@ -10948,12 +10707,12 @@ msgstr ""
 msgid "Color"
 msgstr "éè"
 
-#: ../mail/e-mail-migrate.c:646
+#: ../mail/e-mail-migrate.c:332
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "çæåã%sãåçæåéäèæåï%s"
 
-#: ../mail/e-mail-notebook-view.c:627
+#: ../mail/e-mail-notebook-view.c:269
 msgid "Please select a folder"
 msgstr "èéæèæå"
 
@@ -10962,641 +10721,641 @@ msgstr "èéæèæå"
 msgid "Page %d of %d"
 msgstr "ç %d / %d é"
 
-#: ../mail/e-mail-printer.c:536
+#: ../mail/e-mail-printer.c:549
 #: ../modules/calendar/e-cal-shell-view-actions.c:217
 #: ../modules/calendar/e-cal-shell-view-actions.c:246
 msgid "Print"
 msgstr "åå"
 
-#: ../mail/e-mail-printer.c:542
+#: ../mail/e-mail-printer.c:555
 msgid "Header Name"
 msgstr "æéåçï"
 
-#: ../mail/e-mail-printer.c:548
+#: ../mail/e-mail-printer.c:561
 msgid "Header Value"
 msgstr "æéæå"
 
-#: ../mail/e-mail-printer.c:596 ../mail/mail-config.ui.h:100
+#: ../mail/e-mail-printer.c:615 ../mail/mail-config.ui.h:102
 msgid "Headers"
 msgstr "æé"
 
-#: ../mail/e-mail-reader.c:357
+#: ../mail/e-mail-reader.c:349
 msgid "Save Image"
 msgstr "åååç"
 
-#: ../mail/e-mail-reader.c:440 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:431 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "èèèèæå"
 
-#: ../mail/e-mail-reader.c:440 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:431 ../mail/em-folder-utils.c:492
 msgid "C_opy"
 msgstr "èè(_O)"
 
-#: ../mail/e-mail-reader.c:974 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "çèèæå"
 
-#: ../mail/e-mail-reader.c:974 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:492
 msgid "_Move"
 msgstr "çå(_M)"
 
-#: ../mail/e-mail-reader.c:1335 ../mail/e-mail-reader.c:1517
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1313 ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1535
 msgid "_Do not ask me again."
 msgstr "äèåèåæ(_D)ã"
 
-#: ../mail/e-mail-reader.c:1563
+#: ../mail/e-mail-reader.c:1541
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æéåçéäèåçåèæä(_A)"
 
-#: ../mail/e-mail-reader.c:1747
+#: ../mail/e-mail-reader.c:1726
 msgid "Failed to retrieve message:"
 msgstr "ååéäåæï"
 
-#: ../mail/e-mail-reader.c:1793 ../mail/e-mail-reader.c:2882
+#: ../mail/e-mail-reader.c:1772 ../mail/e-mail-reader.c:2862
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æåååéäã%sã"
 
-#: ../mail/e-mail-reader.c:1969
+#: ../mail/e-mail-reader.c:1949
 msgid "A_dd Sender to Address Book"
 msgstr "åååäèåçéæå(_D)"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:1951
 msgid "Add sender to address book"
 msgstr "æååäèèéèé"
 
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1956
 msgid "Check for _Junk"
 msgstr "ææååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:1958
 msgid "Filter the selected messages for junk status"
 msgstr "çéæéääçååéäçæ"
 
-#: ../mail/e-mail-reader.c:1983
+#: ../mail/e-mail-reader.c:1963
 msgid "_Copy to Folder..."
 msgstr "èèèèæå(_C)â"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:1965
 msgid "Copy selected messages to another folder"
 msgstr "èèåéåçéäååäåèæå"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1970
 msgid "_Delete Message"
 msgstr "åééä(_D)"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:1972
 msgid "Mark the selected messages for deletion"
 msgstr "åéåçéäæçæèåé"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:1977
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "åéäèååçéæåèå(_L)â"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:1979
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "çéåéäèååçéæåèå"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:1984
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "åæäèåçéæåèå(_R)â"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:1986
 msgid "Create a rule to filter messages to these recipients"
 msgstr "çéäæäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:1991
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "ååäèåçéæåèå(_N)â"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:1993
 msgid "Create a rule to filter messages from this sender"
 msgstr "çéååäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:1998
 msgid "Create a Filter Rule for _Subject..."
 msgstr "åäæåçéæåèå(_S)â"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2000
 msgid "Create a rule to filter messages with this subject"
 msgstr "çéåäæåçéæåèå"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2005
 msgid "A_pply Filters"
 msgstr "åçéæå(_P)"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2007
 msgid "Apply filter rules to the selected messages"
 msgstr "åçéæåèåææéåçéä"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2012
 msgid "_Find in Message..."
 msgstr "åéäååæ(_F)â"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2014
 msgid "Search for text in the body of the displayed message"
 msgstr "æåéççéäææäçæå"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2019
 msgid "_Clear Flag"
 msgstr "æéæå(_C)"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2021
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "çééåéäçèéææ"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2026
 msgid "_Flag Completed"
 msgstr "æèçååæ(_F)"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2028
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ååéåéäçèéææèçååæ"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2033
 msgid "Follow _Up..."
 msgstr "èé(_U)â"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2035
 msgid "Flag the selected messages for follow-up"
 msgstr "åéåçéäåäèéææ"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2040
 msgid "_Attached"
 msgstr "éä(_A)"
 
-#: ../mail/e-mail-reader.c:2062 ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2042 ../mail/e-mail-reader.c:2049
 msgid "Forward the selected message to someone as an attachment"
 msgstr "åéåçéääéäååèåçæä"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2047
 msgid "Forward As _Attached"
 msgstr "äéäèå(_A)"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2054
 msgid "_Inline"
 msgstr "èå(_I)"
 
-#: ../mail/e-mail-reader.c:2076 ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:2056 ../mail/e-mail-reader.c:2063
 msgid "Forward the selected message in the body of a new message"
 msgstr "åéèèåçéäåéææéäçåæä"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2061
 msgid "Forward As _Inline"
 msgstr "äèåèå(_I)"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2068
 msgid "_Quoted"
 msgstr "åæ(_Q)"
 
-#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2070 ../mail/e-mail-reader.c:2077
 msgid "Forward the selected message quoted like a reply"
 msgstr "åéèèåçéääåèéäæååå"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2075
 msgid "Forward As _Quoted"
 msgstr "äåæèå(_Q)"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2082
 msgid "_Load Images"
 msgstr "èååç(_L)"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2084
 msgid "Force images in HTML mail to be loaded"
 msgstr "éè HTML æåçéäæåèèååç"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2089
 msgid "_Important"
 msgstr "éè(_I)"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2091
 msgid "Mark the selected messages as important"
 msgstr "åéåçéäæçæéè"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2096
 msgid "_Junk"
 msgstr "ååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2098
 msgid "Mark the selected messages as junk"
 msgstr "åéåçéäæçæååéä"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2103
 msgid "_Not Junk"
 msgstr "äæååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2105
 msgid "Mark the selected messages as not being junk"
 msgstr "åéåçéäæçæäæååéä"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2110
 msgid "_Read"
 msgstr "åéè(_R)"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2112
 msgid "Mark the selected messages as having been read"
 msgstr "åéåçéäæçæåçéè"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2117
 msgid "Uni_mportant"
 msgstr "äéè(_M)"
 
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2119
 msgid "Mark the selected messages as unimportant"
 msgstr "åéåçéäæçæäéè"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2124
 msgid "_Unread"
 msgstr "æéè(_U)"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2126
 msgid "Mark the selected messages as not having been read"
 msgstr "åéåçéäæçææéè"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2131
 msgid "_Edit as New Message..."
 msgstr "çèçæéä(_E)â"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2133
 msgid "Open the selected messages in the composer for editing"
 msgstr "åæåèçéåéåçéäääçè"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2138
 msgid "Compose _New Message"
 msgstr "æåæéä(_N)"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2140
 msgid "Open a window for composing a mail message"
 msgstr "éåèçääæåéä"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2145
 msgid "_Open in New Window"
 msgstr "åæèçéå(_O)"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2147
 msgid "Open the selected messages in a new window"
 msgstr "äçæèçéåéåçéä"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2152
 msgid "_Move to Folder..."
 msgstr "çèèæå(_M)â"
 
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2154
 msgid "Move selected messages to another folder"
 msgstr "åéåçéäçèåäåèæå"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2159
 msgid "_Switch to Folder"
 msgstr "åæèèæå(_S)"
 
-#: ../mail/e-mail-reader.c:2181
+#: ../mail/e-mail-reader.c:2161
 msgid "Display the parent folder"
 msgstr "éçäåèæå"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2166
 msgid "Switch to _next tab"
 msgstr "åæèääååé(_N)"
 
-#: ../mail/e-mail-reader.c:2188
+#: ../mail/e-mail-reader.c:2168
 msgid "Switch to the next tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2173
 msgid "Switch to _previous tab"
 msgstr "åæèääååé(_P)"
 
-#: ../mail/e-mail-reader.c:2195
+#: ../mail/e-mail-reader.c:2175
 msgid "Switch to the previous tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2180
 msgid "Cl_ose current tab"
 msgstr "ééçåçåé(_O)"
 
-#: ../mail/e-mail-reader.c:2202
+#: ../mail/e-mail-reader.c:2182
 msgid "Close current tab"
 msgstr "ééçåçåé"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2187
 msgid "_Next Message"
 msgstr "ääåéä(_N)"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2189
 msgid "Display the next message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2194
 msgid "Next _Important Message"
 msgstr "ääåéèéä(_I)"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2196
 msgid "Display the next important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2201
 msgid "Next _Thread"
 msgstr "ääåçééä(_T)"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2203
 msgid "Display the next thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2208
 msgid "Next _Unread Message"
 msgstr "ääåæéèçéä(_U)"
 
-#: ../mail/e-mail-reader.c:2230
+#: ../mail/e-mail-reader.c:2210
 msgid "Display the next unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2215
 msgid "_Previous Message"
 msgstr "ääåéä(_P)"
 
-#: ../mail/e-mail-reader.c:2237
+#: ../mail/e-mail-reader.c:2217
 msgid "Display the previous message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2222
 msgid "Pr_evious Important Message"
 msgstr "ääåéèéä(_E)"
 
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2224
 msgid "Display the previous important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2229
 msgid "Previous T_hread"
 msgstr "ääåçééä(_H)"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2231
 msgid "Display the previous thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2236
 msgid "P_revious Unread Message"
 msgstr "ääåæéèçéä(_R)"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2238
 msgid "Display the previous unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2265
+#: ../mail/e-mail-reader.c:2245
 msgid "Print this message"
 msgstr "ååéä"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../mail/e-mail-reader.c:2252
 msgid "Preview the message to be printed"
 msgstr "éèéèååçéä"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2257
 msgid "Re_direct"
 msgstr "éæåå(_D)"
 
-#: ../mail/e-mail-reader.c:2279
+#: ../mail/e-mail-reader.c:2259
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "åéåçéäéæååçæä"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2264
 msgid "Remo_ve Attachments"
 msgstr "çééä(_V)"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../mail/e-mail-reader.c:2266
 msgid "Remove attachments"
 msgstr "çééä"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2271
 msgid "Remove Du_plicate Messages"
 msgstr "çééèçéä(_P)"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2273
 msgid "Checks selected messages for duplicates"
 msgstr "ææéåçéäæåæéè"
 
-#: ../mail/e-mail-reader.c:2298 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2278 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1574
 #: ../modules/mail/e-mail-attachment-handler.c:182
 msgid "Reply to _All"
 msgstr "åèææä(_A)"
 
-#: ../mail/e-mail-reader.c:2300
+#: ../mail/e-mail-reader.c:2280
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æååéçåéåéäçåéæäè"
 
-#: ../mail/e-mail-reader.c:2305 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2285 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "åèèæå(_L)"
 
-#: ../mail/e-mail-reader.c:2307
+#: ../mail/e-mail-reader.c:2287
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æååéçæéåéäçéäèå"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2292
 #: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Reply to Sender"
 msgstr "åèåäè(_R)"
 
-#: ../mail/e-mail-reader.c:2314
+#: ../mail/e-mail-reader.c:2294
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æååéçæéåçéäçåäè"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2299
 msgid "_Save as mbox..."
 msgstr "ååæ mbox(_S)â"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2301
 msgid "Save selected messages as an mbox file"
 msgstr "åéåçéäååæ mbox ææ"
 
-#: ../mail/e-mail-reader.c:2326
+#: ../mail/e-mail-reader.c:2306
 msgid "_Message Source"
 msgstr "éääæ(_M)"
 
-#: ../mail/e-mail-reader.c:2328
+#: ../mail/e-mail-reader.c:2308
 msgid "Show the raw email source of the message"
 msgstr "éçéäååæ"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2320
 msgid "_Undelete Message"
 msgstr "åååééä(_U)"
 
-#: ../mail/e-mail-reader.c:2342
+#: ../mail/e-mail-reader.c:2322
 msgid "Undelete the selected messages"
 msgstr "åæåééåçéä"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2327
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../mail/e-mail-reader.c:2349
+#: ../mail/e-mail-reader.c:2329
 msgid "Reset the text to its original size"
 msgstr "éèæåçåååå"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2334
 msgid "_Zoom In"
 msgstr "æè(_Z)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2336
 msgid "Increase the text size"
 msgstr "åæåæå"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2341
 msgid "Zoom _Out"
 msgstr "æé(_O)"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2343
 msgid "Decrease the text size"
 msgstr "åæåçå"
 
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2350
 msgid "Cre_ate"
 msgstr "åç(_A)"
 
-#: ../mail/e-mail-reader.c:2377
+#: ../mail/e-mail-reader.c:2357
 msgid "Ch_aracter Encoding"
 msgstr "åççç(_A)"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2364
 msgid "F_orward As"
 msgstr "èåç(_O)"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2371
 msgid "_Group Reply"
 msgstr "ççåè(_G)"
 
-#: ../mail/e-mail-reader.c:2398
+#: ../mail/e-mail-reader.c:2378
 msgid "_Go To"
 msgstr "çè(_G)"
 
-#: ../mail/e-mail-reader.c:2405
+#: ../mail/e-mail-reader.c:2385
 msgid "Mar_k As"
 msgstr "æçæ(_K)"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2392
 msgid "_Message"
 msgstr "éä(_M)"
 
-#: ../mail/e-mail-reader.c:2419
+#: ../mail/e-mail-reader.c:2399
 msgid "_Zoom"
 msgstr "çæ(_Z)"
 
-#: ../mail/e-mail-reader.c:2429
+#: ../mail/e-mail-reader.c:2409
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "åéäèååçæåèæå(_L)â"
 
-#: ../mail/e-mail-reader.c:2431
+#: ../mail/e-mail-reader.c:2411
 msgid "Create a search folder for this mailing list"
 msgstr "çéåéäèååçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2416
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "åæäèåçæåèæå(_T)â"
 
-#: ../mail/e-mail-reader.c:2438
+#: ../mail/e-mail-reader.c:2418
 msgid "Create a search folder for these recipients"
 msgstr "çéäæäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2423
 msgid "Create a Search Folder from Sen_der..."
 msgstr "ååäèåçæåèæå(_D)â"
 
-#: ../mail/e-mail-reader.c:2445
+#: ../mail/e-mail-reader.c:2425
 msgid "Create a search folder for this sender"
 msgstr "çéååäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2450
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a Search Folder from S_ubject..."
 msgstr "åäæåçæåèæå(_U)â"
 
-#: ../mail/e-mail-reader.c:2452
+#: ../mail/e-mail-reader.c:2432
 msgid "Create a search folder for this subject"
 msgstr "çéåäæåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2475
+#: ../mail/e-mail-reader.c:2455
 msgid "Mark for Follo_w Up..."
 msgstr "æççèé(_W)â"
 
-#: ../mail/e-mail-reader.c:2483
+#: ../mail/e-mail-reader.c:2463
 msgid "Mark as _Important"
 msgstr "æçæéè(_I)"
 
-#: ../mail/e-mail-reader.c:2487
+#: ../mail/e-mail-reader.c:2467
 msgid "Mark as _Junk"
 msgstr "æçæååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2491
+#: ../mail/e-mail-reader.c:2471
 msgid "Mark as _Not Junk"
 msgstr "æçæéååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2495
+#: ../mail/e-mail-reader.c:2475
 msgid "Mar_k as Read"
 msgstr "æçæåéè(_K)"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../mail/e-mail-reader.c:2479
 msgid "Mark as Uni_mportant"
 msgstr "æçæäéè(_M)"
 
-#: ../mail/e-mail-reader.c:2503
+#: ../mail/e-mail-reader.c:2483
 msgid "Mark as _Unread"
 msgstr "æçææéè(_U)"
 
-#: ../mail/e-mail-reader.c:2547
+#: ../mail/e-mail-reader.c:2527
 msgid "_Caret Mode"
 msgstr "æåæå(_C)"
 
-#: ../mail/e-mail-reader.c:2549
+#: ../mail/e-mail-reader.c:2529
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "åéççéäåæäéçéçææ"
 
-#: ../mail/e-mail-reader.c:2555
+#: ../mail/e-mail-reader.c:2535
 msgid "All Message _Headers"
 msgstr "ææéäæé(_H)"
 
-#: ../mail/e-mail-reader.c:2557
+#: ../mail/e-mail-reader.c:2537
 msgid "Show messages with all email headers"
 msgstr "éçéäåèçæé"
 
-#: ../mail/e-mail-reader.c:2888
+#: ../mail/e-mail-reader.c:2868
 msgid "Retrieving message"
 msgstr "ååéä"
 
-#: ../mail/e-mail-reader.c:3860
+#: ../mail/e-mail-reader.c:3851
 #: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "èå(_F)"
 
-#: ../mail/e-mail-reader.c:3861
+#: ../mail/e-mail-reader.c:3852
 msgid "Forward the selected message to someone"
 msgstr "åéåçéäèåçæä"
 
-#: ../mail/e-mail-reader.c:3880
+#: ../mail/e-mail-reader.c:3871
 msgid "Group Reply"
 msgstr "ççåè"
 
-#: ../mail/e-mail-reader.c:3881
+#: ../mail/e-mail-reader.c:3872
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "åèçéäèåïææçææçæäè"
 
-#: ../mail/e-mail-reader.c:3938 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3929 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "åé"
 
-#: ../mail/e-mail-reader.c:3971
+#: ../mail/e-mail-reader.c:3962
 #: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Next"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3975
+#: ../mail/e-mail-reader.c:3966
 #: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Previous"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3984 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3975 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "åè"
 
-#: ../mail/e-mail-reader.c:4714
+#: ../mail/e-mail-reader.c:4705
 #, c-format
 msgid "Folder '%s'"
 msgstr "èæåã%sã"
@@ -11605,13 +11364,13 @@ msgstr "èæåã%sã"
 msgid "Do not warn me again"
 msgstr "äèåèåæ"
 
-#: ../mail/e-mail-reader-utils.c:949
+#: ../mail/e-mail-reader-utils.c:954
 msgid "Printing"
 msgstr "åå"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1130
+#: ../mail/e-mail-reader-utils.c:1136
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11621,7 +11380,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "èæåã%sãåå %u åéèçéäãäçåèåéåï"
 
-#: ../mail/e-mail-reader-utils.c:1534
+#: ../mail/e-mail-reader-utils.c:1541
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ååéä"
@@ -11631,12 +11390,12 @@ msgstr[0] "ååéä"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1555
+#: ../mail/e-mail-reader-utils.c:1562
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "éä"
 
-#: ../mail/e-mail-reader-utils.c:2010
+#: ../mail/e-mail-reader-utils.c:2017
 msgid "Parsing message"
 msgstr "èæéä"
 
@@ -11653,33 +11412,33 @@ msgstr "èèéçæå"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1287
+#: ../mail/em-composer-utils.c:1282
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr "æ ${AbbrevWeekdayName}ï${Year}-${Month}-${Day} æ ${24Hour}:${Minute} ${TimeZone}ï${Sender} æåï"
 
-#: ../mail/em-composer-utils.c:1293
+#: ../mail/em-composer-utils.c:1288
 msgid "-------- Forwarded Message --------"
 msgstr "-------- èéçéä --------"
 
-#: ../mail/em-composer-utils.c:1298
+#: ../mail/em-composer-utils.c:1293
 msgid "-----Original Message-----"
 msgstr "-----ååéä-----"
 
-#: ../mail/em-composer-utils.c:2578
+#: ../mail/em-composer-utils.c:2573
 msgid "an unknown sender"
 msgstr "äæçåäè"
 
-#: ../mail/em-composer-utils.c:2996
+#: ../mail/em-composer-utils.c:2991
 msgid "Posting destination"
 msgstr "åèçççç"
 
-#: ../mail/em-composer-utils.c:2997
+#: ../mail/em-composer-utils.c:2992
 msgid "Choose folders to post the message to."
 msgstr "éåèæåäåèéäã"
 
-#: ../mail/em-filter-editor-folder-element.c:156
+#: ../mail/em-filter-editor-folder-element.c:158
 msgid "Select Folder"
 msgstr "éæèæå"
 
@@ -11804,7 +11563,7 @@ msgstr "æèå"
 msgid "is set"
 msgstr "èå"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:107
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:109
 msgid "Junk"
 msgstr "ååéä"
 
@@ -11938,11 +11697,11 @@ msgid "Unset Status"
 msgstr "åæèåçæ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:581
+#: ../mail/em-filter-rule.c:583
 msgid "Then"
 msgstr "æçææ"
 
-#: ../mail/em-filter-rule.c:646
+#: ../mail/em-filter-rule.c:648
 msgid "Add Ac_tion"
 msgstr "åååä(_T)"
 
@@ -11982,41 +11741,41 @@ msgstr "åç(_R)"
 msgid "Folder _name:"
 msgstr "èæååç(_N):"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:644
 msgid "Folder names cannot contain '/'"
 msgstr "èæååçäèååæçã"
 
-#: ../mail/em-folder-tree.c:783
+#: ../mail/em-folder-tree.c:780
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1608
+#: ../mail/em-folder-tree.c:1605
 msgid "Mail Folder Tree"
 msgstr "éäèæåæ"
 
-#: ../mail/em-folder-tree.c:2134 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2132 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "æåçåèæå %s"
 
-#: ../mail/em-folder-tree.c:2137 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2135 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "æåèèèæå %s"
 
-#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2304
+#: ../mail/em-folder-tree.c:2142 ../mail/message-list.c:2301
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æååéäçèèæå %s"
 
-#: ../mail/em-folder-tree.c:2148 ../mail/message-list.c:2306
+#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2303
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æåèèéäèèæå %s"
 
-#: ../mail/em-folder-tree.c:2167
+#: ../mail/em-folder-tree.c:2165
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "çæåéäææåæäåçååå"
@@ -12030,19 +11789,19 @@ msgstr "äçå"
 msgid "Loading..."
 msgstr "èåäâ"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:493
 msgid "Move Folder To"
 msgstr "çåèæåå"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:493
 msgid "Copy Folder To"
 msgstr "èèèæåå"
 
-#: ../mail/em-folder-utils.c:586
+#: ../mail/em-folder-utils.c:590
 msgid "Create Folder"
 msgstr "åçèæå"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:591
 msgid "Specify where to create the folder:"
 msgstr "æåèåçèæåçäçï"
 
@@ -12058,8 +11817,8 @@ msgstr "èéççèé(_B)"
 msgid "Subscribe To _All"
 msgstr "åéèé(_A)"
 
-#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1844
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "_Unsubscribe"
 msgstr "åæèé(_U)"
 
@@ -12071,56 +11830,56 @@ msgstr "åæèééèç(_B)"
 msgid "Unsubscribe From _All"
 msgstr "åéåæèé(_A)"
 
-#: ../mail/em-subscription-editor.c:1679
+#: ../mail/em-subscription-editor.c:1682
 msgid "Folder Subscriptions"
 msgstr "èæåèé"
 
-#: ../mail/em-subscription-editor.c:1719
+#: ../mail/em-subscription-editor.c:1722
 msgid "_Account:"
 msgstr "åè(_A):"
 
-#: ../mail/em-subscription-editor.c:1734
+#: ../mail/em-subscription-editor.c:1737
 msgid "Clear Search"
 msgstr "æéæå"
 
-#: ../mail/em-subscription-editor.c:1752
+#: ../mail/em-subscription-editor.c:1755
 msgid "Sho_w items that contain:"
 msgstr "éçéçåå(_W):"
 
-#: ../mail/em-subscription-editor.c:1797
+#: ../mail/em-subscription-editor.c:1800
 msgid "Subscribe to the selected folder"
 msgstr "èééåçèæå"
 
-#: ../mail/em-subscription-editor.c:1798
+#: ../mail/em-subscription-editor.c:1801
 msgid "Su_bscribe"
 msgstr "èé(_B)"
 
-#: ../mail/em-subscription-editor.c:1843
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../mail/em-subscription-editor.c:1846
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
 msgid "Unsubscribe from the selected folder"
 msgstr "åæèééåçèæå"
 
-#: ../mail/em-subscription-editor.c:1883
+#: ../mail/em-subscription-editor.c:1886
 msgid "Collapse all folders"
 msgstr "ææææçèæå"
 
-#: ../mail/em-subscription-editor.c:1884
+#: ../mail/em-subscription-editor.c:1887
 msgid "C_ollapse All"
 msgstr "åéææ(_O)"
 
-#: ../mail/em-subscription-editor.c:1894
+#: ../mail/em-subscription-editor.c:1897
 msgid "Expand all folders"
 msgstr "åéææçèæå"
 
-#: ../mail/em-subscription-editor.c:1895
+#: ../mail/em-subscription-editor.c:1898
 msgid "E_xpand All"
 msgstr "åéåé(_X)"
 
-#: ../mail/em-subscription-editor.c:1905
+#: ../mail/em-subscription-editor.c:1908
 msgid "Refresh the folder list"
 msgstr "éææçèæåæå"
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../mail/em-subscription-editor.c:1920
 msgid "Stop the current operation"
 msgstr "åæçåçæä"
 
@@ -12143,7 +11902,7 @@ msgstr "äèåéçéåèæ(_D)"
 msgid "Message Filters"
 msgstr "éäèå"
 
-#: ../mail/em-utils.c:1064
+#: ../mail/em-utils.c:1067
 #, c-format
 msgid "Messages from %s"
 msgstr "äè %s çéä"
@@ -12152,35 +11911,35 @@ msgstr "äè %s çéä"
 msgid "Search _Folders"
 msgstr "æåèæå(_F)"
 
-#: ../mail/em-vfolder-editor-rule.c:388
+#: ../mail/em-vfolder-editor-rule.c:391
 msgid "Add Folder"
 msgstr "ååèæå"
 
-#: ../mail/em-vfolder-editor-rule.c:514
+#: ../mail/em-vfolder-editor-rule.c:517
 msgid "Search Folder Sources"
 msgstr "æåèæåäæ"
 
-#: ../mail/em-vfolder-editor-rule.c:544
+#: ../mail/em-vfolder-editor-rule.c:549
 msgid "Automatically update on any _source folder change"
 msgstr "äæèæåäæääæææèåææ(_S)"
 
-#: ../mail/em-vfolder-editor-rule.c:556
+#: ../mail/em-vfolder-editor-rule.c:561
 msgid "All local folders"
 msgstr "æææåçèæå"
 
-#: ../mail/em-vfolder-editor-rule.c:557
+#: ../mail/em-vfolder-editor-rule.c:562
 msgid "All active remote folders"
 msgstr "ææåççéçèæå"
 
-#: ../mail/em-vfolder-editor-rule.c:558
+#: ../mail/em-vfolder-editor-rule.c:563
 msgid "All local and active remote folders"
 msgstr "æææåçååççéçèæå"
 
-#: ../mail/em-vfolder-editor-rule.c:559
+#: ../mail/em-vfolder-editor-rule.c:564
 msgid "Specific folders"
 msgstr "æåçèæå"
 
-#: ../mail/em-vfolder-editor-rule.c:594
+#: ../mail/em-vfolder-editor-rule.c:602
 msgid "include subfolders"
 msgstr "åæåçé"
 
@@ -12189,7 +11948,7 @@ msgid "Importing Elm data"
 msgstr "èå Elm èæ"
 
 #: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1071
+#: ../modules/mail/e-mail-shell-view.c:1074
 #: ../widgets/misc/e-send-options.c:538
 msgid "Mail"
 msgstr "éä"
@@ -12219,22 +11978,22 @@ msgstr "éæèæå"
 msgid "Select folder to import into"
 msgstr "éåèæåäèå"
 
-#: ../mail/importers/evolution-mbox-importer.c:438
+#: ../mail/importers/evolution-mbox-importer.c:439
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "äæ"
 
-#: ../mail/importers/evolution-mbox-importer.c:443
+#: ../mail/importers/evolution-mbox-importer.c:444
 msgctxt "mboxImp"
 msgid "From"
 msgstr "åäè"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../mail/importers/evolution-mbox-importer.c:488
 #: ../shell/e-shell-utils.c:195
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley éääç (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:488
+#: ../mail/importers/evolution-mbox-importer.c:489
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "åå Berkeley éääçæåèæå"
 
@@ -12585,131 +12344,136 @@ msgid "Fix_ed Width Font:"
 msgstr "ååéååå(_E):"
 
 #: ../mail/mail-config.ui.h:77
+#| msgid "Mark Me_ssages as Read"
+msgid "_Mark messages as read after"
+msgstr "åéäæçæåçéèæ(_M)"
+
+#: ../mail/mail-config.ui.h:79
 msgid "Highlight _quotations with"
 msgstr "åèåæç(_Q)"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "color"
 msgstr "èå"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Default character e_ncoding:"
 msgstr "éèåççç(_N):"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Apply the same _view settings to all folders"
 msgstr "åææèæååççåçæèèåå(_V)"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "F_all back to threading messages by subject"
 msgstr "éååææäæççééä(_A)"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "Delete Mail"
 msgstr "åééä"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:85
 msgid "Empty trash folders on e_xit"
 msgstr "ééææçåæçèæå(_X)"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:86
 msgid "Confirm _when expunging a folder"
 msgstr "åéèæåæçè(_W)"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:88
 msgid "_Show animated images"
 msgstr "ææåçåç(_S)"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:89
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "çåé HTML éäçäææåéééäçèçäæéçæç(_P)"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:90
 msgid "Loading Images"
 msgstr "æåèååç"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:91
 msgid "_Never load images from the Internet"
 msgstr "äåäèççäèåç(_N)"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:92
 msgid "_Load images only in messages from contacts"
 msgstr "åèåçèçäååéääçåç(_L)"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:93
 msgid "_Always load images from the Internet"
 msgstr "äåèççäèåç(_A)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94
 msgid "HTML Messages"
 msgstr "HTML éä"
 
-#: ../mail/mail-config.ui.h:93 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "æç"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:96
 msgid "Sender Photograph"
 msgstr "åäèçç"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:97
 msgid "_Show the photograph of sender in the message preview"
 msgstr "åéäéèéçåäèçç(_S)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:98
 msgid "S_earch for sender photograph only in local address books"
 msgstr "åæåæåçéèéäçåäèçç(_E)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:99
 msgid "Displayed Message Headers"
 msgstr "éççéäæé"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:100
 msgid "Mail Headers Table"
 msgstr "éäæéè"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:101
 #: ../modules/addressbook/autocompletion-config.c:90
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "ææ/æåæå"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:103
 msgid "Check incoming _messages for junk"
 msgstr "ææåééäæåçååéä(_M)"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:104
 msgid "Delete junk messages on e_xit"
 msgstr "ééæåéååéä(_X)"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:105
 msgid "Check cu_stom headers for junk"
 msgstr "äèéæéææååéä(_S)"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:106
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "èåäèåæçéèéäåäèåéäæèçååéä(_K)"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:107
 msgid "_Lookup in local address book only"
 msgstr "ååæåéèéæè(_L)"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:108
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "åææåçåçèéååéäæééåééåæèåçã"
 
-#: ../mail/mail-config.ui.h:108 ../modules/addressbook/ldap-config.ui.h:3
+#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:3
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:237
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:161
 msgid "No encryption"
 msgstr "ææåå"
 
-#: ../mail/mail-config.ui.h:109 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
 msgid "TLS encryption"
 msgstr "TLS åå"
 
-#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
 msgid "SSL encryption"
 msgstr "SSL åå"
 
@@ -12960,7 +12724,7 @@ msgid ""
 msgstr "èæäçéææèæåäææåéçéäï"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "_Empty Trash"
 msgstr "æçåæç(_E)"
 
@@ -13473,23 +13237,23 @@ msgstr "çæéè {0} äçæäã"
 msgid "Canceling..."
 msgstr "æååæâ"
 
-#: ../mail/mail-send-recv.c:537
+#: ../mail/mail-send-recv.c:547
 msgid "Send & Receive Mail"
 msgstr "åéèææéä"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:563
 msgid "Cancel _All"
 msgstr "åéåæ(_A)"
 
-#: ../mail/mail-send-recv.c:646 ../mail/mail-send-recv.c:1030
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
 msgid "Updating..."
 msgstr "ææäâ"
 
-#: ../mail/mail-send-recv.c:646 ../mail/mail-send-recv.c:727
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:737
 msgid "Waiting..."
 msgstr "æåçåâ"
 
-#: ../mail/mail-send-recv.c:1010
+#: ../mail/mail-send-recv.c:1020
 #, c-format
 msgid "Checking for new mail"
 msgstr "æææéä"
@@ -13506,91 +13270,91 @@ msgstr "çèæåèæå"
 msgid "New Search Folder"
 msgstr "æåæåèæå"
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:1262
 msgid "Unseen"
 msgstr "æéè"
 
-#: ../mail/message-list.c:1273
+#: ../mail/message-list.c:1263
 msgid "Seen"
 msgstr "åéè"
 
-#: ../mail/message-list.c:1274
+#: ../mail/message-list.c:1264
 msgid "Answered"
 msgstr "ååè"
 
-#: ../mail/message-list.c:1275
+#: ../mail/message-list.c:1265
 msgid "Forwarded"
 msgstr "èå"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:1266
 msgid "Multiple Unseen Messages"
 msgstr "ååæéèçéä"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:1267
 msgid "Multiple Messages"
 msgstr "ååéä"
 
-#: ../mail/message-list.c:1281
+#: ../mail/message-list.c:1271
 msgid "Lowest"
 msgstr "æä"
 
-#: ../mail/message-list.c:1282
+#: ../mail/message-list.c:1272
 msgid "Lower"
 msgstr "ä"
 
-#: ../mail/message-list.c:1286
+#: ../mail/message-list.c:1276
 msgid "Higher"
 msgstr "é"
 
-#: ../mail/message-list.c:1287
+#: ../mail/message-list.c:1277
 msgid "Highest"
 msgstr "æé"
 
-#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
+#: ../mail/message-list.c:1900 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../modules/itip-formatter/itip-view.c:249
+#: ../mail/message-list.c:1907 ../modules/itip-formatter/itip-view.c:249
 msgid "Today %l:%M %p"
 msgstr "äå %p %l:%M"
 
-#: ../mail/message-list.c:1925
+#: ../mail/message-list.c:1916
 msgid "Yesterday %l:%M %p"
 msgstr "æå %p %l:%M"
 
-#: ../mail/message-list.c:1937
+#: ../mail/message-list.c:1928
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../mail/message-list.c:1945
+#: ../mail/message-list.c:1936
 msgid "%b %d %l:%M %p"
 msgstr "%mæ%dæ %p %l:%M"
 
-#: ../mail/message-list.c:1947
+#: ../mail/message-list.c:1938
 msgid "%b %d %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../mail/message-list.c:2777
+#: ../mail/message-list.c:2769
 msgid "Select all visible messages"
 msgstr "éæåéåèçéä"
 
-#: ../mail/message-list.c:2913 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2907 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "éä"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4140
+#: ../mail/message-list.c:4132
 msgid "Follow-up"
 msgstr "èé"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4699 ../mail/message-list.c:5119
+#: ../mail/message-list.c:4634 ../mail/message-list.c:5038
 msgid "Generating message list"
 msgstr "ççéäæå"
 
-#: ../mail/message-list.c:4933
+#: ../mail/message-list.c:4868
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -13598,7 +13362,7 @@ msgid ""
 "by changing the query above."
 msgstr "ææéäæèäçæåæäãèåäåäæåéåéæéçéäéæåæåèæçæåïåå æå->æé éåéçæéåææèäéçæèã"
 
-#: ../mail/message-list.c:4938
+#: ../mail/message-list.c:4873
 msgid "There are no messages in this folder."
 msgstr "éåèæåäææéäã"
 
@@ -13635,33 +13399,33 @@ msgid "Subject or Addresses contains"
 msgstr "äææéåéääååå"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Recipients contain"
 msgstr "æäèåå"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Message contains"
 msgstr "éäåå"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Subject contains"
 msgstr "äæåå"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Sender contains"
 msgstr "åäèåå"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Body contains"
 msgstr "åæåå"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:96
-#: ../modules/mail/em-mailer-prefs.c:1069
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "_Table column:"
 msgstr "èææ(_T):"
 
@@ -13803,7 +13567,7 @@ msgstr "éçåéåéèéäææèçäçåå"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1448
 #: ../modules/calendar/e-memo-shell-view-actions.c:665
 #: ../modules/calendar/e-task-shell-view-actions.c:789
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "_Rename..."
 msgstr "éæåå(_R)â"
 
@@ -13884,7 +13648,7 @@ msgstr "åä(_A)"
 #: ../modules/addressbook/e-book-shell-view-actions.c:939
 #: ../modules/calendar/e-memo-shell-view-actions.c:702
 #: ../modules/calendar/e-task-shell-view-actions.c:854
-#: ../modules/mail/e-mail-shell-view-actions.c:1473
+#: ../modules/mail/e-mail-shell-view-actions.c:1475
 msgid "_Preview"
 msgstr "éè(_P)"
 
@@ -13896,7 +13660,7 @@ msgid "_Delete"
 msgstr "åé(_D)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:952
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "_Properties"
 msgstr "åæ(_P)"
 
@@ -13923,7 +13687,7 @@ msgstr "åèçäéèèçéçåå"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1017
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
 #: ../modules/calendar/e-task-shell-view-actions.c:936
-#: ../modules/mail/e-mail-shell-view-actions.c:1599
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "_Classic View"
 msgstr "åçæè(_C)"
 
@@ -13934,7 +13698,7 @@ msgstr "åèçäæåäæéçèçäéè"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1024
 #: ../modules/calendar/e-memo-shell-view-actions.c:779
 #: ../modules/calendar/e-task-shell-view-actions.c:943
-#: ../modules/mail/e-mail-shell-view-actions.c:1606
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "_Vertical View"
 msgstr "åçæè(_V)"
 
@@ -13960,7 +13724,7 @@ msgstr "ææççèæ"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1791
 #: ../modules/calendar/e-memo-shell-view-actions.c:806
 #: ../modules/calendar/e-task-shell-view-actions.c:1005
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "ééæå"
@@ -14184,104 +13948,104 @@ msgstr "éå Evolution èæ(_E)..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "åææåéå Evolution çèæèèåå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:81
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "Back up Evolution directory"
 msgstr "åä Evolution èæå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:85
 msgid "Restore Evolution directory"
 msgstr "éå Evolution çé"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:87
 msgid "Check Evolution Back up"
 msgstr "ææ Evolution åä"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:89
 msgid "Restart Evolution"
 msgstr "éæåå Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:91
 msgid "With Graphical User Interface"
 msgstr "äçååäçèäé"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:312
-#: ../modules/backup-restore/evolution-backup-tool.c:441
+#: ../modules/backup-restore/evolution-backup-tool.c:315
+#: ../modules/backup-restore/evolution-backup-tool.c:469
 msgid "Shutting down Evolution"
 msgstr "æåéé Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:324
 msgid "Backing Evolution accounts and settings"
 msgstr "åä Evolution çåèèèåå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:338
+#: ../modules/backup-restore/evolution-backup-tool.c:341
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "æååä Evolution èæ (éäãèçäãèäæãåäãååé)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:354
+#: ../modules/backup-restore/evolution-backup-tool.c:357
 msgid "Back up complete"
 msgstr "åäåæ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:361
-#: ../modules/backup-restore/evolution-backup-tool.c:608
+#: ../modules/backup-restore/evolution-backup-tool.c:364
+#: ../modules/backup-restore/evolution-backup-tool.c:654
 msgid "Restarting Evolution"
 msgstr "éæåå Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:447
+#: ../modules/backup-restore/evolution-backup-tool.c:475
 msgid "Back up current Evolution data"
 msgstr "åäçåç Evolution èæ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:455
+#: ../modules/backup-restore/evolution-backup-tool.c:483
 msgid "Extracting files from back up"
 msgstr "ååäèéææ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:524
+#: ../modules/backup-restore/evolution-backup-tool.c:570
 msgid "Loading Evolution settings"
 msgstr "æåèå Evolution çèåå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:578
+#: ../modules/backup-restore/evolution-backup-tool.c:624
 msgid "Removing temporary back up files"
 msgstr "çéæåçåäææ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:590
+#: ../modules/backup-restore/evolution-backup-tool.c:636
 msgid "Reloading registry service"
 msgstr "éæèåèåèæå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:815
+#: ../modules/backup-restore/evolution-backup-tool.c:861
 msgid "Evolution Back Up"
 msgstr "Evolution åä"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:816
+#: ../modules/backup-restore/evolution-backup-tool.c:862
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æåäèèæå %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:820
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Restore"
 msgstr "Evolution éå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:821
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "åèæåéå %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:889
+#: ../modules/backup-restore/evolution-backup-tool.c:935
 msgid "Backing up Evolution Data"
 msgstr "åä Evolution èæ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:890
+#: ../modules/backup-restore/evolution-backup-tool.c:936
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å Evolution åääçèææèçåã"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:892
+#: ../modules/backup-restore/evolution-backup-tool.c:938
 msgid "Restoring Evolution Data"
 msgstr "éå Evolution èæ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:893
+#: ../modules/backup-restore/evolution-backup-tool.c:939
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å Evolution éåäçèææèçåã"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:911
+#: ../modules/backup-restore/evolution-backup-tool.c:957
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "éååäæèçæéåææäçåèäèæçååã"
 
@@ -14475,28 +14239,28 @@ msgstr "çå:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "éå IfMatch (éäç Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:400
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:417
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP éèï %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:430
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
 msgid "Could not parse response"
 msgstr "çæèæåæ"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:439
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:456
 msgid "Empty response"
 msgstr "çççåæ"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:464
 msgid "Unexpected reply from server"
 msgstr "äèäæåæéæçåæ"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1034
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1051
 msgid "Could not locate user's calendars"
 msgstr "çæåääçèèäæ"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1258
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1275
 msgid "Path"
 msgstr "èå"
 
@@ -14599,15 +14363,15 @@ msgstr "ååèèäæ(_M)"
 msgid "I_mport to Tasks"
 msgstr "ååèåä(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.c:406
+#: ../modules/calendar/e-calendar-preferences.c:407
 msgid "Selected Calendars for Alarms"
 msgstr "éåçééèäæ"
 
-#: ../modules/calendar/e-calendar-preferences.c:828
+#: ../modules/calendar/e-calendar-preferences.c:829
 msgid "Ti_me and date:"
 msgstr "æååææ(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:829
+#: ../modules/calendar/e-calendar-preferences.c:830
 msgid "_Date only:"
 msgstr "åæææ(_D):"
 
@@ -15233,27 +14997,27 @@ msgstr "éåçé(_W)"
 msgid "Print the selected memo"
 msgstr "ååéåçååé"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1457
+#: ../modules/calendar/e-cal-shell-view-private.c:1477
 msgid "Searching next matching event"
 msgstr "æåääåçåçää"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1458
+#: ../modules/calendar/e-cal-shell-view-private.c:1478
 msgid "Searching previous matching event"
 msgstr "æååäåçåçää"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1476
+#: ../modules/calendar/e-cal-shell-view-private.c:1499
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "åä %d åäæäåçåçää"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1479
+#: ../modules/calendar/e-cal-shell-view-private.c:1503
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "åå %d åäæäåçåçää"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1500
+#: ../modules/calendar/e-cal-shell-view-private.c:1528
 msgid "Cannot search with no active calendar"
 msgstr "äèæåæäççèäæ"
 
@@ -15435,14 +15199,14 @@ msgstr "åéååé"
 msgid "Delete Memo"
 msgstr "åéååé"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:427
+#: ../modules/calendar/e-memo-shell-view-private.c:428
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d éååé"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:431
-#: ../modules/calendar/e-task-shell-view-private.c:612
+#: ../modules/calendar/e-memo-shell-view-private.c:432
+#: ../modules/calendar/e-task-shell-view-private.c:613
 #, c-format
 msgid "%d selected"
 msgstr "åéæ %d å"
@@ -15613,11 +15377,11 @@ msgstr "åéåä"
 msgid "Delete Task"
 msgstr "åéåä"
 
-#: ../modules/calendar/e-task-shell-view-private.c:501
+#: ../modules/calendar/e-task-shell-view-private.c:502
 msgid "Expunging"
 msgstr "éåä"
 
-#: ../modules/calendar/e-task-shell-view-private.c:608
+#: ../modules/calendar/e-task-shell-view-private.c:609
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15662,11 +15426,11 @@ msgid ""
 "headers selected above."
 msgstr "æååäåéåçæééååççäåååçéåæéã"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:135
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:137
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:141
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:143
 msgid "Display part as an invitation"
 msgstr "åéåéççéè"
 
@@ -16038,7 +15802,7 @@ msgid "Start day:"
 msgstr "éåæï"
 
 #: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1447
+#: ../modules/itip-formatter/itip-view.c:1461
 msgid "Start time:"
 msgstr "éåæé:"
 
@@ -16047,289 +15811,289 @@ msgid "End day:"
 msgstr "çææï"
 
 #: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1448
+#: ../modules/itip-formatter/itip-view.c:1462
 msgid "End time:"
 msgstr "çææé:"
 
-#: ../modules/itip-formatter/itip-view.c:1008
+#: ../modules/itip-formatter/itip-view.c:1010
 msgid "_Open Calendar"
 msgstr "éåèäæ(_O)"
 
-#: ../modules/itip-formatter/itip-view.c:1011
+#: ../modules/itip-formatter/itip-view.c:1013
 msgid "_Decline all"
 msgstr "åéæç(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1014
+#: ../modules/itip-formatter/itip-view.c:1016
 msgid "_Decline"
 msgstr "æç(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1017
+#: ../modules/itip-formatter/itip-view.c:1019
 msgid "_Tentative all"
 msgstr "åéæè(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1020
+#: ../modules/itip-formatter/itip-view.c:1022
 msgid "_Tentative"
 msgstr "æè(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1023
+#: ../modules/itip-formatter/itip-view.c:1025
 msgid "A_ccept all"
 msgstr "åéæå(_C)"
 
-#: ../modules/itip-formatter/itip-view.c:1026
+#: ../modules/itip-formatter/itip-view.c:1028
 msgid "A_ccept"
 msgstr "æå(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1029
+#: ../modules/itip-formatter/itip-view.c:1031
 msgid "_Send Information"
 msgstr "åéèè(_S)"
 
-#: ../modules/itip-formatter/itip-view.c:1032
+#: ../modules/itip-formatter/itip-view.c:1034
 msgid "_Update Attendee Status"
 msgstr "ææååçæ(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1035
+#: ../modules/itip-formatter/itip-view.c:1037
 msgid "_Update"
 msgstr "ææ(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1450
-#: ../modules/itip-formatter/itip-view.c:1492
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1464
+#: ../modules/itip-formatter/itip-view.c:1512
+#: ../modules/itip-formatter/itip-view.c:1581
 msgid "Comment:"
 msgstr "èè:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1481
+#: ../modules/itip-formatter/itip-view.c:1500
 msgid "Send reply to sender"
 msgstr "åèåäè"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1495
+#: ../modules/itip-formatter/itip-view.c:1515
 msgid "Send _updates to attendees"
 msgstr "åéææçåæè(_U)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1498
+#: ../modules/itip-formatter/itip-view.c:1518
 msgid "_Apply to all instances"
 msgstr "åçèææåé(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1499
+#: ../modules/itip-formatter/itip-view.c:1519
 msgid "Show time as _free"
 msgstr "éçæéççé(_F)"
 
-#: ../modules/itip-formatter/itip-view.c:1500
+#: ../modules/itip-formatter/itip-view.c:1520
 msgid "_Preserve my reminder"
 msgstr "äçæçæé(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1501
+#: ../modules/itip-formatter/itip-view.c:1521
 msgid "_Inherit reminder"
 msgstr "çææé(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1822
+#: ../modules/itip-formatter/itip-view.c:1845
 msgid "_Tasks:"
 msgstr "åä(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1825
+#: ../modules/itip-formatter/itip-view.c:1848
 msgid "_Memos:"
 msgstr "ååé(_M):"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../modules/itip-formatter/itip-view.c:3469
+#: ../modules/itip-formatter/itip-view.c:3493
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "çæèåèäæã%sã(%s)"
 
-#: ../modules/itip-formatter/itip-view.c:3626
+#: ../modules/itip-formatter/itip-view.c:3652
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "èäæ '%s' äççæåéåæèçèç"
 
-#: ../modules/itip-formatter/itip-view.c:3650
+#: ../modules/itip-formatter/itip-view.c:3679
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "åæåèäæã%sãäççæ"
 
-#: ../modules/itip-formatter/itip-view.c:3745
+#: ../modules/itip-formatter/itip-view.c:3774
 msgid "Unable to find any calendars"
 msgstr "æäåääèäæ"
 
-#: ../modules/itip-formatter/itip-view.c:3753
+#: ../modules/itip-formatter/itip-view.c:3782
 msgid "Unable to find this meeting in any calendar"
 msgstr "çæåääèäæäæåéåçæ"
 
-#: ../modules/itip-formatter/itip-view.c:3758
+#: ../modules/itip-formatter/itip-view.c:3787
 msgid "Unable to find this task in any task list"
 msgstr "çæåääåäæåäæåééåä"
 
-#: ../modules/itip-formatter/itip-view.c:3763
+#: ../modules/itip-formatter/itip-view.c:3792
 msgid "Unable to find this memo in any memo list"
 msgstr "çæåääååéæåäæåééååé"
 
-#: ../modules/itip-formatter/itip-view.c:4103
+#: ../modules/itip-formatter/itip-view.c:4132
 msgid "Opening the calendar. Please wait..."
 msgstr "æåéåèäæãèçåâ"
 
-#: ../modules/itip-formatter/itip-view.c:4108
+#: ../modules/itip-formatter/itip-view.c:4137
 msgid "Searching for an existing version of this appointment"
 msgstr "åæéåçææåççæ"
 
-#: ../modules/itip-formatter/itip-view.c:4490
+#: ../modules/itip-formatter/itip-view.c:4523
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "çæåééçèèäæã%sãã%s"
 
-#: ../modules/itip-formatter/itip-view.c:4505
+#: ../modules/itip-formatter/itip-view.c:4538
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "åéèèäæ '%s' äèçåæå"
 
-#: ../modules/itip-formatter/itip-view.c:4510
+#: ../modules/itip-formatter/itip-view.c:4543
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "åéèèäæ '%s' äèçäçåç"
 
-#: ../modules/itip-formatter/itip-view.c:4516
+#: ../modules/itip-formatter/itip-view.c:4549
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "åéèèäæ '%s' äèçååæ"
 
-#: ../modules/itip-formatter/itip-view.c:4522
+#: ../modules/itip-formatter/itip-view.c:4555
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "åéèèäæã%sãäèçååæ"
 
-#: ../modules/itip-formatter/itip-view.c:4592
-#: ../modules/itip-formatter/itip-view.c:5026
-#: ../modules/itip-formatter/itip-view.c:5133
+#: ../modules/itip-formatter/itip-view.c:4576
+#: ../modules/itip-formatter/itip-view.c:5016
+#: ../modules/itip-formatter/itip-view.c:5123
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "æååææåååèäæãèçåâ"
 
-#: ../modules/itip-formatter/itip-view.c:4631
+#: ../modules/itip-formatter/itip-view.c:4617
 msgid "Unable to parse item"
 msgstr "çæåæéç"
 
-#: ../modules/itip-formatter/itip-view.c:4820
+#: ../modules/itip-formatter/itip-view.c:4807
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æèåéäåçéäçä %s"
 
-#: ../modules/itip-formatter/itip-view.c:4835
+#: ../modules/itip-formatter/itip-view.c:4822
 msgid "Sent a cancelation notice to the delegate"
 msgstr "åéåæéççäçä"
 
-#: ../modules/itip-formatter/itip-view.c:4839
+#: ../modules/itip-formatter/itip-view.c:4826
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "çæåéåæéççäçä"
 
-#: ../modules/itip-formatter/itip-view.c:4888
+#: ../modules/itip-formatter/itip-view.c:4874
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "çæææåæèã%s"
 
-#: ../modules/itip-formatter/itip-view.c:4895
+#: ../modules/itip-formatter/itip-view.c:4882
 msgid "Attendee status updated"
 msgstr "åæèçæåææ"
 
-#: ../modules/itip-formatter/itip-view.c:4918
+#: ../modules/itip-formatter/itip-view.c:4905
 msgid "The meeting is invalid and cannot be updated"
 msgstr "éåæèçæäääèææ"
 
-#: ../modules/itip-formatter/itip-view.c:4991
+#: ../modules/itip-formatter/itip-view.c:4981
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "çæäåæççæäååæèçæçæææï"
 
-#: ../modules/itip-formatter/itip-view.c:5063
-#: ../modules/itip-formatter/itip-view.c:5103
+#: ../modules/itip-formatter/itip-view.c:5053
+#: ../modules/itip-formatter/itip-view.c:5093
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "åæèçæäèææïåçéçåçäåå"
 
-#: ../modules/itip-formatter/itip-view.c:5166
+#: ../modules/itip-formatter/itip-view.c:5156
 msgid "Meeting information sent"
 msgstr "æèèèåå"
 
-#: ../modules/itip-formatter/itip-view.c:5171
+#: ../modules/itip-formatter/itip-view.c:5161
 msgid "Task information sent"
 msgstr "åäèèåå"
 
-#: ../modules/itip-formatter/itip-view.c:5176
+#: ../modules/itip-formatter/itip-view.c:5166
 msgid "Memo information sent"
 msgstr "ååéèèåå"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:5177
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "çæååæèèèïèæèääåå"
 
-#: ../modules/itip-formatter/itip-view.c:5192
+#: ../modules/itip-formatter/itip-view.c:5182
 msgid "Unable to send task information, the task does not exist"
 msgstr "çæåååäèèïèéåääåå"
 
-#: ../modules/itip-formatter/itip-view.c:5197
+#: ../modules/itip-formatter/itip-view.c:5187
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "çæååååéèèïèååéääåå"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5262
+#: ../modules/itip-formatter/itip-view.c:5252
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5267
+#: ../modules/itip-formatter/itip-view.c:5257
 msgid "Save Calendar"
 msgstr "ååèäæ"
 
-#: ../modules/itip-formatter/itip-view.c:5319
-#: ../modules/itip-formatter/itip-view.c:5331
+#: ../modules/itip-formatter/itip-view.c:5310
+#: ../modules/itip-formatter/itip-view.c:5323
 msgid "The calendar attached is not valid"
 msgstr "éåçèäææçæç"
 
-#: ../modules/itip-formatter/itip-view.c:5320
-#: ../modules/itip-formatter/itip-view.c:5332
+#: ../modules/itip-formatter/itip-view.c:5311
+#: ../modules/itip-formatter/itip-view.c:5324
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "æéäååååæèäæååïäåèäæäéææç iCalendarã"
 
-#: ../modules/itip-formatter/itip-view.c:5373
-#: ../modules/itip-formatter/itip-view.c:5402
-#: ../modules/itip-formatter/itip-view.c:5500
+#: ../modules/itip-formatter/itip-view.c:5366
+#: ../modules/itip-formatter/itip-view.c:5396
+#: ../modules/itip-formatter/itip-view.c:5496
 msgid "The item in the calendar is not valid"
 msgstr "èäæäçéçæçæç"
 
-#: ../modules/itip-formatter/itip-view.c:5374
-#: ../modules/itip-formatter/itip-view.c:5403
-#: ../modules/itip-formatter/itip-view.c:5501
+#: ../modules/itip-formatter/itip-view.c:5367
+#: ../modules/itip-formatter/itip-view.c:5397
+#: ../modules/itip-formatter/itip-view.c:5497
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "æéäçååæèäæååïäèååäæååääääãåäæçé/åçèè"
 
-#: ../modules/itip-formatter/itip-view.c:5417
+#: ../modules/itip-formatter/itip-view.c:5412
 msgid "The calendar attached contains multiple items"
 msgstr "éåçèäæåååæååéç"
 
-#: ../modules/itip-formatter/itip-view.c:5418
+#: ../modules/itip-formatter/itip-view.c:5413
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "èèçéäåéçéçïæèåæææååååååäçèäæ"
 
-#: ../modules/itip-formatter/itip-view.c:5944
+#: ../modules/itip-formatter/itip-view.c:5937
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ææ"
 
-#: ../modules/itip-formatter/itip-view.c:5960
+#: ../modules/itip-formatter/itip-view.c:5953
 msgid "Tentatively Accepted"
 msgstr "æææå"
 
-#: ../modules/itip-formatter/itip-view.c:6103
+#: ../modules/itip-formatter/itip-view.c:6096
 msgid "This meeting recurs"
 msgstr "éåæèçéæèåç"
 
-#: ../modules/itip-formatter/itip-view.c:6106
+#: ../modules/itip-formatter/itip-view.c:6099
 msgid "This task recurs"
 msgstr "ééåäçéæèåç"
 
-#: ../modules/itip-formatter/itip-view.c:6109
+#: ../modules/itip-formatter/itip-view.c:6102
 msgid "This memo recurs"
 msgstr "éåååéçéæèåç"
 
@@ -16479,352 +16243,352 @@ msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d åéåçéä"
 
-#: ../modules/mail/e-mail-shell-backend.c:248
+#: ../modules/mail/e-mail-shell-backend.c:244
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "éäèæ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
+#: ../modules/mail/e-mail-shell-backend.c:246
 msgid "Compose a new mail message"
 msgstr "çèæçéäèæ"
 
-#: ../modules/mail/e-mail-shell-backend.c:258
+#: ../modules/mail/e-mail-shell-backend.c:254
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "éäåè(_U)"
 
-#: ../modules/mail/e-mail-shell-backend.c:260
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgid "Create a new mail account"
 msgstr "åçæéäåè"
 
-#: ../modules/mail/e-mail-shell-backend.c:265
+#: ../modules/mail/e-mail-shell-backend.c:261
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "éäèæå(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:267
+#: ../modules/mail/e-mail-shell-backend.c:263
 msgid "Create a new mail folder"
 msgstr "åçæéäèæå"
 
-#: ../modules/mail/e-mail-shell-backend.c:563
+#: ../modules/mail/e-mail-shell-backend.c:561
 msgid "Mail Accounts"
 msgstr "éäåè"
 
-#: ../modules/mail/e-mail-shell-backend.c:572
+#: ../modules/mail/e-mail-shell-backend.c:570
 msgid "Mail Preferences"
 msgstr "éäååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:581
+#: ../modules/mail/e-mail-shell-backend.c:579
 msgid "Composer Preferences"
 msgstr "éäçèåååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:590
+#: ../modules/mail/e-mail-shell-backend.c:588
 msgid "Network Preferences"
 msgstr "ççååèå"
 
 #. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:900
+#: ../modules/mail/e-mail-shell-backend.c:890
 msgctxt "label"
 msgid "None"
 msgstr "ææ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
-#: ../modules/mail/e-mail-shell-view.c:972
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view.c:975
 msgid "_Disable Account"
 msgstr "åçåè(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
 msgid "Disable this account"
 msgstr "åçéååè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æäçéåææèæååçååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
 msgid "Edit properties of this account"
 msgstr "çèéååèçåæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "_Download Messages for Offline Usage"
 msgstr "äèéçäççéä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "äèæèçéçäççåèèèæåäéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Fl_ush Outbox"
 msgstr "æçåäå(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "_Copy Folder To..."
 msgstr "èèèæåå(_C)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "Copy the selected folder into another folder"
 msgstr "èèåéåçèæåååäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Permanently remove this folder"
 msgstr "æäçééåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "E_xpunge"
 msgstr "åé(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æäçéåéåèæååååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Mar_k All Messages as Read"
 msgstr "æçææéäçåéè(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1284
 msgid "Mark all messages in the folder as read"
 msgstr "åèæåäåéçéäæçæåéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "_Move Folder To..."
 msgstr "çåèæåå(_M)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
 msgid "Move the selected folder into another folder"
 msgstr "åéåçèæåçèåäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "_New..."
 msgstr "æå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
 msgid "Create a new folder for storing mail"
 msgstr "åçäåæèæåäååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
 msgid "Change the properties of this folder"
 msgstr "ææéåèæåçåæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
 msgid "Refresh the folder"
 msgstr "éæèåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1319
 msgid "Change the name of this folder"
 msgstr "ææéåèæåçåç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "Select Message _Thread"
 msgstr "éæéäæé(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1326
 msgid "Select all messages in the same thread as the selected message"
 msgstr "éæææçéçéäçéåçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 msgid "Select Message S_ubthread"
 msgstr "éæéäåçç(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1333
 msgid "Select all replies to the currently selected message"
 msgstr "éæææåèéåéäçä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Empty _Trash"
 msgstr "æçåæç(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æäçéåææåèååéååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "_New Label"
 msgstr "æåæç(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/mail/e-mail-shell-view-actions.c:1361
 msgid "N_one"
 msgstr "ææ(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1373
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
 msgid "_Manage Subscriptions"
 msgstr "ççèé(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1375
-#: ../modules/mail/e-mail-shell-view-actions.c:1452
+#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1454
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "èéæåæèéåéçäæåçèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1403
 msgid "Send / _Receive"
 msgstr "åé/ææ(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1384
 msgid "Send queued items and retrieve new items"
 msgstr "åéåéçéçäæææçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
 msgid "R_eceive All"
 msgstr "åéææ(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
 msgid "Receive new items from all accounts"
 msgstr "ææåææåèåçæéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1396
 msgid "_Send All"
 msgstr "åéåé(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1396
+#: ../modules/mail/e-mail-shell-view-actions.c:1398
 msgid "Send queued items in all accounts"
 msgstr "åéåææåèååéçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1424
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1424
+#: ../modules/mail/e-mail-shell-view-actions.c:1426
 msgid "Cancel the current mail operation"
 msgstr "åæçåéäæäçèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1429
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
 msgid "Collapse All _Threads"
 msgstr "ææææçééä(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1431
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
 msgid "Collapse all message threads"
 msgstr "ææææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1436
+#: ../modules/mail/e-mail-shell-view-actions.c:1438
 msgid "E_xpand All Threads"
 msgstr "åéææçééä(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1438
+#: ../modules/mail/e-mail-shell-view-actions.c:1440
 msgid "Expand all message threads"
 msgstr "åéææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "_Message Filters"
 msgstr "éäèå(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1447
 msgid "Create or edit rules for filtering new mail"
 msgstr "çæéäåçæçèéæèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1450
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
 msgid "_Subscriptions..."
 msgstr "èé(_S)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-shell-view-actions.c:1461
 msgid "F_older"
 msgstr "èæå(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1466
+#: ../modules/mail/e-mail-shell-view-actions.c:1468
 msgid "_Label"
 msgstr "æç(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1485
 msgid "C_reate Search Folder From Search..."
 msgstr "åæååçæåèæå(_R)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1490
+#: ../modules/mail/e-mail-shell-view-actions.c:1492
 msgid "Search F_olders"
 msgstr "æåèæå(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1492
+#: ../modules/mail/e-mail-shell-view-actions.c:1494
 msgid "Create or edit search folder definitions"
 msgstr "åçæçèæåèæåçåç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "_New Folder..."
 msgstr "æåèæå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show Message _Preview"
 msgstr "éçéäéè(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1559
 msgid "Show message preview pane"
 msgstr "éçéäéèçæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "Show _Deleted Messages"
 msgstr "éçååééä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 msgid "Show deleted messages with a line through them"
 msgstr "éçååéçéä (åäåéç)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1571
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Group By Threads"
 msgstr "ææçééäççç(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Threaded message list"
 msgstr "çééäæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "_Unmatched Folder Enabled"
 msgstr "æçåèæåååç(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "åææååçæçåæåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
 msgid "Show message preview below the message list"
 msgstr "åéäæåäæéçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "Show message preview alongside the message list"
 msgstr "åéäæåæééçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1618
 msgid "All Messages"
 msgstr "ææéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1625
 msgid "Important Messages"
 msgstr "éèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1630
+#: ../modules/mail/e-mail-shell-view-actions.c:1632
 msgid "Last 5 Days' Messages"
 msgstr "æè 5 åçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "Messages Not Junk"
 msgstr "éååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1644
+#: ../modules/mail/e-mail-shell-view-actions.c:1646
 msgid "Messages with Attachments"
 msgstr "æéäçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1651
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "No Label"
 msgstr "çæç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1658
+#: ../modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Read Messages"
 msgstr "åèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Unread Messages"
 msgstr "æèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Subject or Addresses contain"
 msgstr "äææéåéääååå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1727
+#: ../modules/mail/e-mail-shell-view-actions.c:1729
 msgid "All Accounts"
 msgstr "ææçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1734
+#: ../modules/mail/e-mail-shell-view-actions.c:1736
 msgid "Current Account"
 msgstr "çåçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1741
+#: ../modules/mail/e-mail-shell-view-actions.c:1743
 msgid "Current Folder"
 msgstr "çåçèæå"
 
@@ -16832,68 +16596,68 @@ msgstr "çåçèæå"
 msgid "All Account Search"
 msgstr "ææçåèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:709
+#: ../modules/mail/e-mail-shell-view.c:710
 msgid "Account Search"
 msgstr "åèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:970
+#: ../modules/mail/e-mail-shell-view.c:973
 msgid "Proxy _Logout"
 msgstr "çåäçäæå(_L)"
 
-#: ../modules/mail/e-mail-shell-view-private.c:961
+#: ../modules/mail/e-mail-shell-view-private.c:962
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "åéæ %d åï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:973
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
-#: ../modules/mail/e-mail-shell-view-private.c:985
+#: ../modules/mail/e-mail-shell-view-private.c:979
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ååå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:991
+#: ../modules/mail/e-mail-shell-view-private.c:992
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d åèç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d åæåé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1003
+#: ../modules/mail/e-mail-shell-view-private.c:1004
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1015
+#: ../modules/mail/e-mail-shell-view-private.c:1016
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d åæèï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1018
+#: ../modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å %d å"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1042
 msgid "Trash"
 msgstr "åæç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1454
+#: ../modules/mail/e-mail-shell-view-private.c:1458
 msgid "Send / Receive"
 msgstr "åé/ææ"
 
@@ -16917,20 +16681,20 @@ msgstr "æéäæ"
 msgid "Once per month"
 msgstr "ææäæ"
 
-#: ../modules/mail/em-mailer-prefs.c:286
+#: ../modules/mail/em-mailer-prefs.c:318
 msgid "Header"
 msgstr "éé"
 
-#: ../modules/mail/em-mailer-prefs.c:290
+#: ../modules/mail/em-mailer-prefs.c:322
 msgid "Contains Value"
 msgstr "ååæå"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1071
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "_Date header:"
 msgstr "æææé(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1072
+#: ../modules/mail/em-mailer-prefs.c:1146
 msgid "Show _original header value"
 msgstr "éçååæéæå(_O)"
 
@@ -16940,24 +16704,24 @@ msgstr "æåèå Evolution èçäçéèéåéäåæçï"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:318
+#: ../modules/mdn/evolution-mdn.c:323
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "äåç %s äæã%sã (%s) çéäåèéèã"
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:385
+#: ../modules/mdn/evolution-mdn.c:390
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "ã%sãçéééç"
 
-#: ../modules/mdn/evolution-mdn.c:540
+#: ../modules/mdn/evolution-mdn.c:543
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "åééäåæçã%sã"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:545
+#: ../modules/mdn/evolution-mdn.c:548
 msgid "_Notify Sender"
 msgstr "éçåäè(_N)"
 
@@ -17032,50 +16796,50 @@ msgstr "åæçå(_P)"
 msgid "Enable and disable plugins"
 msgstr "åçèåçåæçå"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:134
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
 msgid "Display plain text version"
 msgstr "éççæåçæ"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:136
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
 msgid "Display plain text version of multipart/alternative message"
 msgstr "éçåéå/æäéäççæåçæ"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
 msgid "Display HTML version"
 msgstr "éç HTML çæ"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:144
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
 msgid "Display HTML version of multipart/alternative message"
 msgstr "éçåéå/æäéäç HTML çæ"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../modules/prefer-plain/plugin/config-ui.c:46
 msgid "Show HTML if present"
 msgstr "åæä HTML åéçä"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Let Evolution choose the best part to show."
 msgstr "è Evolution éææäçéåäéçã"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
 #: ../modules/prefer-plain/plugin/config-ui.c:50
 msgid "Show plain text if present"
 msgstr "åæäçæååéçå"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
 #: ../modules/prefer-plain/plugin/config-ui.c:51
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "åææçæåçéååéçåïååè Evolution éææäçéåäéçã"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:91
 #: ../modules/prefer-plain/plugin/config-ui.c:55
 msgid "Only ever show plain text"
 msgstr "åäçæåéç"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:92
 #: ../modules/prefer-plain/plugin/config-ui.c:56
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -17178,7 +16942,7 @@ msgstr ""
 "\n"
 "ääçéæè Evolution éçèäçéåéäåèïäåååäæççåååææã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:259
+#: ../modules/startup-wizard/evolution-startup-wizard.c:242
 msgid "Loading accounts..."
 msgstr "æåèååèâ"
 
@@ -17190,11 +16954,11 @@ msgstr "æååç(_F)â"
 msgid "_Other languages"
 msgstr "åäçèè(_O)"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:324
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:329
 msgid "Text Highlight"
 msgstr "æåçé"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:330
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:335
 msgid "Syntax highlighting of mail parts"
 msgstr "éäéåçèæçé"
 
@@ -17463,7 +17227,7 @@ msgid "_Do not show this message again."
 msgstr "äèåéçéåèæ(_D)"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:590
-#: ../plugins/templates/templates.c:470
+#: ../plugins/templates/templates.c:469
 msgid "Keywords"
 msgstr "ééå"
 
@@ -17615,7 +17379,7 @@ msgid "Key"
 msgstr "èåé"
 
 #: ../plugins/email-custom-header/email-custom-header.c:867
-#: ../plugins/templates/templates.c:478
+#: ../plugins/templates/templates.c:477
 msgid "Values"
 msgstr "æå"
 
@@ -18041,39 +17805,39 @@ msgid ""
 "source, please."
 msgstr "éåçäææåèçïåæäèåéèåçååéãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1187
+#: ../plugins/mail-to-task/mail-to-task.c:1186
 msgid "No writable calendar is available."
 msgstr "ææåååçèäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
+#: ../plugins/mail-to-task/mail-to-task.c:1270
 msgid "Create an _Appointment"
 msgstr "åçäåçæ(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1273
+#: ../plugins/mail-to-task/mail-to-task.c:1272
 msgid "Create a new event from the selected message"
 msgstr "äéåçéäåçæçää"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1278
+#: ../plugins/mail-to-task/mail-to-task.c:1277
 msgid "Create a Mem_o"
 msgstr "åçååé(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1280
+#: ../plugins/mail-to-task/mail-to-task.c:1279
 msgid "Create a new memo from the selected message"
 msgstr "äéåçéäåçæçååé"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1284
 msgid "Create a _Task"
 msgstr "åçåä(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1286
 msgid "Create a new task from the selected message"
 msgstr "äéåçéäåçæçåä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1295
+#: ../plugins/mail-to-task/mail-to-task.c:1294
 msgid "Create a _Meeting"
 msgstr "åçæè(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1297
+#: ../plugins/mail-to-task/mail-to-task.c:1296
 msgid "Create a new meeting from the selected message"
 msgstr "äéåçéäåçæçæè"
 
@@ -18444,15 +18208,15 @@ msgid ""
 "an email you are replying to."
 msgstr "åæèçççæåæçåãäåääççèææ $ORIG[subject], $ORIG[from], $ORIG[to] æ $ORIG[body]ïååæääæåèçéääçæååäã"
 
-#: ../plugins/templates/templates.c:1113
+#: ../plugins/templates/templates.c:1112
 msgid "No Title"
 msgstr "æææé"
 
-#: ../plugins/templates/templates.c:1225
+#: ../plugins/templates/templates.c:1221
 msgid "Save as _Template"
 msgstr "ååççæ(_T)"
 
-#: ../plugins/templates/templates.c:1227
+#: ../plugins/templates/templates.c:1223
 msgid "Save as Template"
 msgstr "ååççæ"
 
@@ -18786,7 +18550,7 @@ msgstr "éææèï%s"
 msgid "Execute these search parameters"
 msgstr "åèéäæååæ"
 
-#: ../shell/e-shell-window.c:494
+#: ../shell/e-shell-window.c:497
 msgid "New"
 msgstr "æå"
 
@@ -18797,7 +18561,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:186
+#: ../shell/main.c:184
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18832,7 +18596,7 @@ msgstr ""
 "æååæääååäææïèäæå\n"
 "çååæäæäæèï\n"
 
-#: ../shell/main.c:210
+#: ../shell/main.c:208
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18840,59 +18604,59 @@ msgstr ""
 "èè\n"
 "Evolution åçæä\n"
 
-#: ../shell/main.c:217
+#: ../shell/main.c:214
 msgid "Do not tell me again"
 msgstr "äèåéçéåèæ"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:308
+#: ../shell/main.c:305
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr "åå Evolution æäæåçåäéçãåççééæãmailãããcalendarãããcontactsãããtasksãåãmemosã"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:309
 msgid "Apply the given geometry to the main window"
 msgstr "åæåçåååçåäèç"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:313
 msgid "Start in online mode"
 msgstr "äçäæååå"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:315
 msgid "Ignore network availability"
 msgstr "åçäèçæååç"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:317
 msgid "Start in \"express\" mode"
 msgstr "äãåéãæååå"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:320
 msgid "Forcibly shut down Evolution"
 msgstr "ååéé Evoultion"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:323
 msgid "Disable loading of any plugins."
 msgstr "åçåääåæçåçèåã"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:325
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "åçéäãèçäååäçéèçæã"
 
-#: ../shell/main.c:332
+#: ../shell/main.c:329
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "åæåç URI æææåçååçæääçåæã"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:331
 msgid "Request a running Evolution process to quit"
 msgstr "èæåèäç Evolution çåçæ"
 
-#: ../shell/main.c:508 ../shell/main.c:516
+#: ../shell/main.c:504
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM èéäåæç"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:569
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18901,7 +18665,7 @@ msgstr ""
 "%sï --online å --offline äèäèäçã\n"
 "  äç '%s --help' ååéäæèèã\n"
 
-#: ../shell/main.c:587
+#: ../shell/main.c:575
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19730,7 +19494,7 @@ msgstr "æåæè"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1000
+#: ../widgets/misc/e-attachment.c:966
 msgid "Attached message"
 msgstr "éåçéä"
 
@@ -20131,7 +19895,7 @@ msgstr "éåææ"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æãåçãéååææååå Evolutionã"
 
-#: ../widgets/misc/e-mail-signature-combo-box.c:327
+#: ../widgets/misc/e-mail-signature-combo-box.c:378
 msgid "Autogenerated"
 msgstr "èåççç"
 
@@ -20395,6 +20159,10 @@ msgstr "çæèè(_T)"
 msgid "Type:"
 msgstr "éå:"
 
+#: ../widgets/misc/e-source-config.c:683 ../widgets/misc/e-source-config.c:687
+msgid "Name:"
+msgstr "åçï"
+
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
 #: ../widgets/misc/e-source-config.c:1285
@@ -20442,53 +20210,53 @@ msgstr "æååè"
 msgid "Click here to go to URL"
 msgstr "æéèäçè URL"
 
-#: ../widgets/misc/e-web-view.c:278 ../widgets/misc/e-web-view-gtkhtml.c:407
+#: ../widgets/misc/e-web-view.c:274 ../widgets/misc/e-web-view-gtkhtml.c:407
 msgid "_Copy Link Location"
 msgstr "èèéçäå(_C)"
 
-#: ../widgets/misc/e-web-view.c:280 ../widgets/misc/e-web-view-gtkhtml.c:409
+#: ../widgets/misc/e-web-view.c:276 ../widgets/misc/e-web-view-gtkhtml.c:409
 msgid "Copy the link to the clipboard"
 msgstr "èèéçååèè"
 
-#: ../widgets/misc/e-web-view.c:288 ../widgets/misc/e-web-view-gtkhtml.c:417
+#: ../widgets/misc/e-web-view.c:284 ../widgets/misc/e-web-view-gtkhtml.c:417
 msgid "_Open Link in Browser"
 msgstr "åçèååéåéç(_O)"
 
-#: ../widgets/misc/e-web-view.c:290 ../widgets/misc/e-web-view-gtkhtml.c:419
+#: ../widgets/misc/e-web-view.c:286 ../widgets/misc/e-web-view-gtkhtml.c:419
 msgid "Open the link in a web browser"
 msgstr "åçéçèåäéåæéç"
 
-#: ../widgets/misc/e-web-view.c:298 ../widgets/misc/e-web-view-gtkhtml.c:427
+#: ../widgets/misc/e-web-view.c:294 ../widgets/misc/e-web-view-gtkhtml.c:427
 msgid "_Copy Email Address"
 msgstr "èèéåéääå(_C)"
 
-#: ../widgets/misc/e-web-view.c:315 ../widgets/misc/e-web-view-gtkhtml.c:444
+#: ../widgets/misc/e-web-view.c:311 ../widgets/misc/e-web-view-gtkhtml.c:444
 msgid "_Copy Image"
 msgstr "èèåç(_C)"
 
-#: ../widgets/misc/e-web-view.c:317 ../widgets/misc/e-web-view-gtkhtml.c:446
+#: ../widgets/misc/e-web-view.c:313 ../widgets/misc/e-web-view-gtkhtml.c:446
 msgid "Copy the image to the clipboard"
 msgstr "èèåçååèè"
 
-#: ../widgets/misc/e-web-view.c:337 ../widgets/misc/e-web-view.c:1426
+#: ../widgets/misc/e-web-view.c:333 ../widgets/misc/e-web-view.c:1435
 #: ../widgets/misc/e-web-view-gtkhtml.c:466
 #: ../widgets/misc/e-web-view-gtkhtml.c:1311
 msgid "Select all text and images"
 msgstr "éææææåååç"
 
-#: ../widgets/misc/e-web-view.c:1090 ../widgets/misc/e-web-view.c:1092
-#: ../widgets/misc/e-web-view.c:1094 ../widgets/misc/e-web-view-gtkhtml.c:975
+#: ../widgets/misc/e-web-view.c:1099 ../widgets/misc/e-web-view.c:1101
+#: ../widgets/misc/e-web-view.c:1103 ../widgets/misc/e-web-view-gtkhtml.c:975
 #: ../widgets/misc/e-web-view-gtkhtml.c:977
 #: ../widgets/misc/e-web-view-gtkhtml.c:979
 #, c-format
 msgid "Click to call %s"
 msgstr "æääæèç %s"
 
-#: ../widgets/misc/e-web-view.c:1096 ../widgets/misc/e-web-view-gtkhtml.c:981
+#: ../widgets/misc/e-web-view.c:1105 ../widgets/misc/e-web-view-gtkhtml.c:981
 msgid "Click to hide/unhide addresses"
 msgstr "æéèéè/èééèäå"
 
-#: ../widgets/misc/e-web-view.c:1098 ../widgets/misc/e-web-view-gtkhtml.c:983
+#: ../widgets/misc/e-web-view.c:1107 ../widgets/misc/e-web-view-gtkhtml.c:983
 #, c-format
 msgid "Click to open %s"
 msgstr "æäääéå %s"
@@ -20796,6 +20564,191 @@ msgstr "åééå"
 msgid "Input Methods"
 msgstr "èåæ"
 
+#~ msgid "ID of the socket to embed in"
+#~ msgstr "socket ç IDïååæ"
+
+#~ msgid "socket"
+#~ msgstr "socket"
+
+#~ msgid "Please enter your full name."
+#~ msgstr "èèåæçååã"
+
+#~ msgid "Please enter your email address."
+#~ msgstr "èèåæçéåéääåã"
+
+#~ msgid "The email address you have entered is invalid."
+#~ msgstr "æèåçéåéääåæçæçã"
+
+#~ msgid "Please enter your password."
+#~ msgstr "èèåæçåçã"
+
+#~ msgid "CalDAV"
+#~ msgstr "CalDAV"
+
+#~ msgid "Google"
+#~ msgstr "Google"
+
+#~ msgid "Always (SSL)"
+#~ msgstr "æé (SSL)"
+
+#~ msgid "When possible (TLS)"
+#~ msgstr "åèçè (TLS)"
+
+#~ msgid "Personal details:"
+#~ msgstr "åäèçèæï"
+
+#~ msgid "Email address:"
+#~ msgstr "Email äåï"
+
+#~ msgid "Details:"
+#~ msgstr "èçèæï"
+
+#~ msgid "Server type:"
+#~ msgstr "äæåéåï"
+
+#~ msgid "Server address:"
+#~ msgstr "äæåäåï"
+
+#~ msgid "Use encryption:"
+#~ msgstr "äçååï"
+
+#~ msgid ""
+#~ "To use the email application you'll need to setup an account. Put your "
+#~ "email address and password in below and we'll try and work out all the "
+#~ "settings. If we can't do it automatically you'll need your server details "
+#~ "as well."
+#~ msgstr ""
+#~ "èäçéåéåéäçåæéèåèåäååèãèåäéæäæçéåéääåå"
+#~ "åçïæåæåèäæåææçèååãåææåçæèååæéåæéïæåéè"
+#~ "äçèååèçäæåèçèæã"
+
+#~ msgid ""
+#~ "Sorry, we can't work out the settings to get your mail automatically. "
+#~ "Please enter them below. We've tried to make a start with the details you "
+#~ "just entered but you may need to change them."
+#~ msgstr ""
+#~ "ææïæåçæèåæåæçéäèååãèåäéèåååãæåæäæååèå"
+#~ "çèçèæèèéåïäææäæåèéèæèååã"
+
+#~ msgid "You can specify more options to configure the account."
+#~ msgstr "æåäæåæåçäèåéååèçééã"
+
+#~ msgid ""
+#~ "Now we need your settings for sending mail. We've tried to make some "
+#~ "guesses but you should check them over to make sure."
+#~ msgstr ""
+#~ "çåæåéèæçèååæèåééäãæååçèèçæéåèåïäæææèæ"
+#~ "æååäéèçèã"
+
+#~ msgid "You can specify your default settings for your account."
+#~ msgstr "æåäæåèååèçéèèååã"
+
+#~ msgid ""
+#~ "Time to check things over before we try and connect to the server and "
+#~ "fetch your mail."
+#~ msgstr "åæååèäéçåäæåååéäåææäéçæéã"
+
+#~ msgid "Next - Receiving mail"
+#~ msgstr "ääæ - ææéä"
+
+#~ msgid "Receiving mail"
+#~ msgstr "ææéä"
+
+#~ msgid "Next - Sending mail"
+#~ msgstr "ääæ - åééä"
+
+#~ msgid "Back - Identity"
+#~ msgstr "ääæ - èå"
+
+#~ msgid "Next - Receiving options"
+#~ msgstr "ääæ - ææéé"
+
+#~ msgid "Receiving options"
+#~ msgstr "ææéé"
+
+#~ msgid "Back - Receiving mail"
+#~ msgstr "ääæ - ææéä"
+
+#~ msgid "Sending mail"
+#~ msgstr "åééä"
+
+#~ msgid "Next - Review account"
+#~ msgstr "ääæ - æéåè"
+
+#~ msgid "Next - Defaults"
+#~ msgstr "ääæ - èçèæ"
+
+#~ msgid "Back - Receiving options"
+#~ msgstr "ääæ - ææéé"
+
+#~ msgid "Back - Sending mail"
+#~ msgstr "ääæ - åééä"
+
+#~ msgid "Review account"
+#~ msgstr "æéåè"
+
+#~ msgid "Finish"
+#~ msgstr "åæ"
+
+#~ msgid "Back - Sending"
+#~ msgstr "ääæ - åé"
+
+#~ msgid "Setup Google contacts with Evolution"
+#~ msgstr "å Google éçäåå Evolution"
+
+#~ msgid "Setup Google calendar with Evolution"
+#~ msgstr "å Google ææåå Evolution"
+
+#~ msgid "You may need to enable IMAP access."
+#~ msgstr "æåèéèåç IMAP ååã"
+
+#~ msgid "Google account settings:"
+#~ msgstr "Google åèèååï"
+
+#~ msgid "Setup Yahoo calendar with Evolution"
+#~ msgstr "å Yahoo èäæåå Evolution"
+
+#~ msgid ""
+#~ "Yahoo calendars are named as firstname_lastname. We have tried to form "
+#~ "the calendar name. So please confirm and re-enter the calendar name if it "
+#~ "is not correct."
+#~ msgstr ""
+#~ "Yahoo èäææååç åå_åæãæåååèçæéåèäæçåçãåæèçè"
+#~ "åïåææéèèéæèåèäæçåçã"
+
+#~ msgid "Yahoo account settings:"
+#~ msgstr "Yahoo åèèååï"
+
+#~ msgid "Yahoo Calendar name:"
+#~ msgstr "Yahoo èäæåçï"
+
+#~ msgid "Password:"
+#~ msgstr "åçï"
+
+#~ msgid "Close Tab"
+#~ msgstr "ééåé"
+
+#~ msgid "Account Wizard"
+#~ msgstr "åèçé"
+
+#~ msgid "Evolution account assistant"
+#~ msgstr "Evolution åèåç"
+
+#~ msgid "Modify %s..."
+#~ msgstr "äæ %sâ"
+
+#~ msgid "Add a new account"
+#~ msgstr "ååæçåè"
+
+#~ msgid "Account management"
+#~ msgstr "åèçç"
+
+#~ msgid "Settings"
+#~ msgstr "èåå"
+
+#~ msgid "Cannot get transport for account '%s'"
+#~ msgstr "äèåååèã%sãçåè"
+
 #~ msgid "Some features may not work properly with your current server"
 #~ msgstr "æäåèåèçæåæçåçäæåçæäæåéä"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 559d63d..be5af5f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,13 +6,13 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010, 2012.
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
-#: ../shell/main.c:568
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.3.91\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-07 13:22+0800\n"
-"PO-Revision-Date: 2012-08-07 11:30+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
+"POT-Creation-Date: 2012-08-20 06:02+0000\n"
+"PO-Revision-Date: 2012-08-20 20:26+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "Language: zh_TW\n"
@@ -187,7 +187,7 @@ msgid ""
 msgstr "æéçäçéåéäåååçååãæçèåäéèåååæäåçæåçåï"
 
 #: ../addressbook/addressbook.error.xml.h:36
-#: ../mail/em-vfolder-editor-rule.c:388 ../widgets/table/e-table-config.ui.h:6
+#: ../mail/em-vfolder-editor-rule.c:391 ../widgets/table/e-table-config.ui.h:6
 msgid "_Add"
 msgstr "åå(_A)"
 
@@ -309,7 +309,7 @@ msgstr "éé(_H):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1819
+#: ../modules/itip-formatter/itip-view.c:1842
 msgid "_Calendar:"
 msgstr "èäæ(_C):"
 
@@ -413,8 +413,7 @@ msgstr "éåçåæ"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:705
-#: ../calendar/gui/e-calendar-view.c:2149 ../capplet/anjal-settings-main.c:83
-#: ../shell/main.c:131
+#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:129
 msgid "Birthday"
 msgstr "çæ"
 
@@ -807,22 +806,22 @@ msgid "Copy _Email Address"
 msgstr "èèéåéääå(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../widgets/misc/e-web-view.c:300 ../widgets/misc/e-web-view-gtkhtml.c:429
+#: ../widgets/misc/e-web-view.c:296 ../widgets/misc/e-web-view-gtkhtml.c:429
 msgid "Copy the email address to the clipboard"
 msgstr "èèéåéääåååèç"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../widgets/misc/e-web-view.c:305 ../widgets/misc/e-web-view-gtkhtml.c:434
+#: ../widgets/misc/e-web-view.c:301 ../widgets/misc/e-web-view-gtkhtml.c:434
 msgid "_Send New Message To..."
 msgstr "åéæéäè(_S)â"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:171
-#: ../widgets/misc/e-web-view.c:307 ../widgets/misc/e-web-view-gtkhtml.c:436
+#: ../widgets/misc/e-web-view.c:303 ../widgets/misc/e-web-view-gtkhtml.c:436
 msgid "Send a mail message to this address"
 msgstr "åééäåéåäå"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:333
-#: ../widgets/misc/e-web-view.c:1088 ../widgets/misc/e-web-view-gtkhtml.c:973
+#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:973
 #, c-format
 msgid "Click to mail %s"
 msgstr "æäääåééä %s"
@@ -874,7 +873,7 @@ msgstr "èèäè"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:673
 #: ../modules/calendar/e-cal-shell-view-actions.c:217
 #: ../modules/calendar/e-cal-shell-view-actions.c:246
-#: ../modules/calendar/e-cal-shell-view.c:631
+#: ../modules/calendar/e-cal-shell-view.c:548
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:546
 msgid "Calendar"
@@ -1544,8 +1543,8 @@ msgstr "èé(_D)"
 #: ../calendar/alarm-notify/alarm-queue.c:1755
 #: ../calendar/alarm-notify/alarm-queue.c:1765
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
-#: ../modules/itip-formatter/itip-view.c:1446
-#: ../modules/itip-formatter/itip-view.c:1546
+#: ../modules/itip-formatter/itip-view.c:1460
+#: ../modules/itip-formatter/itip-view.c:1569
 msgid "Location:"
 msgstr "äç:"
 
@@ -1879,7 +1878,7 @@ msgid ""
 msgstr "éèæääéèäèçéäãååæåäåæååéäéäã"
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3054
+#: ../modules/itip-formatter/itip-view.c:3078
 msgid "_Save"
 msgstr "åå(_S)"
 
@@ -1984,8 +1983,11 @@ msgid "Delete remote memo list &quot;{0}&quot;?"
 msgstr "åééçååéæå &quot;{0}&quot;ï"
 
 #: ../calendar/calendar.error.xml.h:72
+#| msgid ""
+#| "This will permanently remote the memo list &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remote the memo list &quot;{0}&quot; from the server. "
+"This will permanently remove the memo list &quot;{0}&quot; from the server. "
 "Are you sure you want to proceed?"
 msgstr "éææåäæåæéåéååéæå &quot;{0}&quot;ãæçåèççåï"
 
@@ -2458,7 +2460,7 @@ msgstr "ééçåçèç"
 #: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
 #: ../shell/e-shell-window-actions.c:1446
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:327 ../widgets/misc/e-web-view.c:1414
+#: ../widgets/misc/e-web-view.c:323 ../widgets/misc/e-web-view.c:1423
 #: ../widgets/misc/e-web-view-gtkhtml.c:456
 #: ../widgets/misc/e-web-view-gtkhtml.c:1299
 msgid "Copy the selection"
@@ -2467,7 +2469,7 @@ msgstr "èèéåçåå"
 #: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
 #: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1408 ../widgets/misc/e-web-view-gtkhtml.c:1293
+#: ../widgets/misc/e-web-view.c:1417 ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Cut the selection"
 msgstr "åäéåçå"
 
@@ -2484,7 +2486,7 @@ msgstr "æèæå"
 #: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
 #: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1420 ../widgets/misc/e-web-view-gtkhtml.c:1305
+#: ../widgets/misc/e-web-view.c:1429 ../widgets/misc/e-web-view-gtkhtml.c:1305
 msgid "Paste the clipboard"
 msgstr "èäåèççåå"
 
@@ -2640,7 +2642,7 @@ msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "åæææçææïåæææåæéçæåçèæ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:3615
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
 msgid "attachment"
 msgstr "éä"
 
@@ -2830,7 +2832,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "äèåæççèääïåçæäæåéä"
 
 #: ../calendar/gui/dialogs/event-page.c:663
-#: ../calendar/gui/dialogs/event-page.c:3138
+#: ../calendar/gui/dialogs/event-page.c:3143
 msgid "This event has reminders"
 msgstr "éåääåææé"
 
@@ -2839,80 +2841,80 @@ msgstr "éåääåææé"
 msgid "Or_ganizer:"
 msgstr "æèåéä(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:1296
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Event with no start date"
 msgstr "çéåææçää"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1304
 msgid "Event with no end date"
 msgstr "ççæææçää"
 
-#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/event-page.c:1477
 #: ../calendar/gui/dialogs/memo-page.c:732
 #: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "éåææéè"
 
-#: ../calendar/gui/dialogs/event-page.c:1482
+#: ../calendar/gui/dialogs/event-page.c:1487
 msgid "End date is wrong"
 msgstr "çæææéè"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/event-page.c:1510
 msgid "Start time is wrong"
 msgstr "éåæééè"
 
-#: ../calendar/gui/dialogs/event-page.c:1512
+#: ../calendar/gui/dialogs/event-page.c:1517
 msgid "End time is wrong"
 msgstr "çææééè"
 
-#: ../calendar/gui/dialogs/event-page.c:1675
+#: ../calendar/gui/dialogs/event-page.c:1680
 #: ../calendar/gui/dialogs/memo-page.c:771
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "An organizer is required."
 msgstr "éèäååéäã"
 
-#: ../calendar/gui/dialogs/event-page.c:1709
+#: ../calendar/gui/dialogs/event-page.c:1714
 #: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "æåéèäååæèã"
 
-#: ../calendar/gui/dialogs/event-page.c:1916
+#: ../calendar/gui/dialogs/event-page.c:1921
 msgid "_Delegatees"
 msgstr "äçè(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1918
+#: ../calendar/gui/dialogs/event-page.c:1923
 msgid "Atte_ndees"
 msgstr "åæè(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/dialogs/event-page.c:2998
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "çæéåèäæã%sãï%s"
 
-#: ../calendar/gui/dialogs/event-page.c:3409
+#: ../calendar/gui/dialogs/event-page.c:3423
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "åæåçæå %d å"
 
-#: ../calendar/gui/dialogs/event-page.c:3415
+#: ../calendar/gui/dialogs/event-page.c:3429
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "çæå %d åæ"
 
-#: ../calendar/gui/dialogs/event-page.c:3421
+#: ../calendar/gui/dialogs/event-page.c:3435
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "çæå %d åé"
 
-#: ../calendar/gui/dialogs/event-page.c:3440
+#: ../calendar/gui/dialogs/event-page.c:3454
 msgid "Customize"
 msgstr "èè"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3446
+#: ../calendar/gui/dialogs/event-page.c:3460
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "ææ"
@@ -3078,9 +3080,9 @@ msgstr "çæåã%sãéåååéï%s"
 #: ../em-format/e-mail-parser-inlinepgp-signed.c:96
 #: ../em-format/e-mail-parser-multipart-encrypted.c:122
 #: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:716 ../mail/e-mail-reader.c:1748
-#: ../mail/em-folder-tree.c:678 ../modules/itip-formatter/itip-view.c:4491
-#: ../modules/itip-formatter/itip-view.c:4889 ../plugins/face/face.c:174
+#: ../libemail-engine/mail-ops.c:720 ../mail/e-mail-reader.c:1727
+#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4524
+#: ../modules/itip-formatter/itip-view.c:4875 ../plugins/face/face.c:174
 #: ../smime/gui/certificate-manager.c:317
 msgid "Unknown error"
 msgstr "äæçéè"
@@ -3397,7 +3399,7 @@ msgstr "çé"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:345
 #: ../calendar/gui/e-task-table.c:579 ../calendar/gui/tasktypes.xml.h:19
-#: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
+#: ../mail/message-list.c:1275 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
 msgstr "é"
 
@@ -3405,7 +3407,7 @@ msgstr "é"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:347
 #: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-task-table.c:580
-#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
+#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1274
 #: ../widgets/misc/e-send-options.ui.h:5
 msgid "Normal"
 msgstr "äè"
@@ -3414,7 +3416,7 @@ msgstr "äè"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:349
 #: ../calendar/gui/e-task-table.c:581 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
+#: ../mail/message-list.c:1273 ../widgets/misc/e-send-options.ui.h:4
 msgid "Low"
 msgstr "ä"
 
@@ -3465,7 +3467,7 @@ msgstr "ååæ"
 #: ../calendar/gui/e-cal-model-tasks.c:495
 #: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
 #: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:869
+#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:879
 msgid "Canceled"
 msgstr "ååæ"
 
@@ -3663,7 +3665,7 @@ msgid "Gnome Calendar"
 msgstr "Gnome èäæ"
 
 #: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1086
+#: ../modules/calendar/e-cal-shell-view-private.c:1085
 msgid "%A %d %b %Y"
 msgstr "%Yå%mæ%dæ (%A)"
 
@@ -3673,19 +3675,19 @@ msgstr "%Yå%mæ%dæ (%A)"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1852
+#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1853
 #: ../calendar/gui/e-day-view-top-item.c:835
 #: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%a %d %b"
 msgstr "%mæ%dæ (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1093
-#: ../modules/calendar/e-cal-shell-view-private.c:1099
-#: ../modules/calendar/e-cal-shell-view-private.c:1102
+#: ../modules/calendar/e-cal-shell-view-private.c:1092
+#: ../modules/calendar/e-cal-shell-view-private.c:1098
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
 msgid "%a %d %b %Y"
 msgstr "%Yå%mæ%dæ (%a)"
 
@@ -3693,10 +3695,10 @@ msgstr "%Yå%mæ%dæ (%a)"
 #: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
 #: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1119
-#: ../modules/calendar/e-cal-shell-view-private.c:1130
-#: ../modules/calendar/e-cal-shell-view-private.c:1137
-#: ../modules/calendar/e-cal-shell-view-private.c:1140
+#: ../modules/calendar/e-cal-shell-view-private.c:1118
+#: ../modules/calendar/e-cal-shell-view-private.c:1129
+#: ../modules/calendar/e-cal-shell-view-private.c:1136
+#: ../modules/calendar/e-cal-shell-view-private.c:1139
 msgid "%d %b %Y"
 msgstr "%Yå%mæ%dæ"
 
@@ -3705,10 +3707,10 @@ msgstr "%Yå%mæ%dæ"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1868
+#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1869
 #: ../calendar/gui/e-day-view-top-item.c:839
 #: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1126
+#: ../modules/calendar/e-cal-shell-view-private.c:1125
 msgid "%d %b"
 msgstr "%mæ%dæ"
 
@@ -3838,8 +3840,8 @@ msgid "Due Date:"
 msgstr "ææææï"
 
 #: ../calendar/gui/e-cal-component-preview.c:317
-#: ../modules/itip-formatter/itip-view.c:1449
-#: ../modules/itip-formatter/itip-view.c:1555
+#: ../modules/itip-formatter/itip-view.c:1463
+#: ../modules/itip-formatter/itip-view.c:1578
 msgid "Status:"
 msgstr "çæï"
 
@@ -3877,7 +3879,7 @@ msgstr "éå"
 msgid "Completion date"
 msgstr "åæææ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:871
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:881
 msgid "Complete"
 msgstr "åæ"
 
@@ -3979,8 +3981,8 @@ msgstr "çæææ"
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
 #: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
 #: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3438
-#: ../modules/itip-formatter/itip-view.c:5969
+#: ../modules/itip-formatter/itip-view.c:3462
+#: ../modules/itip-formatter/itip-view.c:5962
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 msgid "Unknown"
 msgstr "äæ"
@@ -4014,14 +4016,14 @@ msgstr "æåéå %s"
 #: ../calendar/gui/e-cal-model.c:3559
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../modules/itip-formatter/itip-view.c:5957
+#: ../modules/itip-formatter/itip-view.c:5950
 msgid "Accepted"
 msgstr "æå"
 
 #: ../calendar/gui/e-cal-model.c:3560
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:5963
+#: ../modules/itip-formatter/itip-view.c:5956
 msgid "Declined"
 msgstr "åæ"
 
@@ -4035,7 +4037,7 @@ msgstr "æè"
 #: ../calendar/gui/e-cal-model.c:3562
 #: ../calendar/gui/e-meeting-list-view.c:225
 #: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../modules/itip-formatter/itip-view.c:5966
+#: ../modules/itip-formatter/itip-view.c:5959
 msgid "Delegated"
 msgstr "ååæ"
 
@@ -4089,14 +4091,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:773
+#: ../calendar/gui/e-day-view.c:1027 ../calendar/gui/e-week-view.c:773
 #: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
 #: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
 msgid "am"
 msgstr "äå"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:776
+#: ../calendar/gui/e-day-view.c:1030 ../calendar/gui/e-week-view.c:776
 #: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
 #: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
 msgid "pm"
@@ -4108,13 +4110,13 @@ msgstr "äå"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1835 ../calendar/gui/e-day-view-top-item.c:831
+#: ../calendar/gui/e-day-view.c:1836 ../calendar/gui/e-day-view-top-item.c:831
 #: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
 msgid "%A %d %B"
 msgstr "%mæ%dæ%A"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2670
+#: ../calendar/gui/e-day-view.c:2671
 #, c-format
 msgid "Week %d"
 msgstr "ç %d é"
@@ -4808,7 +4810,7 @@ msgstr "çæåæè"
 
 #: ../calendar/importers/icalendar-importer.c:468
 #: ../calendar/importers/icalendar-importer.c:905
-#: ../modules/itip-formatter/itip-view.c:5568
+#: ../modules/itip-formatter/itip-view.c:5564
 msgid "Opening calendar"
 msgstr "éåèäæ"
 
@@ -6533,286 +6535,6 @@ msgstr "ååæ/çåæ"
 msgid "Pacific/Yap"
 msgstr "ååæ/éæå"
 
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:161
-msgid "ID of the socket to embed in"
-msgstr "socket ç IDïååæ"
-
-#: ../capplet/anjal-settings-main.c:162
-msgid "socket"
-msgstr "socket"
-
-#: ../capplet/settings/mail-account-view.c:74
-msgid "Please enter your full name."
-msgstr "èèåæçååã"
-
-#: ../capplet/settings/mail-account-view.c:75
-msgid "Please enter your email address."
-msgstr "èèåæçéåéääåã"
-
-#: ../capplet/settings/mail-account-view.c:76
-msgid "The email address you have entered is invalid."
-msgstr "æèåçéåéääåæçæçã"
-
-#: ../capplet/settings/mail-account-view.c:77
-msgid "Please enter your password."
-msgstr "èèåæçåçã"
-
-#: ../capplet/settings/mail-account-view.c:245
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../capplet/settings/mail-account-view.c:335
-#: ../capplet/settings/mail-account-view.c:378
-msgid "Google"
-msgstr "Google"
-
-#: ../capplet/settings/mail-account-view.c:454
-#: ../capplet/settings/mail-account-view.c:558
-msgid "Always (SSL)"
-msgstr "æé (SSL)"
-
-#: ../capplet/settings/mail-account-view.c:457
-#: ../capplet/settings/mail-account-view.c:561
-msgid "When possible (TLS)"
-msgstr "åèçè (TLS)"
-
-#: ../capplet/settings/mail-account-view.c:460
-#: ../capplet/settings/mail-account-view.c:564
-#: ../mail/e-mail-config-defaults-page.c:729
-msgid "Never"
-msgstr "æä"
-
-#: ../capplet/settings/mail-account-view.c:468
-msgid "Personal details:"
-msgstr "åäèçèæï"
-
-#: ../capplet/settings/mail-account-view.c:475
-#: ../widgets/misc/e-source-config.c:683 ../widgets/misc/e-source-config.c:687
-msgid "Name:"
-msgstr "åçï"
-
-#: ../capplet/settings/mail-account-view.c:484
-msgid "Email address:"
-msgstr "Email äåï"
-
-#: ../capplet/settings/mail-account-view.c:494
-msgid "Details:"
-msgstr "èçèæï"
-
-#: ../capplet/settings/mail-account-view.c:502
-#: ../mail/e-mail-config-summary-page.c:409
-msgid "Receiving"
-msgstr "ææä"
-
-#: ../capplet/settings/mail-account-view.c:509
-msgid "Server type:"
-msgstr "äæåéåï"
-
-#: ../capplet/settings/mail-account-view.c:518
-msgid "Server address:"
-msgstr "äæåäåï"
-
-#: ../capplet/settings/mail-account-view.c:527
-#: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
-msgid "Username:"
-msgstr "äçèåçï"
-
-#: ../capplet/settings/mail-account-view.c:536
-msgid "Use encryption:"
-msgstr "äçååï"
-
-#: ../capplet/settings/mail-account-view.c:569
-#: ../mail/e-mail-config-summary-page.c:421
-msgid "Sending"
-msgstr "åéä"
-
-#: ../capplet/settings/mail-account-view.c:615
-msgid ""
-"To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
-msgstr ""
-"èäçéåéåéäçåæéèåèåäååèãèåäéæäæçéåéääååå"
-"çïæåæåèäæåææçèååãåææåçæèååæéåæéïæåéèäç"
-"èååèçäæåèçèæã"
-
-#: ../capplet/settings/mail-account-view.c:617
-msgid ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
-msgstr ""
-"ææïæåçæèåæåæçéäèååãèåäéèåååãæåæäæååèåç"
-"èçèæèèéåïäææäæåèéèæèååã"
-
-#: ../capplet/settings/mail-account-view.c:619
-msgid "You can specify more options to configure the account."
-msgstr "æåäæåæåçäèåéååèçééã"
-
-#: ../capplet/settings/mail-account-view.c:621
-msgid ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
-msgstr ""
-"çåæåéèæçèååæèåééäãæååçèèçæéåèåïäæææèææ"
-"ååäéèçèã"
-
-#: ../capplet/settings/mail-account-view.c:622
-msgid "You can specify your default settings for your account."
-msgstr "æåäæåèååèçéèèååã"
-
-#: ../capplet/settings/mail-account-view.c:623
-msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
-msgstr "åæååèäéçåäæåååéäåææäéçæéã"
-
-#: ../capplet/settings/mail-account-view.c:638
-#: ../mail/e-mail-config-identity-page.c:640
-msgid "Identity"
-msgstr "èå"
-
-#: ../capplet/settings/mail-account-view.c:638
-msgid "Next - Receiving mail"
-msgstr "ääæ - ææéä"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Receiving mail"
-msgstr "ææéä"
-
-#: ../capplet/settings/mail-account-view.c:639
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Next - Sending mail"
-msgstr "ääæ - åééä"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Back - Identity"
-msgstr "ääæ - èå"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Next - Receiving options"
-msgstr "ääæ - ææéé"
-
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Receiving options"
-msgstr "ææéé"
-
-#: ../capplet/settings/mail-account-view.c:640
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Back - Receiving mail"
-msgstr "ääæ - ææéä"
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Sending mail"
-msgstr "åééä"
-
-#: ../capplet/settings/mail-account-view.c:642
-#: ../capplet/settings/mail-account-view.c:643
-msgid "Next - Review account"
-msgstr "ääæ - æéåè"
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Next - Defaults"
-msgstr "ääæ - èçèæ"
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Back - Receiving options"
-msgstr "ääæ - ææéé"
-
-#: ../capplet/settings/mail-account-view.c:643
-#: ../mail/e-mail-config-defaults-page.c:812
-msgid "Defaults"
-msgstr "éèå"
-
-#: ../capplet/settings/mail-account-view.c:643
-msgid "Back - Sending mail"
-msgstr "ääæ - åééä"
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Review account"
-msgstr "æéåè"
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Finish"
-msgstr "åæ"
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Back - Sending"
-msgstr "ääæ - åé"
-
-#: ../capplet/settings/mail-account-view.c:822
-msgid "Setup Google contacts with Evolution"
-msgstr "å Google éçäåå Evolution"
-
-#: ../capplet/settings/mail-account-view.c:823
-msgid "Setup Google calendar with Evolution"
-msgstr "å Google ææåå Evolution"
-
-#: ../capplet/settings/mail-account-view.c:828
-msgid "You may need to enable IMAP access."
-msgstr "æåèéèåç IMAP ååã"
-
-#: ../capplet/settings/mail-account-view.c:836
-msgid "Google account settings:"
-msgstr "Google åèèååï"
-
-#: ../capplet/settings/mail-account-view.c:862
-msgid "Setup Yahoo calendar with Evolution"
-msgstr "å Yahoo èäæåå Evolution"
-
-#: ../capplet/settings/mail-account-view.c:866
-msgid ""
-"Yahoo calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. So please confirm and re-enter the calendar name if it is not "
-"correct."
-msgstr ""
-"Yahoo èäææååç åå_åæãæåååèçæéåèäæçåçãåæèçè"
-"åïåææéèèéæèåèäæçåçã"
-
-#: ../capplet/settings/mail-account-view.c:875
-msgid "Yahoo account settings:"
-msgstr "Yahoo åèèååï"
-
-#: ../capplet/settings/mail-account-view.c:889
-msgid "Yahoo Calendar name:"
-msgstr "Yahoo èäæåçï"
-
-#: ../capplet/settings/mail-account-view.c:1088
-msgid "Password:"
-msgstr "åçï"
-
-#: ../capplet/settings/mail-account-view.c:1143
-#: ../capplet/settings/mail-settings-view.c:260
-msgid "Close Tab"
-msgstr "ééåé"
-
-#: ../capplet/settings/mail-account-view.c:1155
-msgid "Account Wizard"
-msgstr "åèçé"
-
-#: ../capplet/settings/mail-capplet-shell.c:209
-msgid "Evolution account assistant"
-msgstr "Evolution åèåç"
-
-#: ../capplet/settings/mail-settings-view.c:145
-#, c-format
-msgid "Modify %s..."
-msgstr "äæ %sâ"
-
-#: ../capplet/settings/mail-settings-view.c:147
-msgid "Add a new account"
-msgstr "ååæçåè"
-
-#: ../capplet/settings/mail-settings-view.c:189
-msgid "Account management"
-msgstr "åèçç"
-
-#: ../capplet/settings/mail-settings-view.c:272
-msgid "Settings"
-msgstr "èåå"
-
 #: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "ååææâ"
@@ -7203,7 +6925,7 @@ msgstr "Evolution éééç"
 msgid "Calendar event notifications"
 msgstr "èäæääéç"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:935
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:936
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
@@ -9285,7 +9007,7 @@ msgstr "ææéæåèççååèæå"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser åèççååèæåã"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:314
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:311
 msgid "Start in offline mode"
 msgstr "äéçæååå"
 
@@ -9433,7 +9155,7 @@ msgid "Bcc"
 msgstr "åäåæ"
 
 #: ../em-format/e-mail-formatter.c:1373
-#: ../em-format/e-mail-formatter-quote-headers.c:166
+#: ../em-format/e-mail-formatter-quote-headers.c:165
 #: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
 #: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
 #: ../smime/lib/e-cert.c:1125
@@ -9491,7 +9213,7 @@ msgstr "åéåæåå RFC822 éä"
 
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1238
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1255
 #: ../modules/cal-config-google/e-google-chooser.c:209
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/menus/gal-define-views-dialog.c:352
@@ -9529,9 +9251,9 @@ msgid "S/MIME encrpyted"
 msgstr "S/MIME åå"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:177
+#: ../em-format/e-mail-formatter-quote-headers.c:176
 #: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1048
+#: ../modules/mail/em-mailer-prefs.c:1121
 msgid "Mailer"
 msgstr "åäè"
 
@@ -10159,7 +9881,7 @@ msgstr "åæçåäåæäçéç"
 #: ../filter/e-filter-rule.c:835 ../libemail-engine/camel-null-store.c:28
 #: ../mail/e-mail-config-summary-page.c:139
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
-#: ../widgets/misc/e-mail-signature-combo-box.c:318
+#: ../widgets/misc/e-mail-signature-combo-box.c:369
 msgid "None"
 msgstr "ææ"
 
@@ -10260,7 +9982,7 @@ msgstr "ææåçæå"
 msgid "a time relative to the current time"
 msgstr "çåæçåæåçæå"
 
-#: ../filter/filter.ui.h:5
+#: ../filter/filter.ui.h:5 ../mail/mail-config.ui.h:78
 msgid "seconds"
 msgstr "ç"
 
@@ -10289,7 +10011,7 @@ msgstr "å"
 msgid "Show filters for mail:"
 msgstr "éçéäéæå:"
 
-#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:165
+#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:166
 msgid "_Filter Rules"
 msgstr "éæåèå(_F)"
 
@@ -10331,125 +10053,131 @@ msgstr "çæçéèçæäç (%d)"
 msgid "Saving message to folder '%s'"
 msgstr "ååéäåèæåã%sã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:557
+#: ../libemail-engine/e-mail-folder-utils.c:565
 msgid "Forwarded messages"
 msgstr "åèåçéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:667
-#: ../libemail-engine/e-mail-folder-utils.c:918
+#: ../libemail-engine/e-mail-folder-utils.c:675
+#: ../libemail-engine/e-mail-folder-utils.c:926
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "åå %d åéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:761
+#: ../libemail-engine/e-mail-folder-utils.c:769
 msgid "Scanning messages for duplicates"
 msgstr "ææéäæåæéè"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1169
+#: ../libemail-engine/e-mail-folder-utils.c:1177
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "çéèæåã%sã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1306
+#: ../libemail-engine/e-mail-folder-utils.c:1314
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "ææã%sãåçèçéã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1310
+#: ../libemail-engine/e-mail-folder-utils.c:1318
 msgid "File has been removed."
 msgstr "ææåçèçéã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1369
+#: ../libemail-engine/e-mail-folder-utils.c:1377
 msgid "Removing attachments"
 msgstr "æåçééä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1533
+#: ../libemail-engine/e-mail-folder-utils.c:1541
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "åå %d åéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1889 ../mail/em-folder-utils.c:609
+#: ../libemail-engine/e-mail-folder-utils.c:1897 ../mail/em-folder-utils.c:613
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "çæçèæå URIã%sã"
 
-#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-properties.c:333
+#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-properties.c:333
 #: ../mail/em-folder-tree-model.c:765
-#: ../modules/mail/e-mail-shell-view-private.c:1033
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:1045
 msgid "Inbox"
 msgstr "æäå"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1031
+#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:758
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 msgid "Drafts"
 msgstr "èç"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:769
-#: ../modules/mail/e-mail-shell-view-private.c:1035
+#: ../libemail-engine/e-mail-session.c:118 ../mail/em-folder-tree-model.c:769
+#: ../modules/mail/e-mail-shell-view-private.c:1036
 msgid "Outbox"
 msgstr "åäå"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-tree-model.c:773
-#: ../modules/mail/e-mail-shell-view-private.c:1037
+#: ../libemail-engine/e-mail-session.c:119 ../mail/em-folder-tree-model.c:773
+#: ../modules/mail/e-mail-shell-view-private.c:1038
 msgid "Sent"
 msgstr "ååé"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1049 ../plugins/templates/templates.c:1349
-#: ../plugins/templates/templates.c:1359
+#: ../plugins/templates/templates.c:1048 ../plugins/templates/templates.c:1345
+#: ../plugins/templates/templates.c:1355
 msgid "Templates"
 msgstr "çæ"
 
-#: ../libemail-engine/e-mail-session.c:1326
+#: ../libemail-engine/e-mail-session.c:1319
 #, c-format
 msgid "User cancelled operation"
 msgstr "äçèåæçæä"
 
-#: ../libemail-engine/e-mail-session.c:1451
+#: ../libemail-engine/e-mail-session.c:1489
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s éèåæ"
+
+#: ../libemail-engine/e-mail-session.c:1534
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "ææ UIDã%sãçèæäæ"
+
+#: ../libemail-engine/e-mail-session.c:1585
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "æææäççåäåïéäçèååçåæã"
 
-#: ../libemail-engine/e-mail-session.c:1464
+#: ../libemail-engine/e-mail-session.c:1598
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "æäååäççèåçïéäçèååçåæã"
 
-#: ../libemail-engine/e-mail-session.c:1626
-#, c-format
-msgid "%s authentication failed"
-msgstr "%s éèåæ"
-
-#: ../libemail-engine/e-mail-session.c:1671
+#: ../libemail-engine/e-mail-session-utils.c:540
 #, c-format
-msgid "No data source found for UID '%s'"
-msgstr "ææ UIDã%sãçèæäæ"
+#| msgid "No data source found for UID '%s'"
+msgid "No mail service found with UID '%s'"
+msgstr "ææ UIDã%sãçéäæå"
 
-#: ../libemail-engine/e-mail-session-utils.c:420
+#: ../libemail-engine/e-mail-session-utils.c:549
 #, c-format
-msgid "Cannot get transport for account '%s'"
-msgstr "äèåååèã%sãçåè"
+msgid "UID '%s' is not a mail transport"
+msgstr "UIDã%sãäæéäåè"
 
-#: ../libemail-engine/e-mail-session-utils.c:508
-#: ../libemail-engine/mail-ops.c:694
+#: ../libemail-engine/e-mail-session-utils.c:641
+#: ../libemail-engine/mail-ops.c:698
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "çæåçååéæåï%s"
 
-#: ../libemail-engine/e-mail-session-utils.c:537
-#: ../libemail-engine/e-mail-session-utils.c:571
-#: ../libemail-engine/mail-ops.c:711 ../libemail-engine/mail-ops.c:747
+#: ../libemail-engine/e-mail-session-utils.c:670
+#: ../libemail-engine/e-mail-session-utils.c:704
+#: ../libemail-engine/mail-ops.c:715 ../libemail-engine/mail-ops.c:751
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -10458,14 +10186,14 @@ msgstr ""
 "çæéåè %sï%s\n"
 "æéåèæåãåäåãèæåã"
 
-#: ../libemail-engine/e-mail-session-utils.c:591
-#: ../libemail-engine/mail-ops.c:769
+#: ../libemail-engine/e-mail-session-utils.c:724
+#: ../libemail-engine/mail-ops.c:773
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "çæéåèæåãåäåãèæåï%s"
 
-#: ../libemail-engine/e-mail-session-utils.c:821
-#: ../libemail-engine/mail-ops.c:897 ../libemail-engine/mail-ops.c:998
+#: ../libemail-engine/e-mail-session-utils.c:954
+#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
 msgid "Sending message"
 msgstr "æååééä"
 
@@ -10484,7 +10212,7 @@ msgstr "éæéçåã%sã"
 msgid "Preparing account '%s' for offline"
 msgstr "æååèã%sãéçåä"
 
-#: ../libemail-engine/mail-folder-cache.c:884
+#: ../libemail-engine/mail-folder-cache.c:885
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -10497,54 +10225,51 @@ msgstr "éæéæçéä"
 msgid "Fetching Mail"
 msgstr "ææéä"
 
-#: ../libemail-engine/mail-ops.c:908
+#: ../libemail-engine/mail-ops.c:916
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æååééä %d / %d"
 
-#. Translators: The string is distinguished by total
-#. * count of messages to be sent.  Failed messages is
-#. * always more than zero.
-#: ../libemail-engine/mail-ops.c:959
+#: ../libemail-engine/mail-ops.c:968
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "çæåé %d / %d åéä"
 
-#: ../libemail-engine/mail-ops.c:965
+#: ../libemail-engine/mail-ops.c:974
 msgid "Canceled."
 msgstr "ååæã"
 
-#: ../libemail-engine/mail-ops.c:967
+#: ../libemail-engine/mail-ops.c:976
 msgid "Complete."
 msgstr "åæã"
 
-#: ../libemail-engine/mail-ops.c:1079
+#: ../libemail-engine/mail-ops.c:1088
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "åéäçåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1080
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "åéäèèåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1197
+#: ../libemail-engine/mail-ops.c:1207
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æåèèèæåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1270
+#: ../libemail-engine/mail-ops.c:1281
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æçååååè '%s'"
 
-#: ../libemail-engine/mail-ops.c:1271
+#: ../libemail-engine/mail-ops.c:1282
 #, c-format
 msgid "Storing account '%s'"
 msgstr "åååè '%s'"
 
-#: ../libemail-engine/mail-ops.c:1345
+#: ../libemail-engine/mail-ops.c:1356
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æçã%sãçåæç"
@@ -10554,26 +10279,26 @@ msgstr "æçã%sãçåæç"
 msgid "Could not create spool directory '%s': %s"
 msgstr "çæåçæåååçéã%sãï%s"
 
-#: ../libemail-engine/mail-tools.c:112
+#: ../libemail-engine/mail-tools.c:111
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "æååèçåé mbox äæã%sãçéä"
 
-#: ../libemail-engine/mail-tools.c:224
+#: ../libemail-engine/mail-tools.c:229
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "èåçéä - %s"
 
-#: ../libemail-engine/mail-tools.c:226
+#: ../libemail-engine/mail-tools.c:231
 msgid "Forwarded message"
 msgstr "èåçéä"
 
-#: ../libemail-engine/mail-vfolder.c:129
+#: ../libemail-engine/mail-vfolder.c:130
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "èåæåèæåï %s"
 
-#: ../libemail-engine/mail-vfolder.c:282
+#: ../libemail-engine/mail-vfolder.c:283
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "ææã%sãçæåèæå- %s"
@@ -10583,7 +10308,7 @@ msgstr "ææã%sãçæåèæå- %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:647
+#: ../libemail-engine/mail-vfolder.c:648
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -10622,7 +10347,7 @@ msgstr "åèåç"
 
 #: ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3664
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3655
 #: ../mail/mail-config.ui.h:44
 msgid "Default"
 msgstr "éèå"
@@ -10655,7 +10380,7 @@ msgstr "æææäéåéääå"
 msgid "Missing domain in email address"
 msgstr "éåéääåçäçå"
 
-#: ../mail/e-mail-backend.c:726
+#: ../mail/e-mail-backend.c:734
 msgid "Unknown background operation"
 msgstr "äæçèææä"
 
@@ -10673,7 +10398,7 @@ msgstr "(ææäæ)"
 msgid "Evolution Account Assistant"
 msgstr "Evolution åèåç"
 
-#: ../mail/e-mail-config-auth-check.c:347
+#: ../mail/e-mail-config-auth-check.c:348
 msgid "Check for Supported Types"
 msgstr "ææææçéå"
 
@@ -10695,74 +10420,82 @@ msgstr ""
 msgid "Done"
 msgstr "åæ"
 
-#: ../mail/e-mail-config-defaults-page.c:527
+#: ../mail/e-mail-config-defaults-page.c:539
 msgid "Special Folders"
 msgstr "çæèæå"
 
-#: ../mail/e-mail-config-defaults-page.c:536
+#: ../mail/e-mail-config-defaults-page.c:548
 msgid "Draft Messages _Folder:"
 msgstr "èçéäèæå(_F):"
 
-#: ../mail/e-mail-config-defaults-page.c:546
+#: ../mail/e-mail-config-defaults-page.c:558
 msgid "Choose a folder for saving draft messages."
 msgstr "éæååèçéäçèæåã"
 
-#: ../mail/e-mail-config-defaults-page.c:560
+#: ../mail/e-mail-config-defaults-page.c:572
 msgid "Sent _Messages Folder:"
 msgstr "åééäèæå(_M):"
 
-#: ../mail/e-mail-config-defaults-page.c:570
+#: ../mail/e-mail-config-defaults-page.c:582
 msgid "Choose a folder for saving sent messages."
 msgstr "éæåååééäçèæåã"
 
-#: ../mail/e-mail-config-defaults-page.c:584
+#: ../mail/e-mail-config-defaults-page.c:596
 msgid "_Restore Defaults"
 msgstr "éåçéèå(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:598
+#: ../mail/e-mail-config-defaults-page.c:610
 msgid "Use a Real Folder for _Trash:"
 msgstr "åææäççåèæå(_T):"
 
-#: ../mail/e-mail-config-defaults-page.c:599
+#: ../mail/e-mail-config-defaults-page.c:611
 msgid "Choose a folder for deleted messages."
 msgstr "éæåééäçèæåã"
 
-#: ../mail/e-mail-config-defaults-page.c:608
+#: ../mail/e-mail-config-defaults-page.c:620
 msgid "Use a Real Folder for _Junk:"
 msgstr "ååéääççåèæå(_J):"
 
-#: ../mail/e-mail-config-defaults-page.c:609
+#: ../mail/e-mail-config-defaults-page.c:621
 msgid "Choose a folder for junk messages."
 msgstr "éæååéäçèæåã"
 
-#: ../mail/e-mail-config-defaults-page.c:626
+#: ../mail/e-mail-config-defaults-page.c:638
 msgid "Composing Messages"
 msgstr "æåçèéä"
 
-#: ../mail/e-mail-config-defaults-page.c:635
+#: ../mail/e-mail-config-defaults-page.c:647
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "äååéåæ (cc) ç(_S):"
 
-#: ../mail/e-mail-config-defaults-page.c:660
+#: ../mail/e-mail-config-defaults-page.c:672
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "äååéåäåæ (bcc) ç(_B):"
 
-#: ../mail/e-mail-config-defaults-page.c:695
+#: ../mail/e-mail-config-defaults-page.c:707
 msgid "Message Receipts"
 msgstr "éäåæ"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:716
 msgid "S_end message receipts:"
 msgstr "åééäåæ(_E):"
 
-#: ../mail/e-mail-config-defaults-page.c:735
+#: ../mail/e-mail-config-defaults-page.c:741
+msgid "Never"
+msgstr "æä"
+
+#: ../mail/e-mail-config-defaults-page.c:747
 msgid "Always"
 msgstr "æé"
 
-#: ../mail/e-mail-config-defaults-page.c:741
+#: ../mail/e-mail-config-defaults-page.c:753
 msgid "Ask for each message"
 msgstr "æåéäçèå"
 
+#: ../mail/e-mail-config-defaults-page.c:824
+msgid "Defaults"
+msgstr "éèå"
+
 #: ../mail/e-mail-config-identity-page.c:254
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -10823,6 +10556,10 @@ msgstr "åé(_G):"
 msgid "Add Ne_w Signature..."
 msgstr "ååæççåæ(_W)â"
 
+#: ../mail/e-mail-config-identity-page.c:640
+msgid "Identity"
+msgstr "èå"
+
 #: ../mail/e-mail-config-lookup-page.c:68
 msgid "Looking up account details..."
 msgstr "åæåèèçèæâ"
@@ -10966,6 +10703,14 @@ msgstr "ååï"
 msgid "Email Address:"
 msgstr "éåéääåï"
 
+#: ../mail/e-mail-config-summary-page.c:409
+msgid "Receiving"
+msgstr "ææä"
+
+#: ../mail/e-mail-config-summary-page.c:421
+msgid "Sending"
+msgstr "åéä"
+
 #: ../mail/e-mail-config-summary-page.c:433
 msgid "Server Type:"
 msgstr "äæåéåï"
@@ -10976,6 +10721,11 @@ msgstr "äæåéåï"
 msgid "Server:"
 msgstr "äæåï"
 
+#: ../mail/e-mail-config-summary-page.c:475
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+msgid "Username:"
+msgstr "äçèåçï"
+
 #: ../mail/e-mail-config-summary-page.c:496
 msgid "Security:"
 msgstr "ååæ:"
@@ -11003,35 +10753,35 @@ msgstr "æèäç"
 msgid "Account Editor"
 msgstr "åèçèå"
 
-#: ../mail/e-mail-display.c:121
+#: ../mail/e-mail-display.c:119
 msgid "_Add to Address Book..."
 msgstr "åååéèé(_A)â"
 
-#: ../mail/e-mail-display.c:128
+#: ../mail/e-mail-display.c:126
 msgid "_To This Address"
 msgstr "åéåäå(_T)"
 
-#: ../mail/e-mail-display.c:135
+#: ../mail/e-mail-display.c:133
 msgid "_From This Address"
 msgstr "åéåäå(_F)"
 
-#: ../mail/e-mail-display.c:142
+#: ../mail/e-mail-display.c:140
 msgid "Send _Reply To..."
 msgstr "åéåèå(_R)â"
 
-#: ../mail/e-mail-display.c:144
+#: ../mail/e-mail-display.c:142
 msgid "Send a reply message to this address"
 msgstr "åéåèéäåéåäå"
 
-#: ../mail/e-mail-display.c:151
+#: ../mail/e-mail-display.c:149
 msgid "Create Search _Folder"
 msgstr "åçæåèæå(_F)"
 
-#: ../mail/e-mail-display.c:161
+#: ../mail/e-mail-display.c:159
 msgid "Save _Image..."
 msgstr "åååç(_I)â"
 
-#: ../mail/e-mail-display.c:163
+#: ../mail/e-mail-display.c:161
 msgid "Save the image to a file"
 msgstr "ååçååçææ"
 
@@ -11090,12 +10840,12 @@ msgstr ""
 msgid "Color"
 msgstr "éè"
 
-#: ../mail/e-mail-migrate.c:646
+#: ../mail/e-mail-migrate.c:332
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "çæåã%sãåçæåéäèæåï%s"
 
-#: ../mail/e-mail-notebook-view.c:627
+#: ../mail/e-mail-notebook-view.c:269
 msgid "Please select a folder"
 msgstr "èéæèæå"
 
@@ -11104,641 +10854,641 @@ msgstr "èéæèæå"
 msgid "Page %d of %d"
 msgstr "ç %d / %d é"
 
-#: ../mail/e-mail-printer.c:536
+#: ../mail/e-mail-printer.c:549
 #: ../modules/calendar/e-cal-shell-view-actions.c:217
 #: ../modules/calendar/e-cal-shell-view-actions.c:246
 msgid "Print"
 msgstr "åå"
 
-#: ../mail/e-mail-printer.c:542
+#: ../mail/e-mail-printer.c:555
 msgid "Header Name"
 msgstr "æéåçï"
 
-#: ../mail/e-mail-printer.c:548
+#: ../mail/e-mail-printer.c:561
 msgid "Header Value"
 msgstr "æéæå"
 
-#: ../mail/e-mail-printer.c:596 ../mail/mail-config.ui.h:100
+#: ../mail/e-mail-printer.c:615 ../mail/mail-config.ui.h:102
 msgid "Headers"
 msgstr "æé"
 
-#: ../mail/e-mail-reader.c:357
+#: ../mail/e-mail-reader.c:349
 msgid "Save Image"
 msgstr "åååç"
 
-#: ../mail/e-mail-reader.c:440 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:431 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "èèèèæå"
 
-#: ../mail/e-mail-reader.c:440 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:431 ../mail/em-folder-utils.c:492
 msgid "C_opy"
 msgstr "èè(_O)"
 
-#: ../mail/e-mail-reader.c:974 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "çèèæå"
 
-#: ../mail/e-mail-reader.c:974 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:492
 msgid "_Move"
 msgstr "çå(_M)"
 
-#: ../mail/e-mail-reader.c:1335 ../mail/e-mail-reader.c:1517
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1313 ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1535
 msgid "_Do not ask me again."
 msgstr "äèåèåæ(_D)ã"
 
-#: ../mail/e-mail-reader.c:1563
+#: ../mail/e-mail-reader.c:1541
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æéåçéäèåçåèæä(_A)"
 
-#: ../mail/e-mail-reader.c:1747
+#: ../mail/e-mail-reader.c:1726
 msgid "Failed to retrieve message:"
 msgstr "ååéäåæï"
 
-#: ../mail/e-mail-reader.c:1793 ../mail/e-mail-reader.c:2882
+#: ../mail/e-mail-reader.c:1772 ../mail/e-mail-reader.c:2862
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æåååéäã%sã"
 
-#: ../mail/e-mail-reader.c:1969
+#: ../mail/e-mail-reader.c:1949
 msgid "A_dd Sender to Address Book"
 msgstr "åååäèåçéæå(_D)"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:1951
 msgid "Add sender to address book"
 msgstr "æååäèèéèé"
 
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1956
 msgid "Check for _Junk"
 msgstr "ææååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:1958
 msgid "Filter the selected messages for junk status"
 msgstr "çéæéääçååéäçæ"
 
-#: ../mail/e-mail-reader.c:1983
+#: ../mail/e-mail-reader.c:1963
 msgid "_Copy to Folder..."
 msgstr "èèèèæå(_C)â"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:1965
 msgid "Copy selected messages to another folder"
 msgstr "èèåéåçéäååäåèæå"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1970
 msgid "_Delete Message"
 msgstr "åééä(_D)"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:1972
 msgid "Mark the selected messages for deletion"
 msgstr "åéåçéäæçæèåé"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:1977
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "åéäèååçéæåèå(_L)â"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:1979
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "çéåéäèååçéæåèå"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:1984
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "åæäèåçéæåèå(_R)â"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:1986
 msgid "Create a rule to filter messages to these recipients"
 msgstr "çéäæäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:1991
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "ååäèåçéæåèå(_N)â"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:1993
 msgid "Create a rule to filter messages from this sender"
 msgstr "çéååäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:1998
 msgid "Create a Filter Rule for _Subject..."
 msgstr "åäæåçéæåèå(_S)â"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2000
 msgid "Create a rule to filter messages with this subject"
 msgstr "çéåäæåçéæåèå"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2005
 msgid "A_pply Filters"
 msgstr "åçéæå(_P)"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2007
 msgid "Apply filter rules to the selected messages"
 msgstr "åçéæåèåææéåçéä"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2012
 msgid "_Find in Message..."
 msgstr "åéäååæ(_F)â"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2014
 msgid "Search for text in the body of the displayed message"
 msgstr "æåéççéäææäçæå"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2019
 msgid "_Clear Flag"
 msgstr "æéæå(_C)"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2021
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "çééåéäçèéææ"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2026
 msgid "_Flag Completed"
 msgstr "æèçååæ(_F)"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2028
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ååéåéäçèéææèçååæ"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2033
 msgid "Follow _Up..."
 msgstr "èé(_U)â"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2035
 msgid "Flag the selected messages for follow-up"
 msgstr "åéåçéäåäèéææ"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2040
 msgid "_Attached"
 msgstr "éä(_A)"
 
-#: ../mail/e-mail-reader.c:2062 ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2042 ../mail/e-mail-reader.c:2049
 msgid "Forward the selected message to someone as an attachment"
 msgstr "åéåçéääéäååèåçæä"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2047
 msgid "Forward As _Attached"
 msgstr "äéäèå(_A)"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2054
 msgid "_Inline"
 msgstr "èå(_I)"
 
-#: ../mail/e-mail-reader.c:2076 ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:2056 ../mail/e-mail-reader.c:2063
 msgid "Forward the selected message in the body of a new message"
 msgstr "åéèèåçéäåéææéäçåæä"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2061
 msgid "Forward As _Inline"
 msgstr "äèåèå(_I)"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2068
 msgid "_Quoted"
 msgstr "åæ(_Q)"
 
-#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2070 ../mail/e-mail-reader.c:2077
 msgid "Forward the selected message quoted like a reply"
 msgstr "åéèèåçéääåèéäæååå"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2075
 msgid "Forward As _Quoted"
 msgstr "äåæèå(_Q)"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2082
 msgid "_Load Images"
 msgstr "èååç(_L)"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2084
 msgid "Force images in HTML mail to be loaded"
 msgstr "éè HTML æåçéäæåèèååç"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2089
 msgid "_Important"
 msgstr "éè(_I)"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2091
 msgid "Mark the selected messages as important"
 msgstr "åéåçéäæçæéè"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2096
 msgid "_Junk"
 msgstr "ååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2098
 msgid "Mark the selected messages as junk"
 msgstr "åéåçéäæçæååéä"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2103
 msgid "_Not Junk"
 msgstr "äæååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2105
 msgid "Mark the selected messages as not being junk"
 msgstr "åéåçéäæçæäæååéä"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2110
 msgid "_Read"
 msgstr "åéè(_R)"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2112
 msgid "Mark the selected messages as having been read"
 msgstr "åéåçéäæçæåçéè"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2117
 msgid "Uni_mportant"
 msgstr "äéè(_M)"
 
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2119
 msgid "Mark the selected messages as unimportant"
 msgstr "åéåçéäæçæäéè"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2124
 msgid "_Unread"
 msgstr "æéè(_U)"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2126
 msgid "Mark the selected messages as not having been read"
 msgstr "åéåçéäæçææéè"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2131
 msgid "_Edit as New Message..."
 msgstr "çèçæéä(_E)â"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2133
 msgid "Open the selected messages in the composer for editing"
 msgstr "åæåèçéåéåçéäääçè"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2138
 msgid "Compose _New Message"
 msgstr "æåæéä(_N)"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2140
 msgid "Open a window for composing a mail message"
 msgstr "éåèçääæåéä"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2145
 msgid "_Open in New Window"
 msgstr "åæèçéå(_O)"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2147
 msgid "Open the selected messages in a new window"
 msgstr "äçæèçéåéåçéä"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2152
 msgid "_Move to Folder..."
 msgstr "çèèæå(_M)â"
 
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2154
 msgid "Move selected messages to another folder"
 msgstr "åéåçéäçèåäåèæå"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2159
 msgid "_Switch to Folder"
 msgstr "åæèèæå(_S)"
 
-#: ../mail/e-mail-reader.c:2181
+#: ../mail/e-mail-reader.c:2161
 msgid "Display the parent folder"
 msgstr "éçäåèæå"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2166
 msgid "Switch to _next tab"
 msgstr "åæèääååé(_N)"
 
-#: ../mail/e-mail-reader.c:2188
+#: ../mail/e-mail-reader.c:2168
 msgid "Switch to the next tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2173
 msgid "Switch to _previous tab"
 msgstr "åæèääååé(_P)"
 
-#: ../mail/e-mail-reader.c:2195
+#: ../mail/e-mail-reader.c:2175
 msgid "Switch to the previous tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2180
 msgid "Cl_ose current tab"
 msgstr "ééçåçåé(_O)"
 
-#: ../mail/e-mail-reader.c:2202
+#: ../mail/e-mail-reader.c:2182
 msgid "Close current tab"
 msgstr "ééçåçåé"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2187
 msgid "_Next Message"
 msgstr "ääåéä(_N)"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2189
 msgid "Display the next message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2194
 msgid "Next _Important Message"
 msgstr "ääåéèéä(_I)"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2196
 msgid "Display the next important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2201
 msgid "Next _Thread"
 msgstr "ääåçééä(_T)"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2203
 msgid "Display the next thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2208
 msgid "Next _Unread Message"
 msgstr "ääåæéèçéä(_U)"
 
-#: ../mail/e-mail-reader.c:2230
+#: ../mail/e-mail-reader.c:2210
 msgid "Display the next unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2215
 msgid "_Previous Message"
 msgstr "ääåéä(_P)"
 
-#: ../mail/e-mail-reader.c:2237
+#: ../mail/e-mail-reader.c:2217
 msgid "Display the previous message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2222
 msgid "Pr_evious Important Message"
 msgstr "ääåéèéä(_E)"
 
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2224
 msgid "Display the previous important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2229
 msgid "Previous T_hread"
 msgstr "ääåçééä(_H)"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2231
 msgid "Display the previous thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2236
 msgid "P_revious Unread Message"
 msgstr "ääåæéèçéä(_R)"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2238
 msgid "Display the previous unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2265
+#: ../mail/e-mail-reader.c:2245
 msgid "Print this message"
 msgstr "ååéä"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../mail/e-mail-reader.c:2252
 msgid "Preview the message to be printed"
 msgstr "éèéèååçéä"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2257
 msgid "Re_direct"
 msgstr "éæåå(_D)"
 
-#: ../mail/e-mail-reader.c:2279
+#: ../mail/e-mail-reader.c:2259
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "åéåçéäéæååçæä"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2264
 msgid "Remo_ve Attachments"
 msgstr "çééä(_V)"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../mail/e-mail-reader.c:2266
 msgid "Remove attachments"
 msgstr "çééä"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2271
 msgid "Remove Du_plicate Messages"
 msgstr "çééèçéä(_P)"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2273
 msgid "Checks selected messages for duplicates"
 msgstr "ææéåçéäæåæéè"
 
-#: ../mail/e-mail-reader.c:2298 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2278 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1574
 #: ../modules/mail/e-mail-attachment-handler.c:182
 msgid "Reply to _All"
 msgstr "åèææä(_A)"
 
-#: ../mail/e-mail-reader.c:2300
+#: ../mail/e-mail-reader.c:2280
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æååéçåéåéäçåéæäè"
 
-#: ../mail/e-mail-reader.c:2305 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2285 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "åèèæå(_L)"
 
-#: ../mail/e-mail-reader.c:2307
+#: ../mail/e-mail-reader.c:2287
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æååéçæéåéäçéäèå"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2292
 #: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Reply to Sender"
 msgstr "åèåäè(_R)"
 
-#: ../mail/e-mail-reader.c:2314
+#: ../mail/e-mail-reader.c:2294
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æååéçæéåçéäçåäè"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2299
 msgid "_Save as mbox..."
 msgstr "ååæ mbox(_S)â"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2301
 msgid "Save selected messages as an mbox file"
 msgstr "åéåçéäååæ mbox ææ"
 
-#: ../mail/e-mail-reader.c:2326
+#: ../mail/e-mail-reader.c:2306
 msgid "_Message Source"
 msgstr "éääæ(_M)"
 
-#: ../mail/e-mail-reader.c:2328
+#: ../mail/e-mail-reader.c:2308
 msgid "Show the raw email source of the message"
 msgstr "éçéäååæ"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2320
 msgid "_Undelete Message"
 msgstr "åååééä(_U)"
 
-#: ../mail/e-mail-reader.c:2342
+#: ../mail/e-mail-reader.c:2322
 msgid "Undelete the selected messages"
 msgstr "åæåééåçéä"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2327
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../mail/e-mail-reader.c:2349
+#: ../mail/e-mail-reader.c:2329
 msgid "Reset the text to its original size"
 msgstr "éèæåçåååå"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2334
 msgid "_Zoom In"
 msgstr "æè(_Z)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2336
 msgid "Increase the text size"
 msgstr "åæåæå"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2341
 msgid "Zoom _Out"
 msgstr "æé(_O)"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2343
 msgid "Decrease the text size"
 msgstr "åæåçå"
 
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2350
 msgid "Cre_ate"
 msgstr "åç(_A)"
 
-#: ../mail/e-mail-reader.c:2377
+#: ../mail/e-mail-reader.c:2357
 msgid "Ch_aracter Encoding"
 msgstr "ååçç(_A)"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2364
 msgid "F_orward As"
 msgstr "èåç(_O)"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2371
 msgid "_Group Reply"
 msgstr "ççåè(_G)"
 
-#: ../mail/e-mail-reader.c:2398
+#: ../mail/e-mail-reader.c:2378
 msgid "_Go To"
 msgstr "çè(_G)"
 
-#: ../mail/e-mail-reader.c:2405
+#: ../mail/e-mail-reader.c:2385
 msgid "Mar_k As"
 msgstr "æçæ(_K)"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2392
 msgid "_Message"
 msgstr "éä(_M)"
 
-#: ../mail/e-mail-reader.c:2419
+#: ../mail/e-mail-reader.c:2399
 msgid "_Zoom"
 msgstr "çæ(_Z)"
 
-#: ../mail/e-mail-reader.c:2429
+#: ../mail/e-mail-reader.c:2409
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "åéäèååçæåèæå(_L)â"
 
-#: ../mail/e-mail-reader.c:2431
+#: ../mail/e-mail-reader.c:2411
 msgid "Create a search folder for this mailing list"
 msgstr "çéåéäèååçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2416
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "åæäèåçæåèæå(_T)â"
 
-#: ../mail/e-mail-reader.c:2438
+#: ../mail/e-mail-reader.c:2418
 msgid "Create a search folder for these recipients"
 msgstr "çéäæäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2423
 msgid "Create a Search Folder from Sen_der..."
 msgstr "ååäèåçæåèæå(_D)â"
 
-#: ../mail/e-mail-reader.c:2445
+#: ../mail/e-mail-reader.c:2425
 msgid "Create a search folder for this sender"
 msgstr "çéååäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2450
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a Search Folder from S_ubject..."
 msgstr "åäæåçæåèæå(_U)â"
 
-#: ../mail/e-mail-reader.c:2452
+#: ../mail/e-mail-reader.c:2432
 msgid "Create a search folder for this subject"
 msgstr "çéåäæåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2475
+#: ../mail/e-mail-reader.c:2455
 msgid "Mark for Follo_w Up..."
 msgstr "æççèé(_W)â"
 
-#: ../mail/e-mail-reader.c:2483
+#: ../mail/e-mail-reader.c:2463
 msgid "Mark as _Important"
 msgstr "æçæéè(_I)"
 
-#: ../mail/e-mail-reader.c:2487
+#: ../mail/e-mail-reader.c:2467
 msgid "Mark as _Junk"
 msgstr "æçæååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2491
+#: ../mail/e-mail-reader.c:2471
 msgid "Mark as _Not Junk"
 msgstr "æçæéååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2495
+#: ../mail/e-mail-reader.c:2475
 msgid "Mar_k as Read"
 msgstr "æçæåéè(_K)"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../mail/e-mail-reader.c:2479
 msgid "Mark as Uni_mportant"
 msgstr "æçæäéè(_M)"
 
-#: ../mail/e-mail-reader.c:2503
+#: ../mail/e-mail-reader.c:2483
 msgid "Mark as _Unread"
 msgstr "æçææéè(_U)"
 
-#: ../mail/e-mail-reader.c:2547
+#: ../mail/e-mail-reader.c:2527
 msgid "_Caret Mode"
 msgstr "æåæå(_C)"
 
-#: ../mail/e-mail-reader.c:2549
+#: ../mail/e-mail-reader.c:2529
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "åéççéäåæäéçéçææ"
 
-#: ../mail/e-mail-reader.c:2555
+#: ../mail/e-mail-reader.c:2535
 msgid "All Message _Headers"
 msgstr "ææéäæé(_H)"
 
-#: ../mail/e-mail-reader.c:2557
+#: ../mail/e-mail-reader.c:2537
 msgid "Show messages with all email headers"
 msgstr "éçéäåèçæé"
 
-#: ../mail/e-mail-reader.c:2888
+#: ../mail/e-mail-reader.c:2868
 msgid "Retrieving message"
 msgstr "ååéä"
 
-#: ../mail/e-mail-reader.c:3860
+#: ../mail/e-mail-reader.c:3851
 #: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "èå(_F)"
 
-#: ../mail/e-mail-reader.c:3861
+#: ../mail/e-mail-reader.c:3852
 msgid "Forward the selected message to someone"
 msgstr "åéåçéäèåçæä"
 
-#: ../mail/e-mail-reader.c:3880
+#: ../mail/e-mail-reader.c:3871
 msgid "Group Reply"
 msgstr "ççåè"
 
-#: ../mail/e-mail-reader.c:3881
+#: ../mail/e-mail-reader.c:3872
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "åèçéäèåïææçææçæäè"
 
-#: ../mail/e-mail-reader.c:3938 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3929 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "åé"
 
-#: ../mail/e-mail-reader.c:3971
+#: ../mail/e-mail-reader.c:3962
 #: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Next"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3975
+#: ../mail/e-mail-reader.c:3966
 #: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Previous"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3984 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3975 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "åè"
 
-#: ../mail/e-mail-reader.c:4714
+#: ../mail/e-mail-reader.c:4705
 #, c-format
 msgid "Folder '%s'"
 msgstr "èæåã%sã"
@@ -11747,13 +11497,13 @@ msgstr "èæåã%sã"
 msgid "Do not warn me again"
 msgstr "äèåèåæ"
 
-#: ../mail/e-mail-reader-utils.c:949
+#: ../mail/e-mail-reader-utils.c:954
 msgid "Printing"
 msgstr "åå"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1130
+#: ../mail/e-mail-reader-utils.c:1136
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11763,7 +11513,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "èæåã%sãåå %u åéèçéäãæçåèåéåï"
 
-#: ../mail/e-mail-reader-utils.c:1534
+#: ../mail/e-mail-reader-utils.c:1541
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ååéä"
@@ -11773,12 +11523,12 @@ msgstr[0] "ååéä"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1555
+#: ../mail/e-mail-reader-utils.c:1562
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "éä"
 
-#: ../mail/e-mail-reader-utils.c:2010
+#: ../mail/e-mail-reader-utils.c:2017
 msgid "Parsing message"
 msgstr "èæéä"
 
@@ -11795,7 +11545,7 @@ msgstr "èèéçæå"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1287
+#: ../mail/em-composer-utils.c:1282
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11803,27 +11553,27 @@ msgstr ""
 "æ ${AbbrevWeekdayName}ï${Year}-${Month}-${Day} æ ${24Hour}:${Minute} "
 "${TimeZone}ï${Sender} æåï"
 
-#: ../mail/em-composer-utils.c:1293
+#: ../mail/em-composer-utils.c:1288
 msgid "-------- Forwarded Message --------"
 msgstr "-------- èéçéä --------"
 
-#: ../mail/em-composer-utils.c:1298
+#: ../mail/em-composer-utils.c:1293
 msgid "-----Original Message-----"
 msgstr "-----ååéä-----"
 
-#: ../mail/em-composer-utils.c:2578
+#: ../mail/em-composer-utils.c:2573
 msgid "an unknown sender"
 msgstr "äæçåäè"
 
-#: ../mail/em-composer-utils.c:2996
+#: ../mail/em-composer-utils.c:2991
 msgid "Posting destination"
 msgstr "åèçççç"
 
-#: ../mail/em-composer-utils.c:2997
+#: ../mail/em-composer-utils.c:2992
 msgid "Choose folders to post the message to."
 msgstr "éåèæåäåèéäã"
 
-#: ../mail/em-filter-editor-folder-element.c:156
+#: ../mail/em-filter-editor-folder-element.c:158
 msgid "Select Folder"
 msgstr "éæèæå"
 
@@ -11948,7 +11698,7 @@ msgstr "æèå"
 msgid "is set"
 msgstr "èå"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:107
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:109
 msgid "Junk"
 msgstr "ååéä"
 
@@ -12082,11 +11832,11 @@ msgid "Unset Status"
 msgstr "åæèåçæ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:581
+#: ../mail/em-filter-rule.c:583
 msgid "Then"
 msgstr "æèä"
 
-#: ../mail/em-filter-rule.c:646
+#: ../mail/em-filter-rule.c:648
 msgid "Add Ac_tion"
 msgstr "åååä(_T)"
 
@@ -12126,41 +11876,41 @@ msgstr "åç(_R)"
 msgid "Folder _name:"
 msgstr "èæååç(_N):"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:644
 msgid "Folder names cannot contain '/'"
 msgstr "èæååçäèååæçã"
 
-#: ../mail/em-folder-tree.c:783
+#: ../mail/em-folder-tree.c:780
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1608
+#: ../mail/em-folder-tree.c:1605
 msgid "Mail Folder Tree"
 msgstr "éäèæåæ"
 
-#: ../mail/em-folder-tree.c:2134 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2132 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "æåçåèæå %s"
 
-#: ../mail/em-folder-tree.c:2137 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2135 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "æåèèèæå %s"
 
-#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2304
+#: ../mail/em-folder-tree.c:2142 ../mail/message-list.c:2301
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æååéäçèèæå %s"
 
-#: ../mail/em-folder-tree.c:2148 ../mail/message-list.c:2306
+#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2303
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æåèèéäèèæå %s"
 
-#: ../mail/em-folder-tree.c:2167
+#: ../mail/em-folder-tree.c:2165
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "çæåéäææåæäåçååå"
@@ -12174,19 +11924,19 @@ msgstr "äçå"
 msgid "Loading..."
 msgstr "èåäâ"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:493
 msgid "Move Folder To"
 msgstr "çåèæåå"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:493
 msgid "Copy Folder To"
 msgstr "èèèæåå"
 
-#: ../mail/em-folder-utils.c:586
+#: ../mail/em-folder-utils.c:590
 msgid "Create Folder"
 msgstr "åçèæå"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:591
 msgid "Specify where to create the folder:"
 msgstr "æåèåçèæåçäçï"
 
@@ -12202,8 +11952,8 @@ msgstr "èéççèé(_B)"
 msgid "Subscribe To _All"
 msgstr "åéèé(_A)"
 
-#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1844
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "_Unsubscribe"
 msgstr "åæèé(_U)"
 
@@ -12215,56 +11965,56 @@ msgstr "åæèééèç(_B)"
 msgid "Unsubscribe From _All"
 msgstr "åéåæèé(_A)"
 
-#: ../mail/em-subscription-editor.c:1679
+#: ../mail/em-subscription-editor.c:1682
 msgid "Folder Subscriptions"
 msgstr "èæåèé"
 
-#: ../mail/em-subscription-editor.c:1719
+#: ../mail/em-subscription-editor.c:1722
 msgid "_Account:"
 msgstr "åè(_A):"
 
-#: ../mail/em-subscription-editor.c:1734
+#: ../mail/em-subscription-editor.c:1737
 msgid "Clear Search"
 msgstr "æéæå"
 
-#: ../mail/em-subscription-editor.c:1752
+#: ../mail/em-subscription-editor.c:1755
 msgid "Sho_w items that contain:"
 msgstr "éçéçåå(_W):"
 
-#: ../mail/em-subscription-editor.c:1797
+#: ../mail/em-subscription-editor.c:1800
 msgid "Subscribe to the selected folder"
 msgstr "èééåçèæå"
 
-#: ../mail/em-subscription-editor.c:1798
+#: ../mail/em-subscription-editor.c:1801
 msgid "Su_bscribe"
 msgstr "èé(_B)"
 
-#: ../mail/em-subscription-editor.c:1843
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../mail/em-subscription-editor.c:1846
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
 msgid "Unsubscribe from the selected folder"
 msgstr "åæèééåçèæå"
 
-#: ../mail/em-subscription-editor.c:1883
+#: ../mail/em-subscription-editor.c:1886
 msgid "Collapse all folders"
 msgstr "ææææçèæå"
 
-#: ../mail/em-subscription-editor.c:1884
+#: ../mail/em-subscription-editor.c:1887
 msgid "C_ollapse All"
 msgstr "åéææ(_O)"
 
-#: ../mail/em-subscription-editor.c:1894
+#: ../mail/em-subscription-editor.c:1897
 msgid "Expand all folders"
 msgstr "åéææçèæå"
 
-#: ../mail/em-subscription-editor.c:1895
+#: ../mail/em-subscription-editor.c:1898
 msgid "E_xpand All"
 msgstr "åéåé(_X)"
 
-#: ../mail/em-subscription-editor.c:1905
+#: ../mail/em-subscription-editor.c:1908
 msgid "Refresh the folder list"
 msgstr "éææçèæåæå"
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../mail/em-subscription-editor.c:1920
 msgid "Stop the current operation"
 msgstr "åæçåçæä"
 
@@ -12287,7 +12037,7 @@ msgstr "äèåéçéåèæ(_D)"
 msgid "Message Filters"
 msgstr "éäèå"
 
-#: ../mail/em-utils.c:1064
+#: ../mail/em-utils.c:1067
 #, c-format
 msgid "Messages from %s"
 msgstr "äè %s çéä"
@@ -12296,35 +12046,35 @@ msgstr "äè %s çéä"
 msgid "Search _Folders"
 msgstr "æåèæå(_F)"
 
-#: ../mail/em-vfolder-editor-rule.c:388
+#: ../mail/em-vfolder-editor-rule.c:391
 msgid "Add Folder"
 msgstr "ååèæå"
 
-#: ../mail/em-vfolder-editor-rule.c:514
+#: ../mail/em-vfolder-editor-rule.c:517
 msgid "Search Folder Sources"
 msgstr "æåèæåäæ"
 
-#: ../mail/em-vfolder-editor-rule.c:544
+#: ../mail/em-vfolder-editor-rule.c:549
 msgid "Automatically update on any _source folder change"
 msgstr "äæèæåäæääèææèåææ(_S)"
 
-#: ../mail/em-vfolder-editor-rule.c:556
+#: ../mail/em-vfolder-editor-rule.c:561
 msgid "All local folders"
 msgstr "æææåçèæå"
 
-#: ../mail/em-vfolder-editor-rule.c:557
+#: ../mail/em-vfolder-editor-rule.c:562
 msgid "All active remote folders"
 msgstr "ææåççéçèæå"
 
-#: ../mail/em-vfolder-editor-rule.c:558
+#: ../mail/em-vfolder-editor-rule.c:563
 msgid "All local and active remote folders"
 msgstr "æææåçååççéçèæå"
 
-#: ../mail/em-vfolder-editor-rule.c:559
+#: ../mail/em-vfolder-editor-rule.c:564
 msgid "Specific folders"
 msgstr "æåçèæå"
 
-#: ../mail/em-vfolder-editor-rule.c:594
+#: ../mail/em-vfolder-editor-rule.c:602
 msgid "include subfolders"
 msgstr "åæåçé"
 
@@ -12333,7 +12083,7 @@ msgid "Importing Elm data"
 msgstr "èå Elm èæ"
 
 #: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1071
+#: ../modules/mail/e-mail-shell-view.c:1074
 #: ../widgets/misc/e-send-options.c:538
 msgid "Mail"
 msgstr "éä"
@@ -12363,22 +12113,22 @@ msgstr "éæèæå"
 msgid "Select folder to import into"
 msgstr "éåèæåäèå"
 
-#: ../mail/importers/evolution-mbox-importer.c:438
+#: ../mail/importers/evolution-mbox-importer.c:439
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "äæ"
 
-#: ../mail/importers/evolution-mbox-importer.c:443
+#: ../mail/importers/evolution-mbox-importer.c:444
 msgctxt "mboxImp"
 msgid "From"
 msgstr "åäè"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../mail/importers/evolution-mbox-importer.c:488
 #: ../shell/e-shell-utils.c:195
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley éääç (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:488
+#: ../mail/importers/evolution-mbox-importer.c:489
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "åå Berkeley éääçæåèæå"
 
@@ -12731,131 +12481,136 @@ msgid "Fix_ed Width Font:"
 msgstr "åååååå(_E):"
 
 #: ../mail/mail-config.ui.h:77
+#| msgid "Mark Me_ssages as Read"
+msgid "_Mark messages as read after"
+msgstr "åéäæçæåçéèæ(_M)"
+
+#: ../mail/mail-config.ui.h:79
 msgid "Highlight _quotations with"
 msgstr "åèåæç(_Q)"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "color"
 msgstr "èå"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Default character e_ncoding:"
 msgstr "éèååçç(_N):"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Apply the same _view settings to all folders"
 msgstr "åææèæååççåçæèèåå(_V)"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "F_all back to threading messages by subject"
 msgstr "éååääæççééä(_A)"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "Delete Mail"
 msgstr "åééä"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:85
 msgid "Empty trash folders on e_xit"
 msgstr "ééææçåæçèæå(_X)"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:86
 msgid "Confirm _when expunging a folder"
 msgstr "åéèæåæçè(_W)"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:88
 msgid "_Show animated images"
 msgstr "ææåçåç(_S)"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:89
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "çåé HTML éäçäææåéééäçéçäæéçæç(_P)"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:90
 msgid "Loading Images"
 msgstr "æåèååç"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:91
 msgid "_Never load images from the Internet"
 msgstr "äåäèçèäèåç(_N)"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:92
 msgid "_Load images only in messages from contacts"
 msgstr "åèåçéçäååéääçåç(_L)"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:93
 msgid "_Always load images from the Internet"
 msgstr "äåèçèäèåç(_A)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94
 msgid "HTML Messages"
 msgstr "HTML éä"
 
-#: ../mail/mail-config.ui.h:93 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "æç"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:96
 msgid "Sender Photograph"
 msgstr "åäèçç"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:97
 msgid "_Show the photograph of sender in the message preview"
 msgstr "åéäéèéçåäèçç(_S)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:98
 msgid "S_earch for sender photograph only in local address books"
 msgstr "åæåæåçéèéäçåäèçç(_E)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:99
 msgid "Displayed Message Headers"
 msgstr "éççéäæé"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:100
 msgid "Mail Headers Table"
 msgstr "éäæéè"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:101
 #: ../modules/addressbook/autocompletion-config.c:90
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "ææ/æåæå"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:103
 msgid "Check incoming _messages for junk"
 msgstr "ææåééäæåçååéä(_M)"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:104
 msgid "Delete junk messages on e_xit"
 msgstr "ééæåéååéä(_X)"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:105
 msgid "Check cu_stom headers for junk"
 msgstr "äèèæéææååéä(_S)"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:106
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "èåäèåæçéèéäåäèåéäæèçååéä(_K)"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:107
 msgid "_Lookup in local address book only"
 msgstr "ååæåéèéæè(_L)"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:108
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "åææåçåçèèååéäæééåééåæèåçã"
 
-#: ../mail/mail-config.ui.h:108 ../modules/addressbook/ldap-config.ui.h:3
+#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:3
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:237
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:161
 msgid "No encryption"
 msgstr "ææåå"
 
-#: ../mail/mail-config.ui.h:109 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
 msgid "TLS encryption"
 msgstr "TLS åå"
 
-#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
 msgid "SSL encryption"
 msgstr "SSL åå"
 
@@ -13118,7 +12873,7 @@ msgid ""
 msgstr "èæäçéææèæåäææåéçéäï"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "_Empty Trash"
 msgstr "æçåæç(_E)"
 
@@ -13639,23 +13394,23 @@ msgstr "çæéè {0} äçæäã"
 msgid "Canceling..."
 msgstr "æååæâ"
 
-#: ../mail/mail-send-recv.c:537
+#: ../mail/mail-send-recv.c:547
 msgid "Send & Receive Mail"
 msgstr "åéèææéä"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:563
 msgid "Cancel _All"
 msgstr "åéåæ(_A)"
 
-#: ../mail/mail-send-recv.c:646 ../mail/mail-send-recv.c:1030
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
 msgid "Updating..."
 msgstr "ææäâ"
 
-#: ../mail/mail-send-recv.c:646 ../mail/mail-send-recv.c:727
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:737
 msgid "Waiting..."
 msgstr "æåçåâ"
 
-#: ../mail/mail-send-recv.c:1010
+#: ../mail/mail-send-recv.c:1020
 #, c-format
 msgid "Checking for new mail"
 msgstr "æææéä"
@@ -13672,91 +13427,91 @@ msgstr "çèæåèæå"
 msgid "New Search Folder"
 msgstr "æåæåèæå"
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:1262
 msgid "Unseen"
 msgstr "æéè"
 
-#: ../mail/message-list.c:1273
+#: ../mail/message-list.c:1263
 msgid "Seen"
 msgstr "åéè"
 
-#: ../mail/message-list.c:1274
+#: ../mail/message-list.c:1264
 msgid "Answered"
 msgstr "ååè"
 
-#: ../mail/message-list.c:1275
+#: ../mail/message-list.c:1265
 msgid "Forwarded"
 msgstr "èå"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:1266
 msgid "Multiple Unseen Messages"
 msgstr "ååæéèçéä"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:1267
 msgid "Multiple Messages"
 msgstr "ååéä"
 
-#: ../mail/message-list.c:1281
+#: ../mail/message-list.c:1271
 msgid "Lowest"
 msgstr "æä"
 
-#: ../mail/message-list.c:1282
+#: ../mail/message-list.c:1272
 msgid "Lower"
 msgstr "ä"
 
-#: ../mail/message-list.c:1286
+#: ../mail/message-list.c:1276
 msgid "Higher"
 msgstr "é"
 
-#: ../mail/message-list.c:1287
+#: ../mail/message-list.c:1277
 msgid "Highest"
 msgstr "æé"
 
-#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
+#: ../mail/message-list.c:1900 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../modules/itip-formatter/itip-view.c:249
+#: ../mail/message-list.c:1907 ../modules/itip-formatter/itip-view.c:249
 msgid "Today %l:%M %p"
 msgstr "äå %p %l:%M"
 
-#: ../mail/message-list.c:1925
+#: ../mail/message-list.c:1916
 msgid "Yesterday %l:%M %p"
 msgstr "æå %p %l:%M"
 
-#: ../mail/message-list.c:1937
+#: ../mail/message-list.c:1928
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../mail/message-list.c:1945
+#: ../mail/message-list.c:1936
 msgid "%b %d %l:%M %p"
 msgstr "%mæ%dæ %p %l:%M"
 
-#: ../mail/message-list.c:1947
+#: ../mail/message-list.c:1938
 msgid "%b %d %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../mail/message-list.c:2777
+#: ../mail/message-list.c:2769
 msgid "Select all visible messages"
 msgstr "éæåéåèçéä"
 
-#: ../mail/message-list.c:2913 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2907 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "éä"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4140
+#: ../mail/message-list.c:4132
 msgid "Follow-up"
 msgstr "èé"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4699 ../mail/message-list.c:5119
+#: ../mail/message-list.c:4634 ../mail/message-list.c:5038
 msgid "Generating message list"
 msgstr "ççéäæå"
 
-#: ../mail/message-list.c:4933
+#: ../mail/message-list.c:4868
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -13766,7 +13521,7 @@ msgstr ""
 "ææéäæèæçæåæäãèåäåäæåéåéæéçéäéæåæåèæçæ"
 "åïåå æå->æé éåéçæéåææèäéçæèã"
 
-#: ../mail/message-list.c:4938
+#: ../mail/message-list.c:4873
 msgid "There are no messages in this folder."
 msgstr "éåèæåäææéäã"
 
@@ -13803,33 +13558,33 @@ msgid "Subject or Addresses contains"
 msgstr "äææéåéääååå"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Recipients contain"
 msgstr "æäèåå"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Message contains"
 msgstr "éäåå"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Subject contains"
 msgstr "äæåå"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Sender contains"
 msgstr "åäèåå"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Body contains"
 msgstr "åæåå"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:96
-#: ../modules/mail/em-mailer-prefs.c:1069
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "_Table column:"
 msgstr "èææ(_T):"
 
@@ -13971,7 +13726,7 @@ msgstr "éçåéåéèéäææéçäçåå"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1448
 #: ../modules/calendar/e-memo-shell-view-actions.c:665
 #: ../modules/calendar/e-task-shell-view-actions.c:789
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "_Rename..."
 msgstr "éæåå(_R)â"
 
@@ -14052,7 +13807,7 @@ msgstr "åä(_A)"
 #: ../modules/addressbook/e-book-shell-view-actions.c:939
 #: ../modules/calendar/e-memo-shell-view-actions.c:702
 #: ../modules/calendar/e-task-shell-view-actions.c:854
-#: ../modules/mail/e-mail-shell-view-actions.c:1473
+#: ../modules/mail/e-mail-shell-view-actions.c:1475
 msgid "_Preview"
 msgstr "éè(_P)"
 
@@ -14064,7 +13819,7 @@ msgid "_Delete"
 msgstr "åé(_D)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:952
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "_Properties"
 msgstr "åæ(_P)"
 
@@ -14091,7 +13846,7 @@ msgstr "åéçäéèèçéçåå"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1017
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
 #: ../modules/calendar/e-task-shell-view-actions.c:936
-#: ../modules/mail/e-mail-shell-view-actions.c:1599
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "_Classic View"
 msgstr "åçæè(_C)"
 
@@ -14102,7 +13857,7 @@ msgstr "åéçäæåäæéçéçäéè"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1024
 #: ../modules/calendar/e-memo-shell-view-actions.c:779
 #: ../modules/calendar/e-task-shell-view-actions.c:943
-#: ../modules/mail/e-mail-shell-view-actions.c:1606
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "_Vertical View"
 msgstr "åçæè(_V)"
 
@@ -14128,7 +13883,7 @@ msgstr "ææççèæ"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1791
 #: ../modules/calendar/e-memo-shell-view-actions.c:806
 #: ../modules/calendar/e-task-shell-view-actions.c:1005
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "ééæå"
@@ -14354,104 +14109,104 @@ msgstr "éå Evolution èæ(_E)..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "åææåéå Evolution çèæèèåå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:81
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "Back up Evolution directory"
 msgstr "åä Evolution èæå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:85
 msgid "Restore Evolution directory"
 msgstr "éå Evolution çé"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:87
 msgid "Check Evolution Back up"
 msgstr "ææ Evolution åä"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:89
 msgid "Restart Evolution"
 msgstr "éæåå Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:91
 msgid "With Graphical User Interface"
 msgstr "äçååäçèäé"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:312
-#: ../modules/backup-restore/evolution-backup-tool.c:441
+#: ../modules/backup-restore/evolution-backup-tool.c:315
+#: ../modules/backup-restore/evolution-backup-tool.c:469
 msgid "Shutting down Evolution"
 msgstr "æåéé Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:324
 msgid "Backing Evolution accounts and settings"
 msgstr "åä Evolution çåèèèåå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:338
+#: ../modules/backup-restore/evolution-backup-tool.c:341
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "æååä Evolution èæ (éäãéçäãèäæãåäãååé)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:354
+#: ../modules/backup-restore/evolution-backup-tool.c:357
 msgid "Back up complete"
 msgstr "åäåæ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:361
-#: ../modules/backup-restore/evolution-backup-tool.c:608
+#: ../modules/backup-restore/evolution-backup-tool.c:364
+#: ../modules/backup-restore/evolution-backup-tool.c:654
 msgid "Restarting Evolution"
 msgstr "éæåå Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:447
+#: ../modules/backup-restore/evolution-backup-tool.c:475
 msgid "Back up current Evolution data"
 msgstr "åäçåç Evolution èæ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:455
+#: ../modules/backup-restore/evolution-backup-tool.c:483
 msgid "Extracting files from back up"
 msgstr "ååäèéææ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:524
+#: ../modules/backup-restore/evolution-backup-tool.c:570
 msgid "Loading Evolution settings"
 msgstr "æåèå Evolution çèåå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:578
+#: ../modules/backup-restore/evolution-backup-tool.c:624
 msgid "Removing temporary back up files"
 msgstr "çéæåçåäææ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:590
+#: ../modules/backup-restore/evolution-backup-tool.c:636
 msgid "Reloading registry service"
 msgstr "éæèåèåèæå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:815
+#: ../modules/backup-restore/evolution-backup-tool.c:861
 msgid "Evolution Back Up"
 msgstr "Evolution åä"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:816
+#: ../modules/backup-restore/evolution-backup-tool.c:862
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æåäèèæå %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:820
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Restore"
 msgstr "Evolution éå"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:821
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "åèæåéå %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:889
+#: ../modules/backup-restore/evolution-backup-tool.c:935
 msgid "Backing up Evolution Data"
 msgstr "åä Evolution èæ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:890
+#: ../modules/backup-restore/evolution-backup-tool.c:936
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å Evolution åäæçèææèçåã"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:892
+#: ../modules/backup-restore/evolution-backup-tool.c:938
 msgid "Restoring Evolution Data"
 msgstr "éå Evolution èæ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:893
+#: ../modules/backup-restore/evolution-backup-tool.c:939
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å Evolution éåæçèææèçåã"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:911
+#: ../modules/backup-restore/evolution-backup-tool.c:957
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "éååäæèçæéåæææçåèäèæçååã"
 
@@ -14655,28 +14410,28 @@ msgstr "çå:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "éå IfMatch (éäç Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:400
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:417
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP éèï %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:430
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
 msgid "Could not parse response"
 msgstr "çæèæåæ"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:439
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:456
 msgid "Empty response"
 msgstr "çççåæ"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:464
 msgid "Unexpected reply from server"
 msgstr "äèäæåæéæçåæ"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1034
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1051
 msgid "Could not locate user's calendars"
 msgstr "çæåääçèèäæ"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1258
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1275
 msgid "Path"
 msgstr "èå"
 
@@ -14779,15 +14534,15 @@ msgstr "ååèèäæ(_M)"
 msgid "I_mport to Tasks"
 msgstr "ååèåä(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.c:406
+#: ../modules/calendar/e-calendar-preferences.c:407
 msgid "Selected Calendars for Alarms"
 msgstr "éåçééèäæ"
 
-#: ../modules/calendar/e-calendar-preferences.c:828
+#: ../modules/calendar/e-calendar-preferences.c:829
 msgid "Ti_me and date:"
 msgstr "æååææ(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:829
+#: ../modules/calendar/e-calendar-preferences.c:830
 msgid "_Date only:"
 msgstr "åæææ(_D):"
 
@@ -15414,27 +15169,27 @@ msgstr "éåçé(_W)"
 msgid "Print the selected memo"
 msgstr "ååéåçååé"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1457
+#: ../modules/calendar/e-cal-shell-view-private.c:1477
 msgid "Searching next matching event"
 msgstr "æåääåçåçää"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1458
+#: ../modules/calendar/e-cal-shell-view-private.c:1478
 msgid "Searching previous matching event"
 msgstr "æååäåçåçää"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1476
+#: ../modules/calendar/e-cal-shell-view-private.c:1499
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "åä %d åäæäåçåçää"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1479
+#: ../modules/calendar/e-cal-shell-view-private.c:1503
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "åå %d åäæäåçåçää"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1500
+#: ../modules/calendar/e-cal-shell-view-private.c:1528
 msgid "Cannot search with no active calendar"
 msgstr "äèæåæäççèäæ"
 
@@ -15616,14 +15371,14 @@ msgstr "åéååé"
 msgid "Delete Memo"
 msgstr "åéååé"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:427
+#: ../modules/calendar/e-memo-shell-view-private.c:428
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d éååé"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:431
-#: ../modules/calendar/e-task-shell-view-private.c:612
+#: ../modules/calendar/e-memo-shell-view-private.c:432
+#: ../modules/calendar/e-task-shell-view-private.c:613
 #, c-format
 msgid "%d selected"
 msgstr "åéæ %d å"
@@ -15795,11 +15550,11 @@ msgstr "åéåä"
 msgid "Delete Task"
 msgstr "åéåä"
 
-#: ../modules/calendar/e-task-shell-view-private.c:501
+#: ../modules/calendar/e-task-shell-view-private.c:502
 msgid "Expunging"
 msgstr "éåä"
 
-#: ../modules/calendar/e-task-shell-view-private.c:608
+#: ../modules/calendar/e-task-shell-view-private.c:609
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15844,11 +15599,11 @@ msgid ""
 "headers selected above."
 msgstr "æååäåéåçæééååççäåååçéåæéã"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:135
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:137
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:141
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:143
 msgid "Display part as an invitation"
 msgstr "åéåéççéè"
 
@@ -16220,7 +15975,7 @@ msgid "Start day:"
 msgstr "éåæï"
 
 #: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1447
+#: ../modules/itip-formatter/itip-view.c:1461
 msgid "Start time:"
 msgstr "éåæé:"
 
@@ -16229,290 +15984,290 @@ msgid "End day:"
 msgstr "çææï"
 
 #: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1448
+#: ../modules/itip-formatter/itip-view.c:1462
 msgid "End time:"
 msgstr "çææé:"
 
-#: ../modules/itip-formatter/itip-view.c:1008
+#: ../modules/itip-formatter/itip-view.c:1010
 msgid "_Open Calendar"
 msgstr "éåèäæ(_O)"
 
-#: ../modules/itip-formatter/itip-view.c:1011
+#: ../modules/itip-formatter/itip-view.c:1013
 msgid "_Decline all"
 msgstr "åéæç(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1014
+#: ../modules/itip-formatter/itip-view.c:1016
 msgid "_Decline"
 msgstr "æç(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1017
+#: ../modules/itip-formatter/itip-view.c:1019
 msgid "_Tentative all"
 msgstr "åéæè(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1020
+#: ../modules/itip-formatter/itip-view.c:1022
 msgid "_Tentative"
 msgstr "æè(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1023
+#: ../modules/itip-formatter/itip-view.c:1025
 msgid "A_ccept all"
 msgstr "åéæå(_C)"
 
-#: ../modules/itip-formatter/itip-view.c:1026
+#: ../modules/itip-formatter/itip-view.c:1028
 msgid "A_ccept"
 msgstr "æå(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1029
+#: ../modules/itip-formatter/itip-view.c:1031
 msgid "_Send Information"
 msgstr "åéèè(_S)"
 
-#: ../modules/itip-formatter/itip-view.c:1032
+#: ../modules/itip-formatter/itip-view.c:1034
 msgid "_Update Attendee Status"
 msgstr "ææååçæ(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1035
+#: ../modules/itip-formatter/itip-view.c:1037
 msgid "_Update"
 msgstr "ææ(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1450
-#: ../modules/itip-formatter/itip-view.c:1492
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1464
+#: ../modules/itip-formatter/itip-view.c:1512
+#: ../modules/itip-formatter/itip-view.c:1581
 msgid "Comment:"
 msgstr "èè:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1481
+#: ../modules/itip-formatter/itip-view.c:1500
 msgid "Send reply to sender"
 msgstr "åèåäè"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1495
+#: ../modules/itip-formatter/itip-view.c:1515
 msgid "Send _updates to attendees"
 msgstr "åéææçåæè(_U)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1498
+#: ../modules/itip-formatter/itip-view.c:1518
 msgid "_Apply to all instances"
 msgstr "åçèææåé(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1499
+#: ../modules/itip-formatter/itip-view.c:1519
 msgid "Show time as _free"
 msgstr "éçæéççé(_F)"
 
-#: ../modules/itip-formatter/itip-view.c:1500
+#: ../modules/itip-formatter/itip-view.c:1520
 msgid "_Preserve my reminder"
 msgstr "äçæçæé(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1501
+#: ../modules/itip-formatter/itip-view.c:1521
 msgid "_Inherit reminder"
 msgstr "çææé(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1822
+#: ../modules/itip-formatter/itip-view.c:1845
 msgid "_Tasks:"
 msgstr "åä(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1825
+#: ../modules/itip-formatter/itip-view.c:1848
 msgid "_Memos:"
 msgstr "ååé(_M):"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../modules/itip-formatter/itip-view.c:3469
+#: ../modules/itip-formatter/itip-view.c:3493
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "çæèåèäæã%sã(%s)"
 
-#: ../modules/itip-formatter/itip-view.c:3626
+#: ../modules/itip-formatter/itip-view.c:3652
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "èäæ '%s' äççæåéåæèçèç"
 
-#: ../modules/itip-formatter/itip-view.c:3650
+#: ../modules/itip-formatter/itip-view.c:3679
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "åæåèäæã%sãäççæ"
 
-#: ../modules/itip-formatter/itip-view.c:3745
+#: ../modules/itip-formatter/itip-view.c:3774
 msgid "Unable to find any calendars"
 msgstr "æäåääèäæ"
 
-#: ../modules/itip-formatter/itip-view.c:3753
+#: ../modules/itip-formatter/itip-view.c:3782
 msgid "Unable to find this meeting in any calendar"
 msgstr "çæåääèäæäæåéåçæ"
 
-#: ../modules/itip-formatter/itip-view.c:3758
+#: ../modules/itip-formatter/itip-view.c:3787
 msgid "Unable to find this task in any task list"
 msgstr "çæåääåäæåäæåééåä"
 
-#: ../modules/itip-formatter/itip-view.c:3763
+#: ../modules/itip-formatter/itip-view.c:3792
 msgid "Unable to find this memo in any memo list"
 msgstr "çæåääååéæåäæåééååé"
 
-#: ../modules/itip-formatter/itip-view.c:4103
+#: ../modules/itip-formatter/itip-view.c:4132
 msgid "Opening the calendar. Please wait..."
 msgstr "æåéåèäæãèçåâ"
 
-#: ../modules/itip-formatter/itip-view.c:4108
+#: ../modules/itip-formatter/itip-view.c:4137
 msgid "Searching for an existing version of this appointment"
 msgstr "åæéåçææåççæ"
 
-#: ../modules/itip-formatter/itip-view.c:4490
+#: ../modules/itip-formatter/itip-view.c:4523
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "çæåééçèèäæã%sãã%s"
 
-#: ../modules/itip-formatter/itip-view.c:4505
+#: ../modules/itip-formatter/itip-view.c:4538
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "åéèèäæ '%s' äèçåæå"
 
-#: ../modules/itip-formatter/itip-view.c:4510
+#: ../modules/itip-formatter/itip-view.c:4543
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "åéèèäæ '%s' äèçäçåç"
 
-#: ../modules/itip-formatter/itip-view.c:4516
+#: ../modules/itip-formatter/itip-view.c:4549
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "åéèèäæ '%s' äèçååæ"
 
-#: ../modules/itip-formatter/itip-view.c:4522
+#: ../modules/itip-formatter/itip-view.c:4555
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "åéèèäæã%sãäèçååæ"
 
-#: ../modules/itip-formatter/itip-view.c:4592
-#: ../modules/itip-formatter/itip-view.c:5026
-#: ../modules/itip-formatter/itip-view.c:5133
+#: ../modules/itip-formatter/itip-view.c:4576
+#: ../modules/itip-formatter/itip-view.c:5016
+#: ../modules/itip-formatter/itip-view.c:5123
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "æååèæåååèäæãèçåâ"
 
-#: ../modules/itip-formatter/itip-view.c:4631
+#: ../modules/itip-formatter/itip-view.c:4617
 msgid "Unable to parse item"
 msgstr "çæåæéç"
 
-#: ../modules/itip-formatter/itip-view.c:4820
+#: ../modules/itip-formatter/itip-view.c:4807
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æèåéäåçéäçä %s"
 
-#: ../modules/itip-formatter/itip-view.c:4835
+#: ../modules/itip-formatter/itip-view.c:4822
 msgid "Sent a cancelation notice to the delegate"
 msgstr "åéåæéççäçä"
 
-#: ../modules/itip-formatter/itip-view.c:4839
+#: ../modules/itip-formatter/itip-view.c:4826
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "çæåéåæéççäçä"
 
-#: ../modules/itip-formatter/itip-view.c:4888
+#: ../modules/itip-formatter/itip-view.c:4874
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "çæææåæèã%s"
 
-#: ../modules/itip-formatter/itip-view.c:4895
+#: ../modules/itip-formatter/itip-view.c:4882
 msgid "Attendee status updated"
 msgstr "åæèçæåææ"
 
-#: ../modules/itip-formatter/itip-view.c:4918
+#: ../modules/itip-formatter/itip-view.c:4905
 msgid "The meeting is invalid and cannot be updated"
 msgstr "éåæèçæäääèææ"
 
-#: ../modules/itip-formatter/itip-view.c:4991
+#: ../modules/itip-formatter/itip-view.c:4981
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "çæäåæççæäååæèçæçæææï"
 
-#: ../modules/itip-formatter/itip-view.c:5063
-#: ../modules/itip-formatter/itip-view.c:5103
+#: ../modules/itip-formatter/itip-view.c:5053
+#: ../modules/itip-formatter/itip-view.c:5093
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "åæèçæäèææïåçéçåçäåå"
 
-#: ../modules/itip-formatter/itip-view.c:5166
+#: ../modules/itip-formatter/itip-view.c:5156
 msgid "Meeting information sent"
 msgstr "æèèèåå"
 
-#: ../modules/itip-formatter/itip-view.c:5171
+#: ../modules/itip-formatter/itip-view.c:5161
 msgid "Task information sent"
 msgstr "åäèèåå"
 
-#: ../modules/itip-formatter/itip-view.c:5176
+#: ../modules/itip-formatter/itip-view.c:5166
 msgid "Memo information sent"
 msgstr "ååéèèåå"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:5177
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "çæååæèèèïèæèääåå"
 
-#: ../modules/itip-formatter/itip-view.c:5192
+#: ../modules/itip-formatter/itip-view.c:5182
 msgid "Unable to send task information, the task does not exist"
 msgstr "çæåååäèèïèéåääåå"
 
-#: ../modules/itip-formatter/itip-view.c:5197
+#: ../modules/itip-formatter/itip-view.c:5187
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "çæååååéèèïèååéääåå"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5262
+#: ../modules/itip-formatter/itip-view.c:5252
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5267
+#: ../modules/itip-formatter/itip-view.c:5257
 msgid "Save Calendar"
 msgstr "ååèäæ"
 
-#: ../modules/itip-formatter/itip-view.c:5319
-#: ../modules/itip-formatter/itip-view.c:5331
+#: ../modules/itip-formatter/itip-view.c:5310
+#: ../modules/itip-formatter/itip-view.c:5323
 msgid "The calendar attached is not valid"
 msgstr "éåçèäææçæç"
 
-#: ../modules/itip-formatter/itip-view.c:5320
-#: ../modules/itip-formatter/itip-view.c:5332
+#: ../modules/itip-formatter/itip-view.c:5311
+#: ../modules/itip-formatter/itip-view.c:5324
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "æéäååååæèäæååïäåèäæäéææç iCalendarã"
 
-#: ../modules/itip-formatter/itip-view.c:5373
-#: ../modules/itip-formatter/itip-view.c:5402
-#: ../modules/itip-formatter/itip-view.c:5500
+#: ../modules/itip-formatter/itip-view.c:5366
+#: ../modules/itip-formatter/itip-view.c:5396
+#: ../modules/itip-formatter/itip-view.c:5496
 msgid "The item in the calendar is not valid"
 msgstr "èäæäçéçæçæç"
 
-#: ../modules/itip-formatter/itip-view.c:5374
-#: ../modules/itip-formatter/itip-view.c:5403
-#: ../modules/itip-formatter/itip-view.c:5501
+#: ../modules/itip-formatter/itip-view.c:5367
+#: ../modules/itip-formatter/itip-view.c:5397
+#: ../modules/itip-formatter/itip-view.c:5497
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 "æéäçååæèäæååïäèååäæååääääãåäæçé/åçèè"
 
-#: ../modules/itip-formatter/itip-view.c:5417
+#: ../modules/itip-formatter/itip-view.c:5412
 msgid "The calendar attached contains multiple items"
 msgstr "éåçèäæåååæååéç"
 
-#: ../modules/itip-formatter/itip-view.c:5418
+#: ../modules/itip-formatter/itip-view.c:5413
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "èèçéäåéçéçïæèåæææååååååäçèäæ"
 
-#: ../modules/itip-formatter/itip-view.c:5944
+#: ../modules/itip-formatter/itip-view.c:5937
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ææ"
 
-#: ../modules/itip-formatter/itip-view.c:5960
+#: ../modules/itip-formatter/itip-view.c:5953
 msgid "Tentatively Accepted"
 msgstr "æææå"
 
-#: ../modules/itip-formatter/itip-view.c:6103
+#: ../modules/itip-formatter/itip-view.c:6096
 msgid "This meeting recurs"
 msgstr "éåæèçéæèåç"
 
-#: ../modules/itip-formatter/itip-view.c:6106
+#: ../modules/itip-formatter/itip-view.c:6099
 msgid "This task recurs"
 msgstr "ééåäçéæèåç"
 
-#: ../modules/itip-formatter/itip-view.c:6109
+#: ../modules/itip-formatter/itip-view.c:6102
 msgid "This memo recurs"
 msgstr "éåååéçéæèåç"
 
@@ -16662,352 +16417,352 @@ msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d åéåçéä"
 
-#: ../modules/mail/e-mail-shell-backend.c:248
+#: ../modules/mail/e-mail-shell-backend.c:244
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "éäèæ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
+#: ../modules/mail/e-mail-shell-backend.c:246
 msgid "Compose a new mail message"
 msgstr "çèæçéäèæ"
 
-#: ../modules/mail/e-mail-shell-backend.c:258
+#: ../modules/mail/e-mail-shell-backend.c:254
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "éäåè(_U)"
 
-#: ../modules/mail/e-mail-shell-backend.c:260
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgid "Create a new mail account"
 msgstr "åçæéäåè"
 
-#: ../modules/mail/e-mail-shell-backend.c:265
+#: ../modules/mail/e-mail-shell-backend.c:261
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "éäèæå(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:267
+#: ../modules/mail/e-mail-shell-backend.c:263
 msgid "Create a new mail folder"
 msgstr "åçæéäèæå"
 
-#: ../modules/mail/e-mail-shell-backend.c:563
+#: ../modules/mail/e-mail-shell-backend.c:561
 msgid "Mail Accounts"
 msgstr "éäåè"
 
-#: ../modules/mail/e-mail-shell-backend.c:572
+#: ../modules/mail/e-mail-shell-backend.c:570
 msgid "Mail Preferences"
 msgstr "éäååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:581
+#: ../modules/mail/e-mail-shell-backend.c:579
 msgid "Composer Preferences"
 msgstr "éäçèåååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:590
+#: ../modules/mail/e-mail-shell-backend.c:588
 msgid "Network Preferences"
 msgstr "çèååèå"
 
 #. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:900
+#: ../modules/mail/e-mail-shell-backend.c:890
 msgctxt "label"
 msgid "None"
 msgstr "ææ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
-#: ../modules/mail/e-mail-shell-view.c:972
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view.c:975
 msgid "_Disable Account"
 msgstr "åçåè(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
 msgid "Disable this account"
 msgstr "åçéååè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æäçéåææèæååçååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
 msgid "Edit properties of this account"
 msgstr "çèéååèçåæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "_Download Messages for Offline Usage"
 msgstr "äèéçäççéä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "äèæèçéçäççåèèèæåäéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Fl_ush Outbox"
 msgstr "æçåäå(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "_Copy Folder To..."
 msgstr "èèèæåå(_C)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "Copy the selected folder into another folder"
 msgstr "èèåéåçèæåååäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Permanently remove this folder"
 msgstr "æäçééåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "E_xpunge"
 msgstr "åé(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æäçéåéåèæååååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Mar_k All Messages as Read"
 msgstr "æçææéäçåéè(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1284
 msgid "Mark all messages in the folder as read"
 msgstr "åèæåäåéçéäæçæåéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "_Move Folder To..."
 msgstr "çåèæåå(_M)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
 msgid "Move the selected folder into another folder"
 msgstr "åéåçèæåçèåäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "_New..."
 msgstr "æå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
 msgid "Create a new folder for storing mail"
 msgstr "åçäåæèæåäååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
 msgid "Change the properties of this folder"
 msgstr "èæéåèæåçåæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
 msgid "Refresh the folder"
 msgstr "éæèåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1319
 msgid "Change the name of this folder"
 msgstr "èæéåèæåçåç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "Select Message _Thread"
 msgstr "éæéäæé(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1326
 msgid "Select all messages in the same thread as the selected message"
 msgstr "éæææçéçéäçéåçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 msgid "Select Message S_ubthread"
 msgstr "éæéäåçç(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1333
 msgid "Select all replies to the currently selected message"
 msgstr "éæææåèéåéäçä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Empty _Trash"
 msgstr "æçåæç(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æäçéåææåèååéååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "_New Label"
 msgstr "æåæç(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/mail/e-mail-shell-view-actions.c:1361
 msgid "N_one"
 msgstr "ææ(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1373
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
 msgid "_Manage Subscriptions"
 msgstr "ççèé(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1375
-#: ../modules/mail/e-mail-shell-view-actions.c:1452
+#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1454
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "èéæåæèéåéçäæåçèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1403
 msgid "Send / _Receive"
 msgstr "åé/ææ(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1384
 msgid "Send queued items and retrieve new items"
 msgstr "åéåéçéçäæææçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
 msgid "R_eceive All"
 msgstr "åéææ(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
 msgid "Receive new items from all accounts"
 msgstr "ææåææåèåçæéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1396
 msgid "_Send All"
 msgstr "åéåé(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1396
+#: ../modules/mail/e-mail-shell-view-actions.c:1398
 msgid "Send queued items in all accounts"
 msgstr "åéåææåèååéçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1424
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1424
+#: ../modules/mail/e-mail-shell-view-actions.c:1426
 msgid "Cancel the current mail operation"
 msgstr "åæçåéäæäçèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1429
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
 msgid "Collapse All _Threads"
 msgstr "ææææçééä(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1431
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
 msgid "Collapse all message threads"
 msgstr "ææææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1436
+#: ../modules/mail/e-mail-shell-view-actions.c:1438
 msgid "E_xpand All Threads"
 msgstr "åéææçééä(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1438
+#: ../modules/mail/e-mail-shell-view-actions.c:1440
 msgid "Expand all message threads"
 msgstr "åéææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "_Message Filters"
 msgstr "éäèå(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1447
 msgid "Create or edit rules for filtering new mail"
 msgstr "çæéäåçæçèéæèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1450
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
 msgid "_Subscriptions..."
 msgstr "èé(_S)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-shell-view-actions.c:1461
 msgid "F_older"
 msgstr "èæå(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1466
+#: ../modules/mail/e-mail-shell-view-actions.c:1468
 msgid "_Label"
 msgstr "æç(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1485
 msgid "C_reate Search Folder From Search..."
 msgstr "åæååçæåèæå(_R)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1490
+#: ../modules/mail/e-mail-shell-view-actions.c:1492
 msgid "Search F_olders"
 msgstr "æåèæå(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1492
+#: ../modules/mail/e-mail-shell-view-actions.c:1494
 msgid "Create or edit search folder definitions"
 msgstr "åçæçèæåèæåçåç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "_New Folder..."
 msgstr "æåèæå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show Message _Preview"
 msgstr "éçéäéè(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1559
 msgid "Show message preview pane"
 msgstr "éçéäéèçæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "Show _Deleted Messages"
 msgstr "éçååééä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 msgid "Show deleted messages with a line through them"
 msgstr "éçååéçéä (åäåéç)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1571
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Group By Threads"
 msgstr "äçééäççç(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Threaded message list"
 msgstr "çééäæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "_Unmatched Folder Enabled"
 msgstr "æçåèæåååç(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "åææååçæçåæåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
 msgid "Show message preview below the message list"
 msgstr "åéäæåäæéçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "Show message preview alongside the message list"
 msgstr "åéäæåæééçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1618
 msgid "All Messages"
 msgstr "ææéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1625
 msgid "Important Messages"
 msgstr "éèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1630
+#: ../modules/mail/e-mail-shell-view-actions.c:1632
 msgid "Last 5 Days' Messages"
 msgstr "æè 5 åçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "Messages Not Junk"
 msgstr "éååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1644
+#: ../modules/mail/e-mail-shell-view-actions.c:1646
 msgid "Messages with Attachments"
 msgstr "æéäçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1651
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "No Label"
 msgstr "çæç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1658
+#: ../modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Read Messages"
 msgstr "åèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Unread Messages"
 msgstr "æèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Subject or Addresses contain"
 msgstr "äææéåéääååå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1727
+#: ../modules/mail/e-mail-shell-view-actions.c:1729
 msgid "All Accounts"
 msgstr "ææçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1734
+#: ../modules/mail/e-mail-shell-view-actions.c:1736
 msgid "Current Account"
 msgstr "çåçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1741
+#: ../modules/mail/e-mail-shell-view-actions.c:1743
 msgid "Current Folder"
 msgstr "çåçèæå"
 
@@ -17015,68 +16770,68 @@ msgstr "çåçèæå"
 msgid "All Account Search"
 msgstr "ææçåèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:709
+#: ../modules/mail/e-mail-shell-view.c:710
 msgid "Account Search"
 msgstr "åèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:970
+#: ../modules/mail/e-mail-shell-view.c:973
 msgid "Proxy _Logout"
 msgstr "çåäçäæå(_L)"
 
-#: ../modules/mail/e-mail-shell-view-private.c:961
+#: ../modules/mail/e-mail-shell-view-private.c:962
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "åéæ %d åï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:973
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
-#: ../modules/mail/e-mail-shell-view-private.c:985
+#: ../modules/mail/e-mail-shell-view-private.c:979
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ååå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:991
+#: ../modules/mail/e-mail-shell-view-private.c:992
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d åèç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d åæåé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1003
+#: ../modules/mail/e-mail-shell-view-private.c:1004
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1015
+#: ../modules/mail/e-mail-shell-view-private.c:1016
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d åæèï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1018
+#: ../modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å %d å"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1042
 msgid "Trash"
 msgstr "åæç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1454
+#: ../modules/mail/e-mail-shell-view-private.c:1458
 msgid "Send / Receive"
 msgstr "åé/ææ"
 
@@ -17100,20 +16855,20 @@ msgstr "æéäæ"
 msgid "Once per month"
 msgstr "ææäæ"
 
-#: ../modules/mail/em-mailer-prefs.c:286
+#: ../modules/mail/em-mailer-prefs.c:318
 msgid "Header"
 msgstr "éé"
 
-#: ../modules/mail/em-mailer-prefs.c:290
+#: ../modules/mail/em-mailer-prefs.c:322
 msgid "Contains Value"
 msgstr "ååæå"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1071
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "_Date header:"
 msgstr "æææé(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1072
+#: ../modules/mail/em-mailer-prefs.c:1146
 msgid "Show _original header value"
 msgstr "éçååæéæå(_O)"
 
@@ -17123,24 +16878,24 @@ msgstr "æåèå Evolution èçæçéèéåéäåæçï"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:318
+#: ../modules/mdn/evolution-mdn.c:323
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "æåç %s äæã%sã (%s) çéäåèéèã"
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:385
+#: ../modules/mdn/evolution-mdn.c:390
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "ã%sãçéééç"
 
-#: ../modules/mdn/evolution-mdn.c:540
+#: ../modules/mdn/evolution-mdn.c:543
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "åééäåæçã%sã"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:545
+#: ../modules/mdn/evolution-mdn.c:548
 msgid "_Notify Sender"
 msgstr "éçåäè(_N)"
 
@@ -17216,50 +16971,50 @@ msgstr "åæçå(_P)"
 msgid "Enable and disable plugins"
 msgstr "åçèåçåæçå"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:134
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
 msgid "Display plain text version"
 msgstr "éççæåçæ"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:136
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
 msgid "Display plain text version of multipart/alternative message"
 msgstr "éçåéå/æäéäççæåçæ"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
 msgid "Display HTML version"
 msgstr "éç HTML çæ"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:144
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
 msgid "Display HTML version of multipart/alternative message"
 msgstr "éçåéå/æäéäç HTML çæ"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../modules/prefer-plain/plugin/config-ui.c:46
 msgid "Show HTML if present"
 msgstr "åæä HTML åéçä"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Let Evolution choose the best part to show."
 msgstr "è Evolution éææäçéåäéçã"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
 #: ../modules/prefer-plain/plugin/config-ui.c:50
 msgid "Show plain text if present"
 msgstr "åæäçæååéçå"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
 #: ../modules/prefer-plain/plugin/config-ui.c:51
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "åææçæåçéååéçåïååè Evolution éææäçéåäéçã"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:91
 #: ../modules/prefer-plain/plugin/config-ui.c:55
 msgid "Only ever show plain text"
 msgstr "åäçæåéç"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:92
 #: ../modules/prefer-plain/plugin/config-ui.c:56
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -17362,7 +17117,7 @@ msgstr ""
 "\n"
 "ääçéæè Evolution éçèæçéåéäåèïäåååäæççåååææã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:259
+#: ../modules/startup-wizard/evolution-startup-wizard.c:242
 msgid "Loading accounts..."
 msgstr "æåèååèâ"
 
@@ -17374,11 +17129,11 @@ msgstr "æååç(_F)â"
 msgid "_Other languages"
 msgstr "åäçèè(_O)"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:324
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:329
 msgid "Text Highlight"
 msgstr "æåçé"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:330
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:335
 msgid "Syntax highlighting of mail parts"
 msgstr "éäéåçèæçé"
 
@@ -17647,7 +17402,7 @@ msgid "_Do not show this message again."
 msgstr "äèåéçéåèæ(_D)"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:590
-#: ../plugins/templates/templates.c:470
+#: ../plugins/templates/templates.c:469
 msgid "Keywords"
 msgstr "ééå"
 
@@ -17800,7 +17555,7 @@ msgid "Key"
 msgstr "èåé"
 
 #: ../plugins/email-custom-header/email-custom-header.c:867
-#: ../plugins/templates/templates.c:478
+#: ../plugins/templates/templates.c:477
 msgid "Values"
 msgstr "æå"
 
@@ -18230,39 +17985,39 @@ msgid ""
 "source, please."
 msgstr "éåçäææåèçïåæäèåéèåçååéãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1187
+#: ../plugins/mail-to-task/mail-to-task.c:1186
 msgid "No writable calendar is available."
 msgstr "ææåååçèäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
+#: ../plugins/mail-to-task/mail-to-task.c:1270
 msgid "Create an _Appointment"
 msgstr "åçäåçæ(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1273
+#: ../plugins/mail-to-task/mail-to-task.c:1272
 msgid "Create a new event from the selected message"
 msgstr "äéåçéäåçæçää"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1278
+#: ../plugins/mail-to-task/mail-to-task.c:1277
 msgid "Create a Mem_o"
 msgstr "åçååé(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1280
+#: ../plugins/mail-to-task/mail-to-task.c:1279
 msgid "Create a new memo from the selected message"
 msgstr "äéåçéäåçæçååé"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1284
 msgid "Create a _Task"
 msgstr "åçåä(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1286
 msgid "Create a new task from the selected message"
 msgstr "äéåçéäåçæçåä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1295
+#: ../plugins/mail-to-task/mail-to-task.c:1294
 msgid "Create a _Meeting"
 msgstr "åçæè(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1297
+#: ../plugins/mail-to-task/mail-to-task.c:1296
 msgid "Create a new meeting from the selected message"
 msgstr "äéåçéäåçæçæè"
 
@@ -18637,15 +18392,15 @@ msgstr ""
 "åæèçççæåæçåãæåääççèææ $ORIG[subject], $ORIG[from], $ORIG"
 "[to] æ $ORIG[body]ïååæäææåèçéääçæååäã"
 
-#: ../plugins/templates/templates.c:1113
+#: ../plugins/templates/templates.c:1112
 msgid "No Title"
 msgstr "æææé"
 
-#: ../plugins/templates/templates.c:1225
+#: ../plugins/templates/templates.c:1221
 msgid "Save as _Template"
 msgstr "ååççæ(_T)"
 
-#: ../plugins/templates/templates.c:1227
+#: ../plugins/templates/templates.c:1223
 msgid "Save as Template"
 msgstr "ååççæ"
 
@@ -18979,7 +18734,7 @@ msgstr "éææèï%s"
 msgid "Execute these search parameters"
 msgstr "åèéäæååæ"
 
-#: ../shell/e-shell-window.c:494
+#: ../shell/e-shell-window.c:497
 msgid "New"
 msgstr "æå"
 
@@ -18990,7 +18745,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:186
+#: ../shell/main.c:184
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19025,7 +18780,7 @@ msgstr ""
 "æååææäååäææïèäæå\n"
 "çååæææäæèï\n"
 
-#: ../shell/main.c:210
+#: ../shell/main.c:208
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19033,13 +18788,13 @@ msgstr ""
 "èè\n"
 "Evolution åçæä\n"
 
-#: ../shell/main.c:217
+#: ../shell/main.c:214
 msgid "Do not tell me again"
 msgstr "äèåéçéåèæ"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:308
+#: ../shell/main.c:305
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19047,47 +18802,47 @@ msgstr ""
 "åå Evolution æäæåçåäéçãåççééæãmailãããcalendarãã"
 "ãcontactsãããtasksãåãmemosã"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:309
 msgid "Apply the given geometry to the main window"
 msgstr "åæåçåååçåäèç"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:313
 msgid "Start in online mode"
 msgstr "äçäæååå"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:315
 msgid "Ignore network availability"
 msgstr "åççéçèæååç"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:317
 msgid "Start in \"express\" mode"
 msgstr "äãåéãæååå"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:320
 msgid "Forcibly shut down Evolution"
 msgstr "ååéé Evoultion"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:323
 msgid "Disable loading of any plugins."
 msgstr "åçåääåæçåçèåã"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:325
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "åçéäãéçäååäçéèçæã"
 
-#: ../shell/main.c:332
+#: ../shell/main.c:329
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "åæåç URI æææåçååçæääçåæã"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:331
 msgid "Request a running Evolution process to quit"
 msgstr "èæåèäç Evolution çåçæ"
 
-#: ../shell/main.c:508 ../shell/main.c:516
+#: ../shell/main.c:504
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM èéäåæç"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:569
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19096,7 +18851,7 @@ msgstr ""
 "%sï --online å --offline äèäèäçã\n"
 "  äç '%s --help' ååéäæèèã\n"
 
-#: ../shell/main.c:587
+#: ../shell/main.c:575
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19933,7 +19688,7 @@ msgstr "æåæè"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1000
+#: ../widgets/misc/e-attachment.c:966
 msgid "Attached message"
 msgstr "éåçéä"
 
@@ -20336,7 +20091,7 @@ msgstr "éåææ"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æãåçãéååææååå Evolutionã"
 
-#: ../widgets/misc/e-mail-signature-combo-box.c:327
+#: ../widgets/misc/e-mail-signature-combo-box.c:378
 msgid "Autogenerated"
 msgstr "èåççç"
 
@@ -20602,6 +20357,10 @@ msgstr "çæèè(_T)"
 msgid "Type:"
 msgstr "éå:"
 
+#: ../widgets/misc/e-source-config.c:683 ../widgets/misc/e-source-config.c:687
+msgid "Name:"
+msgstr "åçï"
+
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
 #: ../widgets/misc/e-source-config.c:1285
@@ -20649,53 +20408,53 @@ msgstr "æååè"
 msgid "Click here to go to URL"
 msgstr "æéèäçè URL"
 
-#: ../widgets/misc/e-web-view.c:278 ../widgets/misc/e-web-view-gtkhtml.c:407
+#: ../widgets/misc/e-web-view.c:274 ../widgets/misc/e-web-view-gtkhtml.c:407
 msgid "_Copy Link Location"
 msgstr "èèéçäå(_C)"
 
-#: ../widgets/misc/e-web-view.c:280 ../widgets/misc/e-web-view-gtkhtml.c:409
+#: ../widgets/misc/e-web-view.c:276 ../widgets/misc/e-web-view-gtkhtml.c:409
 msgid "Copy the link to the clipboard"
 msgstr "èèéçååèè"
 
-#: ../widgets/misc/e-web-view.c:288 ../widgets/misc/e-web-view-gtkhtml.c:417
+#: ../widgets/misc/e-web-view.c:284 ../widgets/misc/e-web-view-gtkhtml.c:417
 msgid "_Open Link in Browser"
 msgstr "åçèååéåéç(_O)"
 
-#: ../widgets/misc/e-web-view.c:290 ../widgets/misc/e-web-view-gtkhtml.c:419
+#: ../widgets/misc/e-web-view.c:286 ../widgets/misc/e-web-view-gtkhtml.c:419
 msgid "Open the link in a web browser"
 msgstr "åçéçèåäéåæéç"
 
-#: ../widgets/misc/e-web-view.c:298 ../widgets/misc/e-web-view-gtkhtml.c:427
+#: ../widgets/misc/e-web-view.c:294 ../widgets/misc/e-web-view-gtkhtml.c:427
 msgid "_Copy Email Address"
 msgstr "èèéåéääå(_C)"
 
-#: ../widgets/misc/e-web-view.c:315 ../widgets/misc/e-web-view-gtkhtml.c:444
+#: ../widgets/misc/e-web-view.c:311 ../widgets/misc/e-web-view-gtkhtml.c:444
 msgid "_Copy Image"
 msgstr "èèåç(_C)"
 
-#: ../widgets/misc/e-web-view.c:317 ../widgets/misc/e-web-view-gtkhtml.c:446
+#: ../widgets/misc/e-web-view.c:313 ../widgets/misc/e-web-view-gtkhtml.c:446
 msgid "Copy the image to the clipboard"
 msgstr "èèåçååèè"
 
-#: ../widgets/misc/e-web-view.c:337 ../widgets/misc/e-web-view.c:1426
+#: ../widgets/misc/e-web-view.c:333 ../widgets/misc/e-web-view.c:1435
 #: ../widgets/misc/e-web-view-gtkhtml.c:466
 #: ../widgets/misc/e-web-view-gtkhtml.c:1311
 msgid "Select all text and images"
 msgstr "éææææåååç"
 
-#: ../widgets/misc/e-web-view.c:1090 ../widgets/misc/e-web-view.c:1092
-#: ../widgets/misc/e-web-view.c:1094 ../widgets/misc/e-web-view-gtkhtml.c:975
+#: ../widgets/misc/e-web-view.c:1099 ../widgets/misc/e-web-view.c:1101
+#: ../widgets/misc/e-web-view.c:1103 ../widgets/misc/e-web-view-gtkhtml.c:975
 #: ../widgets/misc/e-web-view-gtkhtml.c:977
 #: ../widgets/misc/e-web-view-gtkhtml.c:979
 #, c-format
 msgid "Click to call %s"
 msgstr "æääæèç %s"
 
-#: ../widgets/misc/e-web-view.c:1096 ../widgets/misc/e-web-view-gtkhtml.c:981
+#: ../widgets/misc/e-web-view.c:1105 ../widgets/misc/e-web-view-gtkhtml.c:981
 msgid "Click to hide/unhide addresses"
 msgstr "æéèéè/èééèäå"
 
-#: ../widgets/misc/e-web-view.c:1098 ../widgets/misc/e-web-view-gtkhtml.c:983
+#: ../widgets/misc/e-web-view.c:1107 ../widgets/misc/e-web-view-gtkhtml.c:983
 #, c-format
 msgid "Click to open %s"
 msgstr "æäääéå %s"
@@ -21003,6 +20762,191 @@ msgstr "åééå"
 msgid "Input Methods"
 msgstr "èåæ"
 
+#~ msgid "ID of the socket to embed in"
+#~ msgstr "socket ç IDïååæ"
+
+#~ msgid "socket"
+#~ msgstr "socket"
+
+#~ msgid "Please enter your full name."
+#~ msgstr "èèåæçååã"
+
+#~ msgid "Please enter your email address."
+#~ msgstr "èèåæçéåéääåã"
+
+#~ msgid "The email address you have entered is invalid."
+#~ msgstr "æèåçéåéääåæçæçã"
+
+#~ msgid "Please enter your password."
+#~ msgstr "èèåæçåçã"
+
+#~ msgid "CalDAV"
+#~ msgstr "CalDAV"
+
+#~ msgid "Google"
+#~ msgstr "Google"
+
+#~ msgid "Always (SSL)"
+#~ msgstr "æé (SSL)"
+
+#~ msgid "When possible (TLS)"
+#~ msgstr "åèçè (TLS)"
+
+#~ msgid "Personal details:"
+#~ msgstr "åäèçèæï"
+
+#~ msgid "Email address:"
+#~ msgstr "Email äåï"
+
+#~ msgid "Details:"
+#~ msgstr "èçèæï"
+
+#~ msgid "Server type:"
+#~ msgstr "äæåéåï"
+
+#~ msgid "Server address:"
+#~ msgstr "äæåäåï"
+
+#~ msgid "Use encryption:"
+#~ msgstr "äçååï"
+
+#~ msgid ""
+#~ "To use the email application you'll need to setup an account. Put your "
+#~ "email address and password in below and we'll try and work out all the "
+#~ "settings. If we can't do it automatically you'll need your server details "
+#~ "as well."
+#~ msgstr ""
+#~ "èäçéåéåéäçåæéèåèåäååèãèåäéæäæçéåéääåå"
+#~ "åçïæåæåèäæåææçèååãåææåçæèååæéåæéïæåéè"
+#~ "äçèååèçäæåèçèæã"
+
+#~ msgid ""
+#~ "Sorry, we can't work out the settings to get your mail automatically. "
+#~ "Please enter them below. We've tried to make a start with the details you "
+#~ "just entered but you may need to change them."
+#~ msgstr ""
+#~ "ææïæåçæèåæåæçéäèååãèåäéèåååãæåæäæååèå"
+#~ "çèçèæèèéåïäææäæåèéèæèååã"
+
+#~ msgid "You can specify more options to configure the account."
+#~ msgstr "æåäæåæåçäèåéååèçééã"
+
+#~ msgid ""
+#~ "Now we need your settings for sending mail. We've tried to make some "
+#~ "guesses but you should check them over to make sure."
+#~ msgstr ""
+#~ "çåæåéèæçèååæèåééäãæååçèèçæéåèåïäæææèæ"
+#~ "æååäéèçèã"
+
+#~ msgid "You can specify your default settings for your account."
+#~ msgstr "æåäæåèååèçéèèååã"
+
+#~ msgid ""
+#~ "Time to check things over before we try and connect to the server and "
+#~ "fetch your mail."
+#~ msgstr "åæååèäéçåäæåååéäåææäéçæéã"
+
+#~ msgid "Next - Receiving mail"
+#~ msgstr "ääæ - ææéä"
+
+#~ msgid "Receiving mail"
+#~ msgstr "ææéä"
+
+#~ msgid "Next - Sending mail"
+#~ msgstr "ääæ - åééä"
+
+#~ msgid "Back - Identity"
+#~ msgstr "ääæ - èå"
+
+#~ msgid "Next - Receiving options"
+#~ msgstr "ääæ - ææéé"
+
+#~ msgid "Receiving options"
+#~ msgstr "ææéé"
+
+#~ msgid "Back - Receiving mail"
+#~ msgstr "ääæ - ææéä"
+
+#~ msgid "Sending mail"
+#~ msgstr "åééä"
+
+#~ msgid "Next - Review account"
+#~ msgstr "ääæ - æéåè"
+
+#~ msgid "Next - Defaults"
+#~ msgstr "ääæ - èçèæ"
+
+#~ msgid "Back - Receiving options"
+#~ msgstr "ääæ - ææéé"
+
+#~ msgid "Back - Sending mail"
+#~ msgstr "ääæ - åééä"
+
+#~ msgid "Review account"
+#~ msgstr "æéåè"
+
+#~ msgid "Finish"
+#~ msgstr "åæ"
+
+#~ msgid "Back - Sending"
+#~ msgstr "ääæ - åé"
+
+#~ msgid "Setup Google contacts with Evolution"
+#~ msgstr "å Google éçäåå Evolution"
+
+#~ msgid "Setup Google calendar with Evolution"
+#~ msgstr "å Google ææåå Evolution"
+
+#~ msgid "You may need to enable IMAP access."
+#~ msgstr "æåèéèåç IMAP ååã"
+
+#~ msgid "Google account settings:"
+#~ msgstr "Google åèèååï"
+
+#~ msgid "Setup Yahoo calendar with Evolution"
+#~ msgstr "å Yahoo èäæåå Evolution"
+
+#~ msgid ""
+#~ "Yahoo calendars are named as firstname_lastname. We have tried to form "
+#~ "the calendar name. So please confirm and re-enter the calendar name if it "
+#~ "is not correct."
+#~ msgstr ""
+#~ "Yahoo èäææååç åå_åæãæåååèçæéåèäæçåçãåæèçè"
+#~ "åïåææéèèéæèåèäæçåçã"
+
+#~ msgid "Yahoo account settings:"
+#~ msgstr "Yahoo åèèååï"
+
+#~ msgid "Yahoo Calendar name:"
+#~ msgstr "Yahoo èäæåçï"
+
+#~ msgid "Password:"
+#~ msgstr "åçï"
+
+#~ msgid "Close Tab"
+#~ msgstr "ééåé"
+
+#~ msgid "Account Wizard"
+#~ msgstr "åèçé"
+
+#~ msgid "Evolution account assistant"
+#~ msgstr "Evolution åèåç"
+
+#~ msgid "Modify %s..."
+#~ msgstr "äæ %sâ"
+
+#~ msgid "Add a new account"
+#~ msgstr "ååæçåè"
+
+#~ msgid "Account management"
+#~ msgstr "åèçç"
+
+#~ msgid "Settings"
+#~ msgstr "èåå"
+
+#~ msgid "Cannot get transport for account '%s'"
+#~ msgstr "äèåååèã%sãçåè"
+
 #~ msgid "Some features may not work properly with your current server"
 #~ msgstr "æäåèåèçæåæçåçäæåçæäæåéä"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]