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



commit c137a42a76460b6a44ac88b421fcd21be6e1e316
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Feb 18 08:39:44 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2039 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 2031 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 2154 insertions(+), 1916 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 54df65f..4195fb0 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -10,10 +10,10 @@
 #: ../shell/main.c:570
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 3.3.4\n"
+"Project-Id-Version: evolution 3.3.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-29 23:13+0800\n"
-"PO-Revision-Date: 2012-01-29 23:14+0800\n"
+"POT-Creation-Date: 2012-02-18 08:38+0800\n"
+"PO-Revision-Date: 2012-02-18 08:38+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"
@@ -252,8 +252,8 @@ msgstr "éåçåæ"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:719
-#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
-#: ../shell/main.c:134
+#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:83
+#: ../shell/main.c:133
 msgid "Birthday"
 msgstr "çæ"
 
@@ -265,6 +265,7 @@ msgstr "éèæï"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Ca_tegories..."
 msgstr "åé(_T)â"
 
@@ -684,7 +685,7 @@ msgid "_List name:"
 msgstr "åååç(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:176
 msgid "_Select..."
 msgstr "éå(_S)â"
 
@@ -1380,27 +1381,39 @@ msgid "Importing..."
 msgstr "ååâ"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1075
-msgid "Outlook CSV or Tab (.csv, .tab)"
+#, fuzzy
+#| msgid "Outlook CSV or Tab (.csv, .tab)"
+msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1076
-msgid "Outlook CSV and Tab Importer"
+#, fuzzy
+#| msgid "Outlook CSV and Tab Importer"
+msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook CSV è Tab ååçå"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1084
-msgid "Mozilla CSV or Tab (.csv, .tab)"
+#, fuzzy
+#| msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1085
-msgid "Mozilla CSV and Tab Importer"
+#, fuzzy
+#| msgid "Mozilla CSV and Tab Importer"
+msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla CSV è Tab ååçå"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1093
-msgid "Evolution CSV or Tab (.csv, .tab)"
+#, fuzzy
+#| msgid "Evolution CSV or Tab (.csv, .tab)"
+msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1094
-msgid "Evolution CSV and Tab Importer"
+#, fuzzy
+#| msgid "Evolution CSV and Tab Importer"
+msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution CSV è Tab ååçå"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:796
@@ -2123,7 +2136,7 @@ msgid "Description Contains"
 msgstr "æèåå"
 
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:23
 msgid "Do Not Exist"
 msgstr "äåå"
 
@@ -2132,7 +2145,7 @@ msgid "Exactly"
 msgstr "ååçå"
 
 #: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:26
 msgid "Exist"
 msgstr "åå"
 
@@ -2205,12 +2218,12 @@ msgid "does not contain"
 msgstr "äåå"
 
 #: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:33
 msgid "is"
 msgstr "æ"
 
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:39
 msgid "is not"
 msgstr "äæ"
 
@@ -2254,7 +2267,7 @@ msgstr "èéæéèé"
 msgid "Mes_sage:"
 msgstr "èæ(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:80
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:76
 msgid "Options"
 msgstr "éé"
 
@@ -2347,7 +2360,7 @@ msgstr "éå:"
 msgid "_Type:"
 msgstr "éå(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:262 ../mail/mail-config.ui.h:167
+#: ../calendar/gui/dialogs/calendar-setup.c:262 ../mail/mail-config.ui.h:168
 #: ../modules/addressbook/ldap-config.ui.h:28
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
@@ -2377,7 +2390,7 @@ msgstr "éè(_R):"
 #: ../calendar/gui/dialogs/calendar-setup.c:462
 #: ../calendar/gui/dialogs/calendar-setup.c:474
 #: ../calendar/gui/dialogs/calendar-setup.c:485
-#: ../mail/em-folder-properties.c:234 ../mail/mail-config.ui.h:56
+#: ../mail/em-folder-properties.c:254 ../mail/mail-config.ui.h:54
 #: ../modules/addressbook/addressbook-config.c:1082
 #: ../modules/addressbook/autocompletion-config.c:240
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
@@ -2464,101 +2477,101 @@ msgstr "%s  äåçåääææãææéäææääææéåç
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  äææåääææïææéåçèåï"
 
-#: ../calendar/gui/dialogs/comp-editor.c:276
+#: ../calendar/gui/dialogs/comp-editor.c:275
 msgid "Could not save attachments"
 msgstr "çæååéä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:621
 msgid "Could not update object"
 msgstr "çæææçä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:750
+#: ../calendar/gui/dialogs/comp-editor.c:749
 msgid "Edit Appointment"
 msgstr "çèçæ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:757
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Meeting - %s"
 msgstr "æè - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:759
+#: ../calendar/gui/dialogs/comp-editor.c:758
 #, c-format
 msgid "Appointment - %s"
 msgstr "çæ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:765
+#: ../calendar/gui/dialogs/comp-editor.c:764
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ææçåä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Task - %s"
 msgstr "åä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:771
 #, c-format
 msgid "Memo - %s"
 msgstr "ååé - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:788
+#: ../calendar/gui/dialogs/comp-editor.c:787
 msgid "No Summary"
 msgstr "æææè"
 
-#: ../calendar/gui/dialogs/comp-editor.c:909
+#: ../calendar/gui/dialogs/comp-editor.c:908
 msgid "Keep original item?"
 msgstr "æåäæååéçï"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Close the current window"
 msgstr "ééçåçèç"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129 ../mail/e-mail-browser.c:137
+#: ../calendar/gui/dialogs/comp-editor.c:1128 ../mail/e-mail-browser.c:137
 #: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:144
+#: ../calendar/gui/dialogs/comp-editor.c:1135 ../mail/e-mail-browser.c:144
 #: ../shell/e-shell-window-actions.c:1474
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "åäéåçå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1142
 #: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "åééåçå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1149
 msgid "View help"
 msgstr "æèæå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157 ../mail/e-mail-browser.c:151
+#: ../calendar/gui/dialogs/comp-editor.c:1156 ../mail/e-mail-browser.c:151
 #: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
 #: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "èäåèççåå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1177
 msgid "Save current changes"
 msgstr "ååçåçææ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:158
+#: ../calendar/gui/dialogs/comp-editor.c:1184 ../mail/e-mail-browser.c:158
 #: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "éåæææå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../calendar/gui/dialogs/comp-editor.c:1191
 msgid "_Classification"
 msgstr "æé(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1199
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:172
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
@@ -2567,136 +2580,131 @@ msgstr "æé(_C)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206 ../mail/e-mail-browser.c:165
+#: ../calendar/gui/dialogs/comp-editor.c:1205 ../mail/e-mail-browser.c:165
 #: ../shell/e-shell-window-actions.c:1621
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "ææ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1212
 #: ../shell/e-shell-window-actions.c:1628
 msgid "_Help"
 msgstr "æå(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1220
+#: ../calendar/gui/dialogs/comp-editor.c:1219
 msgid "_Insert"
 msgstr "æå(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1227
+#: ../calendar/gui/dialogs/comp-editor.c:1226
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "éé(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1234 ../mail/e-mail-browser.c:179
+#: ../calendar/gui/dialogs/comp-editor.c:1233 ../mail/e-mail-browser.c:179
 #: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244
+#: ../calendar/gui/dialogs/comp-editor.c:1243
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "éä(_A)â"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1246
+#: ../calendar/gui/dialogs/comp-editor.c:1245
 #: ../composer/e-composer-actions.c:290
-#: ../widgets/misc/e-attachment-view.c:439
+#: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "éåææ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1253
 msgid "_Categories"
 msgstr "åé(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1255
 msgid "Toggles whether to display categories"
 msgstr "åææåéçãåéã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1261
 msgid "Time _Zone"
 msgstr "æå(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../calendar/gui/dialogs/comp-editor.c:1263
 msgid "Toggles whether the time zone is displayed"
 msgstr "åææåéçãæåã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1273
+#: ../calendar/gui/dialogs/comp-editor.c:1272
 msgid "Pu_blic"
 msgstr "åé(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1274
 msgid "Classify as public"
 msgstr "åéçåé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "_Private"
 msgstr "çä(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1281
 msgid "Classify as private"
 msgstr "æéççä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "_Confidential"
 msgstr "æå(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 msgid "Classify as confidential"
 msgstr "æéçæå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1297
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "R_ole Field"
 msgstr "èèæä(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Toggles whether the Role field is displayed"
 msgstr "åææåéçãèèãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1304
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1307
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "åææåéçãRSVPãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "_Status Field"
 msgstr "çææä(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Toggles whether the Status field is displayed"
 msgstr "åææåéçãçæãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1321
+#: ../calendar/gui/dialogs/comp-editor.c:1320
 msgid "_Type Field"
 msgstr "éåæä(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "åææåéçãåæèéåãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1347
-#: ../composer/e-composer-private.c:77
-msgid "Recent _Documents"
-msgstr "æèäçæä(_D)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2079
+#: ../calendar/gui/dialogs/comp-editor.c:2044
 #: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "éå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2427
-#: ../calendar/gui/dialogs/comp-editor.c:2590
-#: ../calendar/gui/dialogs/comp-editor.c:3582
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2553
+#: ../calendar/gui/dialogs/comp-editor.c:3545
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "åæææçææïåæææåæéçæåçææ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3546
+#: ../calendar/gui/dialogs/comp-editor.c:3509
 #: ../plugins/prefer-plain/prefer-plain.c:66
 msgid "attachment"
 msgstr "éä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3614
+#: ../calendar/gui/dialogs/comp-editor.c:3577
 msgid "Unable to use current version!"
 msgstr "çæäççåççæï"
 
@@ -2709,15 +2717,15 @@ msgstr "çèäçéèï %s"
 msgid "Could not open destination"
 msgstr "çæéåççå"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:126
 msgid "Destination is read only"
 msgstr "ççåæåè"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+#: ../calendar/gui/dialogs/copy-source-dialog.c:160
 msgid "Cannot create object"
 msgstr "äèåççä"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+#: ../calendar/gui/dialogs/copy-source-dialog.c:189
 msgid "Could not open source"
 msgstr "çæéåäæ"
 
@@ -2888,7 +2896,6 @@ msgstr "éåääåææé"
 
 #: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:7
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æèåéä(_G):"
 
@@ -3139,12 +3146,18 @@ msgid "Unable to open memos in '%s': %s"
 msgstr "çæåã%sãéåååéï%s"
 
 #: ../calendar/gui/dialogs/memo-page.c:1154 ../em-format/em-format.c:1062
-#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2667
-#: ../mail/em-format-html.c:2732 ../mail/em-format-html.c:2756
+#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2663
+#: ../mail/em-format-html.c:2728 ../mail/em-format-html.c:2752
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "æäè"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+msgid "Organi_zer:"
+msgstr "æèåéä(_Z):"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
 #: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
@@ -3372,7 +3385,7 @@ msgstr "æ"
 msgid "Exceptions"
 msgstr "äå"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:88
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
 msgid "Preview"
 msgstr "éè"
 
@@ -3524,7 +3537,7 @@ msgstr "çæ(_U):"
 #: ../calendar/gui/e-cal-model.c:3500
 #: ../calendar/gui/e-meeting-list-view.c:661
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "çæ"
@@ -3596,11 +3609,6 @@ msgid ""
 "assigned tasks"
 msgstr "äèçèåäïåçéåçåäæåäææææåä"
 
-#: ../calendar/gui/dialogs/task-page.c:350
-#: ../calendar/gui/dialogs/task-page.ui.h:4
-msgid "Organi_zer:"
-msgstr "æèåéä(_Z):"
-
 #: ../calendar/gui/dialogs/task-page.c:822
 msgid "Due date is wrong"
 msgstr "åææéè"
@@ -3610,10 +3618,6 @@ msgstr "åææéè"
 msgid "Unable to open tasks in '%s': %s"
 msgstr "çæåã%sãéååäï%s"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Categor_ies..."
-msgstr "åé(_I)â"
-
 #: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "åææ(_U):"
@@ -3729,7 +3733,7 @@ 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:204 ../calendar/gui/e-day-view.c:1838
+#: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1839
 #: ../calendar/gui/e-day-view-top-item.c:852
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../modules/calendar/e-cal-shell-view-private.c:1054
@@ -3761,7 +3765,7 @@ 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:234 ../calendar/gui/e-day-view.c:1854
+#: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1855
 #: ../calendar/gui/e-day-view-top-item.c:856
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../modules/calendar/e-cal-shell-view-private.c:1090
@@ -3899,7 +3903,7 @@ msgstr "çæï"
 msgid "Priority:"
 msgstr "ååççï"
 
-#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "æèï"
 
@@ -4140,14 +4144,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1021 ../calendar/gui/e-week-view.c:773
+#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:774
 #: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
 #: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
 msgid "am"
 msgstr "äå"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1024 ../calendar/gui/e-week-view.c:776
+#: ../calendar/gui/e-day-view.c:1025 ../calendar/gui/e-week-view.c:777
 #: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
 #: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
 msgid "pm"
@@ -4159,13 +4163,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:1821 ../calendar/gui/e-day-view-top-item.c:848
+#: ../calendar/gui/e-day-view.c:1822 ../calendar/gui/e-day-view-top-item.c:848
 #: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1982
 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:2638
+#: ../calendar/gui/e-day-view.c:2639
 #, c-format
 msgid "Week %d"
 msgstr "ç %d é"
@@ -4847,11 +4851,11 @@ msgstr "ååæ"
 msgid "In progress"
 msgstr "æåéè"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:37
 msgid "is greater than"
 msgstr "åæ"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:38
 msgid "is less than"
 msgstr "åæ"
 
@@ -6587,38 +6591,38 @@ msgid "Pacific/Yap"
 msgstr "ååæ/éæå"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:153
+#: ../capplet/anjal-settings-main.c:161
 msgid "ID of the socket to embed in"
 msgstr "socket ç IDïååæ"
 
-#: ../capplet/anjal-settings-main.c:154
+#: ../capplet/anjal-settings-main.c:162
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "èèåäçååã"
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
 msgstr "èèåäçéåéääåã"
 
-#: ../capplet/settings/mail-account-view.c:78
+#: ../capplet/settings/mail-account-view.c:79
 msgid "The email address you have entered is invalid."
 msgstr "äèåçéåéääåæçæçã"
 
-#: ../capplet/settings/mail-account-view.c:79
+#: ../capplet/settings/mail-account-view.c:80
 msgid "Please enter your password."
 msgstr "èèåäçåçã"
 
-#: ../capplet/settings/mail-account-view.c:280
-#: ../mail/em-account-editor.c:5352 ../plugins/caldav/caldav-source.c:67
+#: ../capplet/settings/mail-account-view.c:282
+#: ../mail/em-account-editor.c:5395 ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:374
-#: ../capplet/settings/mail-account-view.c:419
-#: ../mail/em-account-editor.c:5223 ../mail/em-account-editor.c:5280
+#: ../capplet/settings/mail-account-view.c:376
+#: ../capplet/settings/mail-account-view.c:421
+#: ../mail/em-account-editor.c:5266 ../mail/em-account-editor.c:5323
 #: ../modules/online-accounts/e-online-accounts-google.c:295
 #: ../modules/online-accounts/e-online-accounts-google.c:369
 #: ../plugins/google-account-setup/google-contacts-source.c:55
@@ -6626,207 +6630,221 @@ msgstr "CalDAV"
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:486
+#: ../capplet/settings/mail-account-view.c:498
+#: ../capplet/settings/mail-account-view.c:602
+#: ../mail/em-account-editor.c:4799 ../mail/em-account-editor.c:4834
+msgid "Always (SSL)"
+msgstr "æé (SSL)"
+
+#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:605
+#: ../mail/em-account-editor.c:4802 ../mail/em-account-editor.c:4837
+msgid "When possible (TLS)"
+msgstr "åèçè (TLS)"
+
+#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:1738 ../mail/em-account-editor.c:4805
+#: ../mail/em-account-editor.c:4840
+msgid "Never"
+msgstr "æä"
+
+#: ../capplet/settings/mail-account-view.c:512
 msgid "Personal details:"
 msgstr "åäèçèæï"
 
-#: ../capplet/settings/mail-account-view.c:493 ../mail/mail-config.ui.h:75
+#: ../capplet/settings/mail-account-view.c:519 ../mail/mail-config.ui.h:71
 msgid "Name:"
 msgstr "åçï"
 
-#: ../capplet/settings/mail-account-view.c:502 ../mail/mail-config.ui.h:46
+#: ../capplet/settings/mail-account-view.c:528 ../mail/mail-config.ui.h:44
 msgid "Email address:"
 msgstr "Email äåï"
 
-#: ../capplet/settings/mail-account-view.c:512 ../mail/mail-config.ui.h:38
+#: ../capplet/settings/mail-account-view.c:538 ../mail/mail-config.ui.h:37
 msgid "Details:"
 msgstr "èçèæï"
 
-#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:93
+#: ../capplet/settings/mail-account-view.c:546 ../mail/mail-config.ui.h:88
 msgid "Receiving"
 msgstr "ææä"
 
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:129
+#: ../capplet/settings/mail-account-view.c:553 ../mail/mail-config.ui.h:129
 msgid "Server type:"
 msgstr "äæåéåï"
 
-#: ../capplet/settings/mail-account-view.c:536 ../mail/mail-config.ui.h:128
+#: ../capplet/settings/mail-account-view.c:562 ../mail/mail-config.ui.h:128
 msgid "Server address:"
 msgstr "äæåäåï"
 
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:153
+#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:154
 msgid "Username:"
 msgstr "äçèåçï"
 
-#: ../capplet/settings/mail-account-view.c:554
+#: ../capplet/settings/mail-account-view.c:580
 msgid "Use encryption:"
 msgstr "äçååï"
 
-#: ../capplet/settings/mail-account-view.c:559
-#: ../capplet/settings/mail-account-view.c:594
-msgid "never"
-msgstr "æä"
-
-#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:113
+#: ../capplet/settings/mail-account-view.c:613 ../mail/mail-config.ui.h:113
 msgid "Sending"
 msgstr "åéä"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:656
 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:615
+#: ../capplet/settings/mail-account-view.c:658
 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:617
+#: ../capplet/settings/mail-account-view.c:660
 msgid "You can specify more options to configure the account."
 msgstr "äåäæåæåçäèåéååèçééã"
 
-#: ../capplet/settings/mail-account-view.c:619
+#: ../capplet/settings/mail-account-view.c:662
 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:620
+#: ../capplet/settings/mail-account-view.c:663
 msgid "You can specify your default settings for your account."
 msgstr "äåäæåèååèçéèèååã"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:664
 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:636
-#: ../mail/em-account-editor.c:2915 ../mail/em-account-editor.c:3051
+#: ../capplet/settings/mail-account-view.c:679
+#: ../mail/em-account-editor.c:2924 ../mail/em-account-editor.c:3063
 msgid "Identity"
 msgstr "èå"
 
-#: ../capplet/settings/mail-account-view.c:636
+#: ../capplet/settings/mail-account-view.c:679
 msgid "Next - Receiving mail"
 msgstr "ääæ - ææéä"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Receiving mail"
 msgstr "ææéä"
 
-#: ../capplet/settings/mail-account-view.c:637
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:681
 msgid "Next - Sending mail"
 msgstr "ääæ - åééä"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Back - Identity"
 msgstr "ääæ - èå"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Next - Receiving options"
 msgstr "ääæ - ææéé"
 
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:681
 msgid "Receiving options"
 msgstr "ææéé"
 
-#: ../capplet/settings/mail-account-view.c:638
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:681
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Back - Receiving mail"
 msgstr "ääæ - ææéä"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Sending mail"
 msgstr "åééä"
 
-#: ../capplet/settings/mail-account-view.c:640
-#: ../capplet/settings/mail-account-view.c:641
+#: ../capplet/settings/mail-account-view.c:683
+#: ../capplet/settings/mail-account-view.c:684
 msgid "Next - Review account"
 msgstr "ääæ - æéåè"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Next - Defaults"
 msgstr "ääæ - èçèæ"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Back - Receiving options"
 msgstr "ääæ - ææéé"
 
-#: ../capplet/settings/mail-account-view.c:641
-#: ../mail/em-account-editor.c:4033
+#: ../capplet/settings/mail-account-view.c:684
+#: ../mail/em-account-editor.c:4076
 msgid "Defaults"
 msgstr "éèå"
 
-#: ../capplet/settings/mail-account-view.c:641
+#: ../capplet/settings/mail-account-view.c:684
 msgid "Back - Sending mail"
 msgstr "ääæ - åééä"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Review account"
 msgstr "æéåè"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Finish"
 msgstr "åæ"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Back - Sending"
 msgstr "ääæ - åé"
 
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:856
 msgid "Setup Google contacts with Evolution"
 msgstr "å Google èçäåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:767
+#: ../capplet/settings/mail-account-view.c:857
 msgid "Setup Google calendar with Evolution"
 msgstr "å Google ææåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:772
-#: ../mail/em-account-editor.c:4851
+#: ../capplet/settings/mail-account-view.c:862
+#: ../mail/em-account-editor.c:4894
 msgid "You may need to enable IMAP access."
 msgstr "äåèéèåç IMAP ååã"
 
-#: ../capplet/settings/mail-account-view.c:780
-#: ../mail/em-account-editor.c:4828
+#: ../capplet/settings/mail-account-view.c:870
+#: ../mail/em-account-editor.c:4871
 msgid "Google account settings:"
 msgstr "Google åèèååï"
 
-#: ../capplet/settings/mail-account-view.c:806
+#: ../capplet/settings/mail-account-view.c:896
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "å Yahoo èäæåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:810
-#: ../mail/em-account-editor.c:4898
+#: ../capplet/settings/mail-account-view.c:900
+#: ../mail/em-account-editor.c:4941
 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:819
-#: ../mail/em-account-editor.c:4883
+#: ../capplet/settings/mail-account-view.c:909
+#: ../mail/em-account-editor.c:4926
 msgid "Yahoo account settings:"
 msgstr "Yahoo åèèååï"
 
-#: ../capplet/settings/mail-account-view.c:833
+#: ../capplet/settings/mail-account-view.c:923
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo èäæåçï"
 
-#: ../capplet/settings/mail-account-view.c:1020
+#: ../capplet/settings/mail-account-view.c:1116
 msgid "Password:"
 msgstr "åçï"
 
-#: ../capplet/settings/mail-account-view.c:1072
+#: ../capplet/settings/mail-account-view.c:1168
 #: ../capplet/settings/mail-settings-view.c:256
 msgid "Close Tab"
 msgstr "ééåé"
 
-#: ../capplet/settings/mail-account-view.c:1082
+#: ../capplet/settings/mail-account-view.c:1178
 msgid "Account Wizard"
 msgstr "åèçé"
 
@@ -6922,7 +6940,7 @@ msgstr "ååçèç(_D)"
 msgid "Save as draft"
 msgstr "ååçèç"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:349
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:317
 msgid "S_end"
 msgstr "åé(_E)"
 
@@ -7068,23 +7086,23 @@ msgstr "æéèæåçéæå"
 msgid "Click here to select folders to post to"
 msgstr "æääéèïéåèåèçèæå"
 
-#: ../composer/e-composer-private.c:247
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "åæååæçåä"
 
-#: ../composer/e-composer-private.c:251
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "éèååæçåä"
 
-#: ../composer/e-composer-private.c:255
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "æåæå"
 
-#: ../composer/e-composer-private.c:259
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "æåååäæå"
 
-#: ../composer/e-composer-private.c:369
+#: ../composer/e-composer-private.c:337
 msgid "Save draft"
 msgstr "ååèç"
 
@@ -7633,398 +7651,406 @@ msgid "Month view vertical pane position"
 msgstr "ææèçåççæäç"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+msgid "Name of the preferred New toolbar button item"
+msgstr "ååçæåååæééççåç"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
 msgid "Number of units for determining a birthday or anniversary reminder"
 msgstr "æåçææéåçåææéçåäæç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
 msgid "Number of units for determining a default reminder"
 msgstr "æåéèæéçåäæç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
 msgid "Number of units for determining when to hide tasks"
 msgstr "æåäæéèåäçåäæç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "éæçåäèå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
 msgstr "æåçæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçè"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels"
 msgstr "æåçæçäçïåææèäçæèèçèææåèèäæãåäæåäéïäåçè"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr "æåçåçæååééèçæçäç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr "æåçæåæåäéèçæçäç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "æåçåçæåäéèçæçäç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar"
 msgstr "åççæçäçïåèäææåèææåèèäæäé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+msgid "Preferred New button item"
+msgstr "ååçææééç"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "äèèäæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "äèååéæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "äèåäæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 msgid "Programs that are allowed to be run by reminders"
 msgstr "çäåçæéèåèççå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "æèåææèääçççäæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "éææäääæééç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
 msgid "Reminder programs"
 msgstr "æéçåéçå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for reminder audio"
 msgstr "ååæééææçé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
 msgid "Scroll Month View by a week, not by a month"
 msgstr "æåäéçåäæåææèïèéäæçåä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "åää/åä/æèçèåäéç RSVP æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "åää/åä/æèçèåäéç èè æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "åéåæçæèåéççæççææé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "åää/æè/åäçèåäéç åé æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr "ååäèäæäåéææääéååäæééç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display reminders in notification tray"
 msgstr "åéçåäéçæéçé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
 msgstr "åää/åä/æèçèåäéç çæ æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the memo preview pane"
 msgstr "éçååééèçæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
 msgid "Show the task preview pane"
 msgstr "éçåäéèçæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
 msgstr "åää/æèçèåäéç æå æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
 msgid "Show type field in the event/task/meeting editor"
 msgstr "åää/åä/æèçèåäéç éå æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "åææèãåäéæèåææåèéçéæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key"
 msgstr "åæèååæåææèäéççäæåãæåéäæãtimezoneãèåéççæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
 msgstr "åäéçæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (horizontal)"
 msgstr "åäéèçæäçïæåï"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
 msgid "Task preview pane position (vertical)"
 msgstr "åäéèçæäçïåçï"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "äååæåäçèå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
 msgstr "ãèäæãæèåéæäåéåïæãäèãïèäæç UID"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
 msgstr "ãååéãæèåéæäåéåïæãäèãïååéæåç UID"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
 msgstr "ãåäãæèåéæäåéåïæãäèãïåäæåç UID"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain"
 msgstr "äççé/åçèæåéäçççåçæï%u èäéåéääåçäçèåçéåäåäïè %d èææççååç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
 msgstr "çæèäæäææèæåçéèæåïæçèç Olsen æåèæåäçåå \"America/New York\""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list"
 msgstr "éçæåæåäåååéæåäéèçæçäçãã0ã (æææè) åéèçææåååéæåäæãã1ã (åçæè) åéèçææåååéæåæé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list"
 msgstr "éçæåæåäååäæåäéèçæçäçãã0ã (æææè) åéèçææååäæåäæãã1ã (åçæè) åéèçææååäæåæé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
 msgid "The second timezone for a Day View"
 msgstr "çæææèççäæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
 msgid "Time divisions"
 msgstr "æéåé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Time the last reminder ran, in time_t"
 msgstr "äææéåèçæé(_T)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Timezone"
 msgstr "æå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
 msgid "Twenty four hour time format"
 msgstr "24 åæåæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 "\"days\""
 msgstr "çæåéåçåææéçåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "éèæéåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 msgstr "æåäæéèåäçåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
 msgstr "äçççæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "äçççæååäå Evolution äéåçæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Vertical position for the tag pane"
 msgstr "æççæåçäç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "äééåæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 msgstr "æéçéåïåæææ (0) åææå (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr "æåäçåçéèåèéæçåä (task-overdue-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr "æåäçåçéèåèäååæçåä (task-due-today-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Whether or not to use the notification tray for display reminders"
 msgstr "æåäçéçåéçæé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to ask for confirmation when deleting an appointment or task"
 msgstr "åéçææåäææåèæçè"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Whether to ask for confirmation when expunging appointments and tasks"
 msgstr "æéçæååäææåèæçè"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday"
 msgstr "æååçææèäçéæïéæåäéäçéåèéæçæäåçää"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "æååéåæçæèåéçääççææé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr "æååèäæäçå Marcus Bains ç (äèçåæåççç)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Whether to hide completed tasks in the tasks view"
 msgstr "æåååäæèäéèåæçåä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "æåäéçåäæåææèïèéäæçåä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Whether to set a default reminder for appointments"
 msgstr "æåèåçæçéèæé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "æåèåçæåéåçåæçæé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "æååää/åä/æèçèåäéç RSVP æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "æååää/æèçèåäéç çæ æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "æååää/åä/æèçèåäéç èè æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "æååää/åä/æèçèåäéç çæ æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "æåäç 24 åæåæéèäæäçäå/äå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "æååää/æèçèåäéç æå æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "æååää/åä/æèçèåäéç éå æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "æååèäæçååäçéçéæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "åäæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "åäæçæåæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "åäæçæåé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "åäæéååæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "åäæéååé"
@@ -8423,15 +8449,23 @@ msgid "Enable/disable caret mode"
 msgstr "åç/åçæåèæå"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:77 ../mail/mail-config.ui.h:48
-msgid "Encode file names in an Outlook/GMail way"
+#: ../mail/evolution-mail.schemas.in.h:77
+#, fuzzy
+#| msgid "Encode file names in an Outlook/GMail way"
+msgid "Encode filenames in an Outlook/GMail way"
 msgstr "åææåçççç Outlook/GMail åå"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 #: ../mail/evolution-mail.schemas.in.h:78
+#, fuzzy
+#| msgid ""
+#| "Encode file names in the mail headers same as Outlook or GMail do, to let "
+#| "them display correctly file names with UTF-8 letters sent by Evolution, "
+#| "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+#| "standard."
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail do, to let "
-"them display correctly file names with UTF-8 letters sent by Evolution, "
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 msgstr "åéäæéäçææåçççç Outlook æ GMail çååïåèååèæçéçç Evolution ååç UTF-8 åçææåçïåçååäæéå RFC 2231 èçïèçääæçç RFC 2047 ææã"
@@ -8535,7 +8569,7 @@ msgstr "åæåç/åçéèæçèåäæåèåèçäääç
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
-msgstr "åæåç/åçéèæçèåäæåèåééäçææèåéääåçæäè"
+msgstr "åæåç/åçéèæçèåäæåèåééäçææèåéåéäååçæäè"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 #: ../mail/evolution-mail.schemas.in.h:108
@@ -8695,7 +8729,7 @@ msgstr "åèçæåæïãneverã- æäééçèåèçãã alwa
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 #: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr "åäçææèåææéääåçæäèååæç"
+msgstr "åäçææèåææéåéäååçæäèååæç"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 #: ../mail/evolution-mail.schemas.in.h:145
@@ -9156,13 +9190,13 @@ msgstr "ääæçåçäæéäæå"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 #: ../mail/evolution-mail.schemas.in.h:222
-msgid "Timeout for marking message as seen"
+msgid "Timeout for marking messages as seen"
 msgstr "åéäæçæåéèçæé"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 #: ../mail/evolution-mail.schemas.in.h:223
-msgid "Timeout for marking message as seen."
-msgstr "åéäæçæåéèçæéã"
+msgid "Timeout in milliseconds for marking messages as seen."
+msgstr "åéäæçæåéèçæéïäæçèã"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 #: ../mail/evolution-mail.schemas.in.h:224
@@ -9432,13 +9466,15 @@ msgstr "çæéäåéæåéçåéçæéäåçã"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid "Sound file name to be played."
-msgstr "èææçèéææåçã"
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "æéäéåæèææçéæææïåæäæäçåèæåã"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr "æéäéåæèææçéæææïåæäæäçåèæåã"
+#, fuzzy
+#| msgid "Sound file name to be played."
+msgid "Sound filename to be played."
+msgstr "èææçèéææåçã"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
@@ -9541,7 +9577,7 @@ msgid "Skip development warning dialog"
 msgstr "åçéçèååèç"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:317
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:316
 msgid "Start in offline mode"
 msgstr "äéçæååå"
 
@@ -9653,19 +9689,19 @@ msgid "Reply-To"
 msgstr "åè"
 
 #: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2668 ../mail/em-format-html.c:2736
-#: ../mail/em-format-html.c:2759 ../modules/mail/em-mailer-prefs.c:73
+#: ../mail/em-format-html.c:2664 ../mail/em-format-html.c:2732
+#: ../mail/em-format-html.c:2755 ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "åæ"
 
 #: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2669 ../mail/em-format-html.c:2740
-#: ../mail/em-format-html.c:2762 ../modules/mail/em-mailer-prefs.c:74
+#: ../mail/em-format-html.c:2665 ../mail/em-format-html.c:2736
+#: ../mail/em-format-html.c:2758 ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "åäåæ"
 
 #: ../em-format/em-format.c:1065 ../em-format/em-format-quote.c:463
-#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:74
+#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
 #: ../smime/lib/e-cert.c:1147
 msgid "Subject"
@@ -9729,7 +9765,7 @@ msgid "Could not parse PGP message: "
 msgstr "çæèæ PGP éäï"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2861
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2857
 #: ../modules/mail/em-mailer-prefs.c:1025
 msgid "Mailer"
 msgstr "åäè"
@@ -9969,28 +10005,33 @@ msgid ""
 msgstr "ååççææååääéææéèçéåèèã"
 
 #: ../e-util/e-system.error.xml.h:1
+#, fuzzy
+#| msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgstr "åçæåççã{0}ãçèæåååãèäçäåçåçã"
+
+#: ../e-util/e-system.error.xml.h:2
 msgid "Because \"{1}\"."
 msgstr "åçã{1}ãã"
 
-#: ../e-util/e-system.error.xml.h:2
+#: ../e-util/e-system.error.xml.h:3
 msgid "Cannot open file \"{0}\"."
 msgstr "äèéåææã{0}ãã"
 
-#: ../e-util/e-system.error.xml.h:3
+#: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
 msgstr "äèååææã{0}ãã"
 
-#: ../e-util/e-system.error.xml.h:4
-msgid "Do you wish to overwrite it?"
-msgstr "èèåå?"
-
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists \"{0}\"."
-msgstr "ææåååã{0}ãã"
+msgid ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr ""
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
-msgid "_Overwrite"
-msgstr "èå(_O)"
+#: ../e-util/e-system.error.xml.h:6
+#, fuzzy
+#| msgid "_Reply"
+msgid "_Replace"
+msgstr "åè(_R)"
 
 #: ../e-util/e-util.c:245
 msgid "Could not open the link."
@@ -10194,7 +10235,9 @@ msgid "Missing date."
 msgstr "çåææã"
 
 #: ../filter/filter.error.xml.h:5
-msgid "Missing file name."
+#, fuzzy
+#| msgid "Missing file name."
+msgid "Missing filename."
 msgstr "çåææåçã"
 
 #: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
@@ -10218,7 +10261,9 @@ msgid "You must name this filter."
 msgstr "äåéçéåéæåååã"
 
 #: ../filter/filter.error.xml.h:11
-msgid "You must specify a file name."
+#, fuzzy
+#| msgid "You must specify a file name."
+msgid "You must specify a filename."
 msgstr "äåéæåäåææåçã"
 
 #: ../filter/filter.ui.h:1
@@ -10299,46 +10344,47 @@ msgstr "ååéäåèæåã%sã"
 msgid "Forwarded messages"
 msgstr "åèåçéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:385
-msgid "Scanning messages for duplicates"
-msgstr "ææéäæåæéè"
-
-#: ../libemail-engine/e-mail-folder-utils.c:576
+#: ../libemail-engine/e-mail-folder-utils.c:378
+#: ../libemail-engine/e-mail-folder-utils.c:627
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "åå %d åéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:824
+#: ../libemail-engine/e-mail-folder-utils.c:472
+msgid "Scanning messages for duplicates"
+msgstr "ææéäæåæéè"
+
+#: ../libemail-engine/e-mail-folder-utils.c:875
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "çéèæåã%sã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:956
+#: ../libemail-engine/e-mail-folder-utils.c:1007
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "ææã%sãåçèçéã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:960
+#: ../libemail-engine/e-mail-folder-utils.c:1011
 msgid "File has been removed."
 msgstr "ææåçèçéã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1019
+#: ../libemail-engine/e-mail-folder-utils.c:1070
 msgid "Removing attachments"
 msgstr "æåçééä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1181
+#: ../libemail-engine/e-mail-folder-utils.c:1232
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "åå %d åéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:624
+#: ../libemail-engine/e-mail-folder-utils.c:1586 ../mail/em-folder-utils.c:624
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "çæçèæå URIã%sã"
 
-#: ../libemail-engine/e-mail-session.c:106 ../mail/em-folder-properties.c:310
+#: ../libemail-engine/e-mail-session.c:106 ../mail/em-folder-properties.c:330
 #: ../mail/em-folder-tree-model.c:714
 #: ../modules/mail/e-mail-shell-view-private.c:1095
 #: ../modules/mail/e-mail-shell-view-private.c:1106
@@ -10445,7 +10491,7 @@ msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "çæéåèæåãåäåãèæåï%s"
 
 #: ../libemail-engine/e-mail-session-utils.c:790
-#: ../libemail-engine/mail-ops.c:810 ../libemail-engine/mail-ops.c:906
+#: ../libemail-engine/mail-ops.c:810 ../libemail-engine/mail-ops.c:909
 msgid "Sending message"
 msgstr "æååééä"
 
@@ -10454,17 +10500,17 @@ msgstr "æååééä"
 msgid "Unsubscribing from folder '%s'"
 msgstr "åæèéèæå ã%sã"
 
-#: ../libemail-engine/e-mail-store-utils.c:166
+#: ../libemail-engine/e-mail-store-utils.c:169
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "äæèã%sãçéç"
 
-#: ../libemail-engine/e-mail-store-utils.c:255
+#: ../libemail-engine/e-mail-store-utils.c:260
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "éæéçåã%sã"
 
-#: ../libemail-engine/e-mail-store-utils.c:328
+#: ../libemail-engine/e-mail-store-utils.c:335
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æååèã%sãéçåä"
@@ -10487,60 +10533,62 @@ msgstr "ææéä"
 msgid "Sending message %d of %d"
 msgstr "æååééä %d / %d"
 
-#: ../libemail-engine/mail-ops.c:869
+#. Translators: The string is distinguished by total count of messages to be send. Failed messages is always more than zero.
+#: ../libemail-engine/mail-ops.c:870
 #, c-format
-msgid "Failed to send %d of %d messages"
-msgstr "çæåéç %d åéä (å %d å)"
+msgid "Failed to send a message"
+msgid_plural "Failed to send %d of %d messages"
+msgstr[0] "çæåé %d / %d åéä"
 
-#: ../libemail-engine/mail-ops.c:873 ../mail/mail-send-recv.c:883
+#: ../libemail-engine/mail-ops.c:876 ../mail/mail-send-recv.c:883
 msgid "Canceled."
 msgstr "ååæã"
 
-#: ../libemail-engine/mail-ops.c:875 ../mail/mail-send-recv.c:885
+#: ../libemail-engine/mail-ops.c:878 ../mail/mail-send-recv.c:885
 msgid "Complete."
 msgstr "åæã"
 
-#: ../libemail-engine/mail-ops.c:987
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "åéäçåã%sã"
 
-#: ../libemail-engine/mail-ops.c:988
+#: ../libemail-engine/mail-ops.c:991
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "åéäèèåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1105
+#: ../libemail-engine/mail-ops.c:1108
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æåèèèæåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1178
+#: ../libemail-engine/mail-ops.c:1181
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æçååååè '%s'"
 
-#: ../libemail-engine/mail-ops.c:1179
+#: ../libemail-engine/mail-ops.c:1182
 #, c-format
 msgid "Storing account '%s'"
 msgstr "åååè '%s'"
 
-#: ../libemail-engine/mail-ops.c:1241
+#: ../libemail-engine/mail-ops.c:1244
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "éææçèæåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1458
+#: ../libemail-engine/mail-ops.c:1461
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "æåååèæåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1551
+#: ../libemail-engine/mail-ops.c:1554
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æçã%sãçåæç"
 
-#: ../libemail-engine/mail-ops.c:1647
+#: ../libemail-engine/mail-ops.c:1650
 #, c-format
 msgid "Disconnecting %s"
 msgstr "æåäæ %s"
@@ -10581,7 +10629,7 @@ msgid "De_fault"
 msgstr "éèå(_F)"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:509
 #: ../modules/plugin-manager/evolution-plugin-manager.c:360
 #: ../plugins/publish-calendar/publish-calendar.c:849
 msgid "Enabled"
@@ -10593,8 +10641,8 @@ msgstr "åèåç"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3406
-#: ../mail/mail-config.ui.h:32
+#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3418
+#: ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:316
 #: ../plugins/google-account-setup/google-source.c:558
 #: ../plugins/google-account-setup/google-source.c:695
@@ -10602,7 +10650,6 @@ msgid "Default"
 msgstr "éèå"
 
 #: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/em-format-html-display.c:1398 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:172
 #: ../widgets/misc/e-attachment-paned.c:177
 msgid "Attachment"
@@ -10692,7 +10739,7 @@ msgid "_Later"
 msgstr "çå(_L)"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:705
+#: ../modules/mail/e-mail-shell-view-actions.c:736
 msgid "Add Label"
 msgstr "ååæç"
 
@@ -10720,7 +10767,7 @@ msgstr "éè"
 msgid "Name"
 msgstr "åç"
 
-#: ../mail/e-mail-migrate.c:1185
+#: ../mail/e-mail-migrate.c:1264
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "çæåã%sãåçæåéäèæåï%s"
@@ -10737,605 +10784,605 @@ msgstr "èèèèæå"
 msgid "C_opy"
 msgstr "èè(_O)"
 
-#: ../mail/e-mail-reader.c:829 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:841 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "çèèæå"
 
-#: ../mail/e-mail-reader.c:829 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:841 ../mail/em-folder-utils.c:488
 msgid "_Move"
 msgstr "çå(_M)"
 
-#: ../mail/e-mail-reader.c:1190 ../mail/e-mail-reader.c:1370
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1202 ../mail/e-mail-reader.c:1382
+#: ../mail/e-mail-reader.c:1421
 msgid "_Do not ask me again."
 msgstr "äèåèåæ(_D)ã"
 
-#: ../mail/e-mail-reader.c:1415
+#: ../mail/e-mail-reader.c:1427
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æéåçéäèåçåèæä(_A)"
 
-#: ../mail/e-mail-reader.c:1776
+#: ../mail/e-mail-reader.c:1788
 msgid "A_dd Sender to Address Book"
 msgstr "åååäèåçéæå(_D)"
 
-#: ../mail/e-mail-reader.c:1778
+#: ../mail/e-mail-reader.c:1790
 msgid "Add sender to address book"
 msgstr "æååäèèéèé"
 
-#: ../mail/e-mail-reader.c:1783
+#: ../mail/e-mail-reader.c:1795
 msgid "Check for _Junk"
 msgstr "ææååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1785
+#: ../mail/e-mail-reader.c:1797
 msgid "Filter the selected messages for junk status"
 msgstr "çéæéääçååéäçæ"
 
-#: ../mail/e-mail-reader.c:1790
+#: ../mail/e-mail-reader.c:1802
 msgid "_Copy to Folder..."
 msgstr "èèèèæå(_C)â"
 
-#: ../mail/e-mail-reader.c:1792
+#: ../mail/e-mail-reader.c:1804
 msgid "Copy selected messages to another folder"
 msgstr "èèåéåçéäååäåèæå"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1809
 msgid "_Delete Message"
 msgstr "åééä(_D)"
 
-#: ../mail/e-mail-reader.c:1799
+#: ../mail/e-mail-reader.c:1811
 msgid "Mark the selected messages for deletion"
 msgstr "åéåçéäæçæèåé"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1816
 msgid "Filter on Mailing _List..."
 msgstr "éäèåéæå(_L)â"
 
-#: ../mail/e-mail-reader.c:1806
+#: ../mail/e-mail-reader.c:1818
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "çéåéäèååçéæåèå"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1823
 msgid "Filter on _Recipients..."
 msgstr "æäèéæå(_R)â"
 
-#: ../mail/e-mail-reader.c:1813
+#: ../mail/e-mail-reader.c:1825
 msgid "Create a rule to filter messages to these recipients"
 msgstr "çéäæäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1830
 msgid "Filter on Se_nder..."
 msgstr "åäèéæå(_N)â"
 
-#: ../mail/e-mail-reader.c:1820
+#: ../mail/e-mail-reader.c:1832
 msgid "Create a rule to filter messages from this sender"
 msgstr "çéååäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1837
 msgid "Filter on _Subject..."
 msgstr "äæéæå(_S)â"
 
-#: ../mail/e-mail-reader.c:1827
+#: ../mail/e-mail-reader.c:1839
 msgid "Create a rule to filter messages with this subject"
 msgstr "çéåäæåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1844
 msgid "A_pply Filters"
 msgstr "åçéæå(_P)"
 
-#: ../mail/e-mail-reader.c:1834
+#: ../mail/e-mail-reader.c:1846
 msgid "Apply filter rules to the selected messages"
 msgstr "åçéæåèåææéåçéä"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1851
 msgid "_Find in Message..."
 msgstr "åéäååæ(_F)â"
 
-#: ../mail/e-mail-reader.c:1841
+#: ../mail/e-mail-reader.c:1853
 msgid "Search for text in the body of the displayed message"
 msgstr "æåéççéäææäçæå"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1858
 msgid "_Clear Flag"
 msgstr "æéæå(_C)"
 
-#: ../mail/e-mail-reader.c:1848
+#: ../mail/e-mail-reader.c:1860
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "çééåéäçèéææ"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1865
 msgid "_Flag Completed"
 msgstr "æèçååæ(_F)"
 
-#: ../mail/e-mail-reader.c:1855
+#: ../mail/e-mail-reader.c:1867
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ååéåéäçèéææèçååæ"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1872
 msgid "Follow _Up..."
 msgstr "èé(_U)â"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1874
 msgid "Flag the selected messages for follow-up"
 msgstr "åéåçéäåäèéææ"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1879
 msgid "_Attached"
 msgstr "éä(_A)"
 
-#: ../mail/e-mail-reader.c:1869 ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1881 ../mail/e-mail-reader.c:1888
 msgid "Forward the selected message to someone as an attachment"
 msgstr "åéåçéääéäååèåçæä"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1886
 msgid "Forward As _Attached"
 msgstr "äéäèå(_A)"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1893
 msgid "_Inline"
 msgstr "èå(_I)"
 
-#: ../mail/e-mail-reader.c:1883 ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1895 ../mail/e-mail-reader.c:1902
 msgid "Forward the selected message in the body of a new message"
 msgstr "åéèèåçéäåéææéäçåæä"
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1900
 msgid "Forward As _Inline"
 msgstr "äèåèå(_I)"
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1907
 msgid "_Quoted"
 msgstr "åæ(_Q)"
 
-#: ../mail/e-mail-reader.c:1897 ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1909 ../mail/e-mail-reader.c:1916
 msgid "Forward the selected message quoted like a reply"
 msgstr "åéèèåçéääåèéäæååå"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1914
 msgid "Forward As _Quoted"
 msgstr "äåæèå(_Q)"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1921
 msgid "_Load Images"
 msgstr "èååç(_L)"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1923
 msgid "Force images in HTML mail to be loaded"
 msgstr "éè HTML æåçéäæåèèååç"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1928
 msgid "_Important"
 msgstr "éè(_I)"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1930
 msgid "Mark the selected messages as important"
 msgstr "åéåçéäæçæéè"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1935
 msgid "_Junk"
 msgstr "ååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1937
 msgid "Mark the selected messages as junk"
 msgstr "åéåçéäæçæååéä"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1942
 msgid "_Not Junk"
 msgstr "äæååéä(_N)"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1944
 msgid "Mark the selected messages as not being junk"
 msgstr "åéåçéäæçæäæååéä"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1949
 msgid "_Read"
 msgstr "åéè(_R)"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1951
 msgid "Mark the selected messages as having been read"
 msgstr "åéåçéäæçæåçéè"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1956
 msgid "Uni_mportant"
 msgstr "äéè(_M)"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1958
 msgid "Mark the selected messages as unimportant"
 msgstr "åéåçéäæçæäéè"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1963
 msgid "_Unread"
 msgstr "æéè(_U)"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1965
 msgid "Mark the selected messages as not having been read"
 msgstr "åéåçéäæçææéè"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1970
 msgid "_Edit as New Message..."
 msgstr "çèçæéä(_E)â"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1972
 msgid "Open the selected messages in the composer for editing"
 msgstr "åæåèçéåéåçéäääçè"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1977
 msgid "Compose _New Message"
 msgstr "æåæéä(_N)"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1979
 msgid "Open a window for composing a mail message"
 msgstr "éåèçääæåéä"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1984
 msgid "_Open in New Window"
 msgstr "åæèçéå(_O)"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1986
 msgid "Open the selected messages in a new window"
 msgstr "äçæèçéåéåçéä"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1991
 msgid "_Move to Folder..."
 msgstr "çèèæå(_M)â"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1993
 msgid "Move selected messages to another folder"
 msgstr "åéåçéäçèåäåèæå"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1998
 msgid "_Switch to Folder"
 msgstr "åæèèæå(_S)"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2000
 msgid "Display the parent folder"
 msgstr "éçäåèæå"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2005
 msgid "Switch to _next tab"
 msgstr "åæèääååé(_N)"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2007
 msgid "Switch to the next tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2012
 msgid "Switch to _previous tab"
 msgstr "åæèääååé(_P)"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2014
 msgid "Switch to the previous tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2019
 msgid "Cl_ose current tab"
 msgstr "ééçåçåé(_O)"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2021
 msgid "Close current tab"
 msgstr "ééçåçåé"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2026
 msgid "_Next Message"
 msgstr "ääåéä(_N)"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2028
 msgid "Display the next message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2033
 msgid "Next _Important Message"
 msgstr "ääåéèéä(_I)"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2035
 msgid "Display the next important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2040
 msgid "Next _Thread"
 msgstr "ääåçééä(_T)"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2042
 msgid "Display the next thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2047
 msgid "Next _Unread Message"
 msgstr "ääåæéèçéä(_U)"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2049
 msgid "Display the next unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2054
 msgid "_Previous Message"
 msgstr "ääåéä(_P)"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2056
 msgid "Display the previous message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2061
 msgid "Pr_evious Important Message"
 msgstr "ääåéèéä(_E)"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2063
 msgid "Display the previous important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2068
 msgid "Previous T_hread"
 msgstr "ääåçééä(_H)"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2070
 msgid "Display the previous thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2075
 msgid "P_revious Unread Message"
 msgstr "ääåæéèçéä(_R)"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2077
 msgid "Display the previous unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2084
 msgid "Print this message"
 msgstr "ååéä"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2091
 msgid "Preview the message to be printed"
 msgstr "éèéèååçéä"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2096
 msgid "Re_direct"
 msgstr "éæåå(_D)"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2098
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "åéåçéäéæååçæä"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2103
 msgid "Remo_ve Attachments"
 msgstr "çééä(_V)"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2105
 msgid "Remove attachments"
 msgstr "çééä"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2110
 msgid "Remove Du_plicate Messages"
 msgstr "çééèçéä(_P)"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2112
 msgid "Checks selected messages for duplicates"
 msgstr "ææéåçéäæåæéè"
 
-#: ../mail/e-mail-reader.c:2105 ../mail/mail.error.xml.h:107
+#: ../mail/e-mail-reader.c:2117 ../mail/mail.error.xml.h:107
 #: ../modules/calendar/e-cal-shell-view-actions.c:1510
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "åèææä(_A)"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2119
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æååéçåéåéäçåéæäè"
 
-#: ../mail/e-mail-reader.c:2112 ../mail/mail.error.xml.h:108
+#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:108
 msgid "Reply to _List"
 msgstr "åèèæå(_L)"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2126
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æååéçæéåéäçéäèå"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2131
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "åèåäè(_R)"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2133
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æååéçæéåçéäçåäè"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2138
 msgid "_Save as mbox..."
 msgstr "ååæ mbox(_S)â"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2140
 msgid "Save selected messages as an mbox file"
 msgstr "åéåçéäååæ mbox ææ"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2145
 msgid "_Message Source"
 msgstr "éääæ(_M)"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2147
 msgid "Show the raw email source of the message"
 msgstr "éçéäååæ"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2159
 msgid "_Undelete Message"
 msgstr "åååééä(_U)"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2161
 msgid "Undelete the selected messages"
 msgstr "åæåééåçéä"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2166
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2168
 msgid "Reset the text to its original size"
 msgstr "éèæåçåååå"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2173
 msgid "_Zoom In"
 msgstr "æè(_Z)"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2175
 msgid "Increase the text size"
 msgstr "åæåæå"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2180
 msgid "Zoom _Out"
 msgstr "æé(_O)"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2182
 msgid "Decrease the text size"
 msgstr "åæåçå"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2189
 msgid "Create R_ule"
 msgstr "åçèå(_U)"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2196
 msgid "Ch_aracter Encoding"
 msgstr "åççç(_A)"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2203
 msgid "F_orward As"
 msgstr "èåç(_O)"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2210
 msgid "_Group Reply"
 msgstr "ççåè(_G)"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2217
 msgid "_Go To"
 msgstr "çè(_G)"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2224
 msgid "Mar_k As"
 msgstr "æçæ(_K)"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2231
 msgid "_Message"
 msgstr "éä(_M)"
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2238
 msgid "_Zoom"
 msgstr "çæ(_Z)"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2248
 msgid "Search Folder from Mailing _List..."
 msgstr "éäèåæåèæå(_L)â"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2250
 msgid "Create a search folder for this mailing list"
 msgstr "çéåéäèååçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2255
 msgid "Search Folder from Recipien_ts..."
 msgstr "åæäèæåèæå(_T)â"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2257
 msgid "Create a search folder for these recipients"
 msgstr "çéäæäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2262
 msgid "Search Folder from Sen_der..."
 msgstr "åäèæåèæå(_D)â"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2264
 msgid "Create a search folder for this sender"
 msgstr "çéååäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2269
 msgid "Search Folder from S_ubject..."
 msgstr "äææåèæå(_U)â"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2271
 msgid "Create a search folder for this subject"
 msgstr "çéåäæåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2294
 msgid "Mark for Follo_w Up..."
 msgstr "æççèé(_W)â"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2302
 msgid "Mark as _Important"
 msgstr "æçæéè(_I)"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2306
 msgid "Mark as _Junk"
 msgstr "æçæååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2310
 msgid "Mark as _Not Junk"
 msgstr "æçæéååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2314
 msgid "Mar_k as Read"
 msgstr "æçæåéè(_K)"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2318
 msgid "Mark as Uni_mportant"
 msgstr "æçæäéè(_M)"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2322
 msgid "Mark as _Unread"
 msgstr "æçææéè(_U)"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2366
 msgid "_Caret Mode"
 msgstr "æåæå(_C)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2368
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "åéççéäåæäéçéçææ"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2374
 msgid "All Message _Headers"
 msgstr "ææéäæé(_H)"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2376
 msgid "Show messages with all email headers"
 msgstr "éçéäåèçæé"
 
-#: ../mail/e-mail-reader.c:2679
+#: ../mail/e-mail-reader.c:2691
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æåååéäã%sã"
 
-#: ../mail/e-mail-reader.c:3599
+#: ../mail/e-mail-reader.c:3611
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "èå(_F)"
 
-#: ../mail/e-mail-reader.c:3600
+#: ../mail/e-mail-reader.c:3612
 msgid "Forward the selected message to someone"
 msgstr "åéåçéäèåçæä"
 
-#: ../mail/e-mail-reader.c:3619
+#: ../mail/e-mail-reader.c:3631
 msgid "Group Reply"
 msgstr "ççåè"
 
-#: ../mail/e-mail-reader.c:3620
+#: ../mail/e-mail-reader.c:3632
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "åèçéäèåïææçææçæäè"
 
-#: ../mail/e-mail-reader.c:3673 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3685 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "åé"
 
-#: ../mail/e-mail-reader.c:3706
+#: ../mail/e-mail-reader.c:3718
 #: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3710
+#: ../mail/e-mail-reader.c:3722
 #: ../modules/calendar/e-cal-shell-view-actions.c:1349
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3719 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3731 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "åè"
 
-#: ../mail/e-mail-reader.c:4420
+#: ../mail/e-mail-reader.c:4432
 #, c-format
 msgid "Folder '%s'"
 msgstr "èæåã%sã"
@@ -11380,37 +11427,32 @@ msgid "Search Folders"
 msgstr "æåèæå"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:1652 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:1656 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "ææ"
 
-#: ../mail/em-account-editor.c:1734 ../mail/em-account-editor.c:4762
-#: ../mail/em-account-editor.c:4797
-msgid "Never"
-msgstr "æä"
-
-#: ../mail/em-account-editor.c:1735
+#: ../mail/em-account-editor.c:1739
 msgid "Always"
 msgstr "æé"
 
-#: ../mail/em-account-editor.c:1736
+#: ../mail/em-account-editor.c:1740
 msgid "Ask for each message"
 msgstr "æåéäçèå"
 
-#: ../mail/em-account-editor.c:2872 ../mail/mail-config.ui.h:169
+#: ../mail/em-account-editor.c:2881 ../mail/mail-config.ui.h:170
 msgid "_Path:"
 msgstr "èå(_P):"
 
-#: ../mail/em-account-editor.c:2875
+#: ../mail/em-account-editor.c:2884
 msgid "Fil_e:"
 msgstr "ææ(_E):"
 
-#: ../mail/em-account-editor.c:2912
+#: ../mail/em-account-editor.c:2921
 msgid "Mail Configuration"
 msgstr "éäçæ"
 
-#: ../mail/em-account-editor.c:2913
+#: ../mail/em-account-editor.c:2922
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11420,45 +11462,45 @@ msgstr ""
 "\n"
 "æääãççãéåã "
 
-#: ../mail/em-account-editor.c:2916
+#: ../mail/em-account-editor.c:2925
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr "èåäéèåäçåçåééååããéææãçæäääåèåïééäåæåéåçéäåååéäèèã"
 
-#: ../mail/em-account-editor.c:2918 ../mail/em-account-editor.c:3110
+#: ../mail/em-account-editor.c:2927 ../mail/em-account-editor.c:3136
 msgid "Receiving Email"
 msgstr "ææéåéä"
 
-#: ../mail/em-account-editor.c:2919
+#: ../mail/em-account-editor.c:2928
 msgid "Please configure the following account settings."
 msgstr "èåèåäååèçèååã"
 
-#: ../mail/em-account-editor.c:2921 ../mail/em-account-editor.c:3712
+#: ../mail/em-account-editor.c:2930 ../mail/em-account-editor.c:3755
 msgid "Sending Email"
 msgstr "åééåéä"
 
-#: ../mail/em-account-editor.c:2922
+#: ../mail/em-account-editor.c:2931
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr "èèåääéæåééäæåçèèãåæääææïèèçççççåæççæåäæåã"
 
-#: ../mail/em-account-editor.c:2924
+#: ../mail/em-account-editor.c:2933
 msgid "Account Summary"
 msgstr "åèæè"
 
-#: ../mail/em-account-editor.c:2925
+#: ../mail/em-account-editor.c:2934
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr "éæçäååäéäçèååçæèã"
 
-#: ../mail/em-account-editor.c:2929
+#: ../mail/em-account-editor.c:2938
 msgid "Done"
 msgstr "åæ"
 
-#: ../mail/em-account-editor.c:2930
+#: ../mail/em-account-editor.c:2939
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11472,49 +11514,41 @@ msgstr ""
 "\n"
 "èæääãåçãååèåã"
 
-#: ../mail/em-account-editor.c:3475
+#: ../mail/em-account-editor.c:3502
 msgid "Check for _new messages every"
 msgstr "èåæææéäæ(_N)"
 
-#: ../mail/em-account-editor.c:3483
+#: ../mail/em-account-editor.c:3510
 msgid "minu_tes"
 msgstr "åé(_T)"
 
-#: ../mail/em-account-editor.c:4175 ../mail/mail-config.ui.h:109
+#: ../mail/em-account-editor.c:4218 ../mail/mail-config.ui.h:109
 msgid "Security"
 msgstr "ååæ"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:4230 ../mail/em-account-editor.c:4332
+#: ../mail/em-account-editor.c:4273 ../mail/em-account-editor.c:4375
 msgid "Receiving Options"
 msgstr "ææéé"
 
-#: ../mail/em-account-editor.c:4231 ../mail/em-account-editor.c:4333
+#: ../mail/em-account-editor.c:4274 ../mail/em-account-editor.c:4376
 msgid "Checking for New Messages"
 msgstr "æææéä"
 
-#: ../mail/em-account-editor.c:4756 ../mail/em-account-editor.c:4791
-msgid "Always (SSL)"
-msgstr "æé (SSL)"
-
-#: ../mail/em-account-editor.c:4759 ../mail/em-account-editor.c:4794
-msgid "When possible (TLS)"
-msgstr "åèçè (TLS)"
-
-#: ../mail/em-account-editor.c:4836
+#: ../mail/em-account-editor.c:4879
 msgid "Setup Google con_tacts with Evolution"
 msgstr "å Google èçäåå Evolu_tion"
 
-#: ../mail/em-account-editor.c:4843
+#: ../mail/em-account-editor.c:4886
 msgid "Setup Google ca_lendar with Evolution"
 msgstr "å Google ææåå Evo_lution"
 
-#: ../mail/em-account-editor.c:4891
+#: ../mail/em-account-editor.c:4934
 msgid "Setup _Yahoo calendar with Evolution"
 msgstr "å _Yahoo èäæåå Evolution"
 
-#: ../mail/em-account-editor.c:4916
+#: ../mail/em-account-editor.c:4959
 msgid "Yahoo Calen_dar name:"
 msgstr "Yahoo èäæåç(_D):"
 
@@ -11532,15 +11566,15 @@ msgstr "æ ${AbbrevWeekdayName}ï${Year}-${Month}-${Day} æ ${24Hour}:${Minut
 msgid "-----Original Message-----"
 msgstr "-----ååéä-----"
 
-#: ../mail/em-composer-utils.c:2418
+#: ../mail/em-composer-utils.c:2442
 msgid "an unknown sender"
 msgstr "äæçåäè"
 
-#: ../mail/em-composer-utils.c:2813
+#: ../mail/em-composer-utils.c:2837
 msgid "Posting destination"
 msgstr "åèçççç"
 
-#: ../mail/em-composer-utils.c:2814
+#: ../mail/em-composer-utils.c:2838
 msgid "Choose folders to post the message to."
 msgstr "éåèæåäåèéäã"
 
@@ -11598,195 +11632,207 @@ msgid "does not exist"
 msgstr "äåå"
 
 #: ../mail/em-filter-i18n.h:19
+msgid "does not have words"
+msgstr "äååæå"
+
+#: ../mail/em-filter-i18n.h:20
 msgid "does not return"
 msgstr "ææåå"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:21
 msgid "does not sound like"
 msgstr "äéä"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:22
 msgid "does not start with"
 msgstr "äæäæéå"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:24
 msgid "Draft"
 msgstr "èç"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:25
 msgid "ends with"
 msgstr "äæçç"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:27
 msgid "exists"
 msgstr "åå"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:28
 msgid "Expression"
 msgstr "èå"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:29
 msgid "Follow Up"
 msgstr "èé"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:30
 msgid "Forward to"
 msgstr "èåè"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:31
+msgid "has words"
+msgstr "ååæå"
+
+#: ../mail/em-filter-i18n.h:32
 msgid "Important"
 msgstr "éè"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:34
 msgid "is after"
 msgstr "æäåç"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:35
 msgid "is before"
 msgstr "æäåç"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:36
 msgid "is Flagged"
 msgstr "ææå"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:40
 msgid "is not Flagged"
 msgstr "æææå"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:41
 msgid "is not set"
 msgstr "æèå"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:42
 msgid "is set"
 msgstr "èå"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:67
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "ååéä"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:44
 msgid "Junk Test"
 msgstr "ååéäæè"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:45
 msgid "Label"
 msgstr "æç"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:46
 msgid "Mailing list"
 msgstr "éäåè"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:47
 msgid "Match All"
 msgstr "çååé"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:48
 msgid "Message Body"
 msgstr "éäåå"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:49
 msgid "Message Header"
 msgstr "éäæé"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:50
 msgid "Message is Junk"
 msgstr "ååéä"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:51
 msgid "Message is not Junk"
 msgstr "éååéä"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Message Location"
 msgstr "éääç"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:54
 msgid "Pipe to Program"
 msgstr "åççåçé"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:55
 msgid "Play Sound"
 msgstr "ææéæ"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "åè"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:57 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "æäè"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "Regex Match"
 msgstr "æèèçåçé"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "Replied to"
 msgstr "åè"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns"
 msgstr "åå"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "returns greater than"
 msgstr "åååæ"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:62
 msgid "returns less than"
 msgstr "åååæ"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:63
 msgid "Run Program"
 msgstr "åèçå"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:64 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "åæ"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "åäè"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Sender or Recipients"
 msgstr "åäèææäè"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Set Label"
 msgstr "èåæç"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "Set Status"
 msgstr "èåçæ"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Size (kB)"
 msgstr "åå (kB)"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "sounds like"
 msgstr "éä"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "Source Account"
 msgstr "äæåè"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:72
 msgid "Specific header"
 msgstr "æåæé"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "starts with"
 msgstr "äæéå"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Stop Processing"
 msgstr "åæèç"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:77
+msgid "Unset Color"
+msgstr "åæèåéè"
+
+#: ../mail/em-filter-i18n.h:78
 msgid "Unset Status"
 msgstr "åæèåçæ"
 
@@ -11799,27 +11845,27 @@ msgstr "æçææ"
 msgid "Add Ac_tion"
 msgstr "åååä(_T)"
 
-#: ../mail/em-folder-properties.c:144
+#: ../mail/em-folder-properties.c:145
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "æèéä:"
 
-#: ../mail/em-folder-properties.c:155
+#: ../mail/em-folder-properties.c:156
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ææéä:"
 
-#: ../mail/em-folder-properties.c:176
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "ééäçé (%s):"
 
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:179
 #, c-format
 msgid "Quota usage"
 msgstr "éåçé"
 
-#: ../mail/em-folder-properties.c:315
+#: ../mail/em-folder-properties.c:335
 msgid "Folder Properties"
 msgstr "èæååå"
 
@@ -11859,12 +11905,12 @@ msgstr "æåçåèæå %s"
 msgid "Copying folder %s"
 msgstr "æåèèèæå %s"
 
-#: ../mail/em-folder-tree.c:2103 ../mail/message-list.c:2301
+#: ../mail/em-folder-tree.c:2103 ../mail/message-list.c:2304
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æååéäçèèæå %s"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2306
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æåèèéäèèæå %s"
@@ -11907,93 +11953,93 @@ msgstr "æååéä"
 msgid "Formatting Message..."
 msgstr "æååéäâ"
 
-#: ../mail/em-format-html.c:1637 ../mail/em-format-html.c:1647
+#: ../mail/em-format-html.c:1636 ../mail/em-format-html.c:1650
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æåååã%sã"
 
-#: ../mail/em-format-html.c:1798 ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html.c:1801 ../mail/em-format-html-display.c:93
 msgid "Unsigned"
 msgstr "æçç"
 
-#: ../mail/em-format-html.c:1799 ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html.c:1802 ../mail/em-format-html-display.c:94
 msgid "Valid signature"
 msgstr "ææççç"
 
-#: ../mail/em-format-html.c:1800 ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html.c:1803 ../mail/em-format-html-display.c:95
 msgid "Invalid signature"
 msgstr "çæççç"
 
-#: ../mail/em-format-html.c:1801 ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html.c:1804 ../mail/em-format-html-display.c:96
 msgid "Valid signature, but cannot verify sender"
 msgstr "ççææïäæçææéåäè"
 
-#: ../mail/em-format-html.c:1802 ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:97
 msgid "Signature exists, but need public key"
 msgstr "ççååïäéèåéåçå"
 
-#: ../mail/em-format-html.c:1808 ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html.c:1811 ../mail/em-format-html-display.c:104
 msgid "Unencrypted"
 msgstr "æåå"
 
-#: ../mail/em-format-html.c:1809 ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html.c:1812 ../mail/em-format-html-display.c:105
 msgid "Encrypted, weak"
 msgstr "åååïäåå"
 
-#: ../mail/em-format-html.c:1810 ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html.c:1813 ../mail/em-format-html-display.c:106
 msgid "Encrypted"
 msgstr "ååå"
 
-#: ../mail/em-format-html.c:1811 ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html.c:1814 ../mail/em-format-html-display.c:107
 msgid "Encrypted, strong"
 msgstr "åååïåå"
 
-#: ../mail/em-format-html.c:2211
+#: ../mail/em-format-html.c:2207
 msgid "Unknown external-body part."
 msgstr "æççååææéåã"
 
-#: ../mail/em-format-html.c:2221
+#: ../mail/em-format-html.c:2217
 msgid "Malformed external-body part."
 msgstr "æåäèçååææéåã"
 
-#: ../mail/em-format-html.c:2252
+#: ../mail/em-format-html.c:2248
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP çæç (%s)"
 
-#: ../mail/em-format-html.c:2263
+#: ../mail/em-format-html.c:2259
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æåçææ (%s) æ ã%sãææçæç"
 
-#: ../mail/em-format-html.c:2265
+#: ../mail/em-format-html.c:2261
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æåæææç (%s)"
 
-#: ../mail/em-format-html.c:2286
+#: ../mail/em-format-html.c:2282
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "éçèææç (%s)"
 
-#: ../mail/em-format-html.c:2301
+#: ../mail/em-format-html.c:2297
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "äæçåéæææç (ã%sãéå)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:3009
+#: ../mail/em-format-html.c:3005
 #: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "åäèï%s"
 
-#: ../mail/em-format-html.c:3031
+#: ../mail/em-format-html.c:3027
 msgid "(no subject)"
 msgstr "(ææäæ)"
 
-#: ../mail/em-format-html.c:3107
+#: ../mail/em-format-html.c:3103
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "éåéäæç %s äè %s åå"
@@ -12054,56 +12100,62 @@ msgid ""
 "practical amount of time."
 msgstr "æéäåååïäçååçååæçæãçäçéäææéïåéçäåéæéæéäçååã"
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:253 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æèèæ(_V)"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:266
 msgid "This certificate is not viewable"
 msgstr "æèæçææè"
 
-#: ../mail/em-format-html-display.c:575
+#: ../mail/em-format-html-display.c:578
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr "Evolution çæéçæåéåéäïåçååèåèèççååãäåäçäæççæåæäçåéæåçèåäéèåã"
 
-#: ../mail/em-format-html-display.c:765
+#: ../mail/em-format-html-display.c:762
 msgid "Save Image"
 msgstr "åååç"
 
-#: ../mail/em-format-html-display.c:813
+#: ../mail/em-format-html-display.c:810
 msgid "Save _Image..."
 msgstr "åååç(_I)â"
 
-#: ../mail/em-format-html-display.c:815
+#: ../mail/em-format-html-display.c:812
 msgid "Save the image to a file"
 msgstr "ååçååçææ"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1013
 msgid "Completed on"
 msgstr "ååææ"
 
-#: ../mail/em-format-html-display.c:1028
+#: ../mail/em-format-html-display.c:1025
 msgid "Overdue:"
 msgstr "åææ:"
 
-#: ../mail/em-format-html-display.c:1036
+#: ../mail/em-format-html-display.c:1033
 msgid "by"
 msgstr "æ"
 
-#: ../mail/em-format-html-display.c:1317 ../mail/em-format-html-display.c:1368
+#: ../mail/em-format-html-display.c:1314 ../mail/em-format-html-display.c:1365
 msgid "View _Unformatted"
 msgstr "æéææçç(_U)"
 
-#: ../mail/em-format-html-display.c:1319
+#: ../mail/em-format-html-display.c:1316
 msgid "Hide _Unformatted"
 msgstr "éèææçç(_U)"
 
-#: ../mail/em-format-html-display.c:1390
+#: ../mail/em-format-html-display.c:1387
 msgid "O_pen With"
 msgstr "äâéå(_O)"
 
+#. Translators: Name of an Attachment button for a11y object
+#: ../mail/em-format-html-display.c:1396
+msgctxt "Button"
+msgid "Attachment"
+msgstr "éä"
+
 #: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
@@ -12128,7 +12180,7 @@ msgid "Subscribe To _All"
 msgstr "åéèé(_A)"
 
 #: ../mail/em-subscription-editor.c:971 ../mail/em-subscription-editor.c:1824
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "_Unsubscribe"
 msgstr "åæèé(_U)"
 
@@ -12165,7 +12217,7 @@ msgid "Su_bscribe"
 msgstr "èé(_B)"
 
 #: ../mail/em-subscription-editor.c:1823
-#: ../modules/mail/e-mail-shell-view-actions.c:1256
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Unsubscribe from the selected folder"
 msgstr "åæèééåçèæå"
 
@@ -12311,9 +12363,9 @@ msgstr "éäçèåèççéèéåã"
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
-"Define the email export format when doing drag'n'drop. Possible values are : "
+"Define the email export format when doing drag'n'drop. Possible values are "
 "mbox or pdf"
-msgstr "åçäçææåèæéåéäååçæåãåèçæåçïmbox æ pdf"
+msgstr "åçäçææåèæéåéäååçæåãåèçæåæïmbox æ pdf"
 
 #: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
@@ -12330,10 +12382,14 @@ msgid "Drag'n'drop export format"
 msgstr "ææååæå"
 
 #: ../mail/evolution-mail.schemas.in.h:79
+#, fuzzy
+#| msgid ""
+#| "Exported file name will be YYYYmmDDHHMMSS_email_title Possible values: 1 "
+#| "(: email sent date), 2 (: drag'n'drop date)"
 msgid ""
-"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
-"(: email sent date), 2 (: drag'n'drop date)"
-msgstr "ååçææåçææïYYYmmDDHHMMSS_email_title åèçæåï1 (: éåéäåéææ), 2 (: ææææ)"
+"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
+"email sent date), 2 (: drag'n'drop date)"
+msgstr "ååçææåçææïYYYYmmDDHHMMSS_email_title åèçæåï1 (: éåéäåéææ), 2 (: ææææ)"
 
 #: ../mail/evolution-mail.schemas.in.h:81
 msgid "Format of the drag'n'drop export filename"
@@ -12525,7 +12581,7 @@ msgid "Importing Elm data"
 msgstr "èå Elm èæ"
 
 #: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:460
-#: ../modules/mail/e-mail-shell-view.c:1035
+#: ../modules/mail/e-mail-shell-view.c:1042
 #: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "éä"
@@ -12701,292 +12757,307 @@ msgstr "æéèæèäåæ(_D)"
 msgid "Apply the same _view settings to all folders"
 msgstr "åææèæååççåçæèèåå(_V)"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:14
 #: ../modules/addressbook/addressbook-config.c:1090
 msgid "Authentication"
 msgstr "éè"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "èåæåèæçè(_E)"
 
-#: ../mail/mail-config.ui.h:17
-msgid "C_haracter set:"
-msgstr "åçé(_H):"
+#: ../mail/mail-config.ui.h:16
+msgid "Ch_aracter encoding:"
+msgstr "åççç(_A):"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "ææææçéå(_E) "
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "äèéæéææååéä(_S)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:19
 msgid "Check for new _messages on start"
 msgstr "ååææææéä(_M)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new messa_ges in all active accounts"
 msgstr "ææææäçäåèçæéä(_G)"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "ææåééäæåçååéä(_M)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "çæèåææææå(_T)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "æé(_A)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "æé(_R)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "æéåçéè(_M):"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "æåçèéä"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:27
 #: ../modules/plugin-manager/evolution-plugin-manager.c:160
 msgid "Configuration"
 msgstr "çæ"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "åéèæåæçè(_W)"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:29
 msgid "Confirmations"
 msgstr "çè"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:30
 #: ../modules/addressbook/autocompletion-config.c:188
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Date/Time Format"
 msgstr "ææ/æåæå"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "éèèç"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "éèåççç(_N):"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:34
 msgid "Delete Mail"
 msgstr "åééä"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:35
 msgid "Delete junk messages on e_xit"
 msgstr "ééæåéååéä(_X)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "çååéäåçç (PGP æ S/MIME) æäåéäæççç(_S)"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:39
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "çåéçéäåäæççç [éèå](_U)"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:40
 msgid "Displayed Message Headers"
 msgstr "éççéäæé"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "èåäèåæçéèéäåäèåéäæèçååéä(_K)"
 
-#: ../mail/mail-config.ui.h:43
-msgid "Do not quote"
-msgstr "ääçåæ"
-
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "èçå(_F):"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "éåéääå(_A):"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "ééææçåæçèæå(_X)"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:46
+#, fuzzy
+#| msgid "Encode file names in an _Outlook/GMail way"
+msgid "Encode filenames in an _Outlook/GMail way"
+msgstr "åææåçççç _Outlook/GMail åå"
+
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "ååèæ(_P):"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "åååéçéä (éèå)(_E)"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:49
 msgid "Encryption:"
 msgstr "ååï"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:50
 msgid "F_all back to threading messages by subject"
 msgstr "éååææäæççééä(_A)"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:51
 msgid "Fix_ed Width Font:"
 msgstr "ååéååå(_E):"
 
-#: ../mail/mail-config.ui.h:54
-msgid "Format messages in _HTML"
-msgstr "åéäæååç _HTML"
+#: ../mail/mail-config.ui.h:52
+msgid "For_mat messages in HTML"
+msgstr "ä HT_ML æååéä"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "åå(_E):"
 
-#: ../mail/mail-config.ui.h:57
-msgid "Group Reply goes only to mailing list, if possible"
-msgstr "åæåèïççåèåçæéäèå"
+#: ../mail/mail-config.ui.h:55
+msgid "Gro_up Reply goes only to mailing list, if possible"
+msgstr "åæåèïççåèåçæéäèå(_U)"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:56
 msgid "HTML Messages"
 msgstr "HTML éä"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:57
 msgid "H_TTP Proxy:"
 msgstr "H_TTP äçäæå:"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:58
 msgid "Header content"
 msgstr "æéåå"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:59
 msgid "Header name"
 msgstr "æéåç"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:60
 msgid "Headers"
 msgstr "æé"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:61
 msgid "Highlight _quotations with"
 msgstr "åèåæç(_Q)"
 
-#: ../mail/mail-config.ui.h:64
-msgid "Ignore Reply-To: for mailing lists"
-msgstr "åçéäèåç Reply-To:"
-
-#: ../mail/mail-config.ui.h:65
-msgid "Inline"
-msgstr "èå"
-
-#: ../mail/mail-config.ui.h:66
-msgid "Inline (Outlook style)"
-msgstr "èåïOutlook éæï"
+#: ../mail/mail-config.ui.h:62
+msgid "Ig_nore Reply-To: for mailing lists"
+msgstr "æéåçéäèåçåèæä(_N)"
 
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æç"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "èèè"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "æåèååç"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "éäæéè"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "äçäç"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "éäéç"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "éäåæ"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "ææäçäæåç(_P):"
 
-#: ../mail/mail-config.ui.h:77 ../modules/addressbook/ldap-config.ui.h:9
+#: ../mail/mail-config.ui.h:73 ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "ææåå"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "åææåçåçèéååéäæééåééåæèåçã"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:75
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "éææçèè"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "åé(_G):"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG åçå ID:"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "åç(_W):"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:80
 msgid "Personal Details:"
 msgstr "åäèçèæï"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:81
 #: ../modules/calendar/e-calendar-preferences.ui.h:23
 msgid "Pick a color"
 msgstr "æééè"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "éæå:"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:83
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "ååçéæ (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:85
 msgid "Proxy Settings"
 msgstr "äçäæåèåå"
 
-#: ../mail/mail-config.ui.h:90
-msgid "Quoted"
-msgstr "åæ"
-
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:86
 msgid "Re_member password"
 msgstr "èäåç(_M)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:87
 msgid "Re_ply-To:"
 msgstr "åèåå(_P):"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:89
 msgid "Remember _password"
 msgstr "èäåç(_P)"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:90
 msgid "Replies and Forwards"
 msgstr "åèåèå"
 
+#: ../mail/mail-config.ui.h:91
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "éä"
+
+#: ../mail/mail-config.ui.h:92
+msgctxt "ReplyForward"
+msgid "Do not quote"
+msgstr "ääçåæ"
+
+#: ../mail/mail-config.ui.h:93
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "èå"
+
+#: ../mail/mail-config.ui.h:94
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "èå (Outlook éæ)"
+
+#: ../mail/mail-config.ui.h:95
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "åæ"
+
 #: ../mail/mail-config.ui.h:96
 msgid "Required Information"
 msgstr "åèçèè"
@@ -13059,7 +13130,7 @@ msgstr "åéçäåèåéäèå(_P)"
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:117
 msgid "Sending a message with _recipients not entered as mail addresses"
-msgstr "åéçææèåææéääåçæäè(_R)"
+msgstr "åéçææèåææéåéäååçæäè(_R)"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:119
@@ -13186,133 +13257,140 @@ msgstr "äçéè(_N)"
 msgid "User _Name:"
 msgstr "äçèåç(_N):"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:153 ../plugins/caldav/caldav-source.c:249
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:660
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
+msgid "User_name:"
+msgstr "äçèåç(_N):"
+
+#: ../mail/mail-config.ui.h:155
 msgid "_Add Signature"
 msgstr "ååçåæ(_A)"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:156
 msgid "_Always load images from the Internet"
 msgstr "äåèççäèåç(_A)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:157
 msgid "_Authentication Type"
 msgstr "éèéå(_A)"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:158
 msgid "_Direct connection to the Internet"
 msgstr "çæéçåäèç(_D)"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:159
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "äççæèéè (ååæ _Outlook)"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:160
 msgid "_Forward style:"
 msgstr "èåæå(_F):"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:161
 msgid "_Junk Folder:"
 msgstr "ååéäèæå(_J):"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:162
 msgid "_Keep signature above the original message on replying"
 msgstr "åäæäçååéäççç(_K)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:163
 msgid "_Languages"
 msgstr "èè(_L)"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:164
 msgid "_Load images only in messages from contacts"
 msgstr "åèåçèçäååéääçåç(_L)"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:165
 msgid "_Lookup in local address book only"
 msgstr "ååæåéèéæè(_L)"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:166
 msgid "_Make this my default account"
 msgstr "èçæçéèåè(_M)"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:167
 msgid "_Manual proxy configuration:"
 msgstr "æåäçäæåçæ(_M):"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:169
 msgid "_Never load images from the Internet"
 msgstr "äåäèççäèåç(_N)"
 
-#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:171 ../modules/addressbook/ldap-config.ui.h:29
 msgid "_Port:"
 msgstr "éæå(_P):"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:172
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "çåé HTML éäçäææåéééäçèçäæéçæç(_P)"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:173
 msgid "_Reply style:"
 msgstr "åèæå(_R):"
 
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:174
 msgid "_Script:"
 msgstr "åäç(_S):"
 
-#: ../mail/mail-config.ui.h:174
+#: ../mail/mail-config.ui.h:175
 msgid "_Secure HTTP Proxy:"
 msgstr "åå HTTP äçäæå(_S):"
 
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:177
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "äæå(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:178
+#: ../mail/mail-config.ui.h:179
 msgid "_Show animated images"
 msgstr "ææåçåç(_S)"
 
-#: ../mail/mail-config.ui.h:179
+#: ../mail/mail-config.ui.h:180
 msgid "_Show the photograph of sender in the message preview"
 msgstr "åéäéèéçåäèçç(_S)"
 
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:181
 msgid "_Trash Folder:"
 msgstr "åæçèæå(_T):"
 
-#: ../mail/mail-config.ui.h:181
+#: ../mail/mail-config.ui.h:182
 msgid "_Use secure connection:"
 msgstr "äçååéç(_U):"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:183
 msgid "_Use system defaults"
 msgstr "äçççéèå(_U)"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:184
 msgid "_Use the same fonts as other applications"
 msgstr "äçèåäæççåçåçåå(_U)"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:185 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:185 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:186 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:186
+#: ../mail/mail-config.ui.h:187
 msgid "color"
 msgstr "èå"
 
-#: ../mail/mail-config.ui.h:187
+#: ../mail/mail-config.ui.h:188
 msgid "description"
 msgstr "æè"
 
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:189
 msgid "label"
 msgstr "æç"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:190
 msgid "none"
 msgstr "ææ"
 
@@ -13899,7 +13977,7 @@ msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
-"äåæäèçæèèçææçéääåï\n"
+"äåæäèçæèèçææçéåéäååï\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:121
@@ -13907,7 +13985,7 @@ msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
-"äåæäèçæèèçææçéääåï\n"
+"äåæäèçæèèçææçéåéäååï\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:124
@@ -14062,7 +14140,7 @@ msgid "_Discard changes"
 msgstr "ææææ(_D)"
 
 #: ../mail/mail.error.xml.h:157
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "_Empty Trash"
 msgstr "æçåæç(_E)"
 
@@ -14086,6 +14164,10 @@ msgstr "å(_N)"
 msgid "_Open Messages"
 msgstr "éåéä(_O)"
 
+#: ../mail/mail.error.xml.h:163
+msgid "_Overwrite"
+msgstr "èå(_O)"
+
 #: ../mail/mail.error.xml.h:165
 msgid "_Synchronize"
 msgstr "åæå(_S)"
@@ -14130,8 +14212,8 @@ msgstr "èåæåèæåï %s"
 
 #: ../mail/mail-vfolder.c:219
 #, c-format
-msgid "Updating Search Folders for '%s' : %s"
-msgstr "ææã%sãçæåèæåï%s"
+msgid "Updating Search Folders for '%s' - %s"
+msgstr "ææã%sãçæåèæå- %s"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
@@ -14200,57 +14282,57 @@ msgstr "é"
 msgid "Highest"
 msgstr "æé"
 
-#: ../mail/message-list.c:1906 ../widgets/table/e-cell-date.c:51
+#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1913 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %l:%M %p"
 msgstr "äå %p %l:%M"
 
-#: ../mail/message-list.c:1922
+#: ../mail/message-list.c:1925
 msgid "Yesterday %l:%M %p"
 msgstr "æå %p %l:%M"
 
-#: ../mail/message-list.c:1934
+#: ../mail/message-list.c:1937
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../mail/message-list.c:1942
+#: ../mail/message-list.c:1945
 msgid "%b %d %l:%M %p"
 msgstr "%mæ%dæ %p %l:%M"
 
-#: ../mail/message-list.c:1944
+#: ../mail/message-list.c:1947
 msgid "%b %d %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../mail/message-list.c:2743
+#: ../mail/message-list.c:2746
 msgid "Select all visible messages"
 msgstr "éæåéåèçéä"
 
-#: ../mail/message-list.c:2879 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2882 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "éä"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4092
+#: ../mail/message-list.c:4095
 msgid "Follow-up"
 msgstr "èé"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4629 ../mail/message-list.c:5049
+#: ../mail/message-list.c:4632 ../mail/message-list.c:5052
 msgid "Generating message list"
 msgstr "ççéäæå"
 
-#: ../mail/message-list.c:4866
+#: ../mail/message-list.c:4869
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "ææéäçåäçæåæäãåääçãæå->æéãéåéçäæéæåææèåã"
 
-#: ../mail/message-list.c:4868
+#: ../mail/message-list.c:4871
 msgid "There are no messages in this folder."
 msgstr "éåèæåäææéäã"
 
@@ -14288,27 +14370,27 @@ msgid "Subject - Trimmed"
 msgstr "äæ - åæç"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Body contains"
 msgstr "åæåå"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "Message contains"
 msgstr "éäåå"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Recipients contain"
 msgstr "æäèåå"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "Sender contains"
 msgstr "åäèåå"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Subject contains"
 msgstr "äæåå"
 
@@ -14383,11 +14465,11 @@ msgstr "æåæå"
 msgid "Downloading"
 msgstr "äèä"
 
-#: ../modules/addressbook/addressbook-config.c:1311
+#: ../modules/addressbook/addressbook-config.c:1312
 msgid "Address Book Properties"
 msgstr "éèéåå"
 
-#: ../modules/addressbook/addressbook-config.c:1313
+#: ../modules/addressbook/addressbook-config.c:1314
 msgid "New Address Book"
 msgstr "æéèé"
 
@@ -14502,7 +14584,7 @@ msgstr "åçæéèé"
 msgid "Contacts"
 msgstr "èçä"
 
-#: ../modules/addressbook/e-book-shell-backend.c:355
+#: ../modules/addressbook/e-book-shell-backend.c:356
 msgid "Certificates"
 msgstr "èæ"
 
@@ -14560,7 +14642,7 @@ msgstr "éçåéåéèéäææèçäçåå"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1405
 #: ../modules/calendar/e-memo-shell-view-actions.c:640
 #: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "_Rename..."
 msgstr "éæåå(_R)â"
 
@@ -14641,7 +14723,7 @@ msgstr "åä(_A)"
 #: ../modules/addressbook/e-book-shell-view-actions.c:944
 #: ../modules/calendar/e-memo-shell-view-actions.c:677
 #: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "_Preview"
 msgstr "éè(_P)"
 
@@ -14653,6 +14735,7 @@ msgid "_Delete"
 msgstr "åé(_D)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "_Properties"
 msgstr "åæ(_P)"
 
@@ -14679,7 +14762,7 @@ msgstr "åèçäéèèçéçåå"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1022
 #: ../modules/calendar/e-memo-shell-view-actions.c:747
 #: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1506
+#: ../modules/mail/e-mail-shell-view-actions.c:1548
 msgid "_Classic View"
 msgstr "åçæè(_C)"
 
@@ -14690,7 +14773,7 @@ msgstr "åèçäæåäæéçèçäéè"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1029
 #: ../modules/calendar/e-memo-shell-view-actions.c:754
 #: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "_Vertical View"
 msgstr "åçæè(_V)"
 
@@ -14716,7 +14799,7 @@ msgstr "ææççèæ"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "ééæå"
@@ -14863,8 +14946,8 @@ msgid "_Timeout:"
 msgstr "æé(_T):"
 
 #: ../modules/addressbook/ldap-config.ui.h:32
-msgid "cards"
-msgstr "åç"
+msgid "contacts"
+msgstr "èçä"
 
 #: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
@@ -15424,45 +15507,45 @@ msgstr "åæ"
 msgid "Birthdays & Anniversaries"
 msgstr "çæåéåçåæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-cal-shell-backend.c:449
 msgctxt "New"
 msgid "_Appointment"
 msgstr "çæ(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-backend.c:451
 #: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "åçäåæççæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:452
+#: ../modules/calendar/e-cal-shell-backend.c:456
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "åæçæ(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:454
+#: ../modules/calendar/e-cal-shell-backend.c:458
 msgid "Create a new all-day appointment"
 msgstr "åçæçåæçæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:459
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æè(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:461
+#: ../modules/calendar/e-cal-shell-backend.c:465
 msgid "Create a new meeting request"
 msgstr "åçææèèæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:469
+#: ../modules/calendar/e-cal-shell-backend.c:473
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "èäæ(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:471
+#: ../modules/calendar/e-cal-shell-backend.c:475
 #: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "åçæèäæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:794
+#: ../modules/calendar/e-cal-shell-backend.c:798
 msgid "Calendar and Tasks"
 msgstr "èäæèåä"
 
@@ -16158,343 +16241,356 @@ msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d éåä"
 
-#: ../modules/mail/em-account-prefs.c:209
-msgid "Evolution Account Assistant"
-msgstr "Evolution åèåç"
-
-#: ../modules/mail/em-account-prefs.c:253
-msgid "Account Editor"
-msgstr "åèçèå"
-
-#. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:384
+#: ../modules/mail/e-mail-attachment-handler.c:385
 #, c-format
-msgid "%d attached messages"
-msgstr "%d åéåçéä"
+msgid "%d attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "%d åéåçéä"
 
-#: ../modules/mail/e-mail-shell-backend.c:204
+#: ../modules/mail/e-mail-shell-backend.c:226
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "éäèæ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:206
+#: ../modules/mail/e-mail-shell-backend.c:228
 msgid "Compose a new mail message"
 msgstr "çèæçéäèæ"
 
-#: ../modules/mail/e-mail-shell-backend.c:214
+#: ../modules/mail/e-mail-shell-backend.c:236
+msgctxt "New"
+msgid "Mail Acco_unt"
+msgstr "éäåè(_U)"
+
+#: ../modules/mail/e-mail-shell-backend.c:238
+msgid "Create a new mail account"
+msgstr "åçæéäåè"
+
+#: ../modules/mail/e-mail-shell-backend.c:243
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "éäèæå(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:216
+#: ../modules/mail/e-mail-shell-backend.c:245
 msgid "Create a new mail folder"
 msgstr "åçæéäèæå"
 
-#: ../modules/mail/e-mail-shell-backend.c:431
+#: ../modules/mail/e-mail-shell-backend.c:460
 msgid "Mail Accounts"
 msgstr "éäåè"
 
-#: ../modules/mail/e-mail-shell-backend.c:439
+#: ../modules/mail/e-mail-shell-backend.c:469
 msgid "Mail Preferences"
 msgstr "éäååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:447
+#: ../modules/mail/e-mail-shell-backend.c:478
 msgid "Composer Preferences"
 msgstr "éäçèåååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:455
+#: ../modules/mail/e-mail-shell-backend.c:487
 msgid "Network Preferences"
 msgstr "ççååèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-#: ../modules/mail/e-mail-shell-view.c:944
+#: ../modules/mail/e-mail-shell-backend.c:721
+msgid "Evolution Account Assistant"
+msgstr "Evolution åèåç"
+
+#: ../modules/mail/e-mail-shell-backend.c:767
+msgid "Account Editor"
+msgstr "åèçèå"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view.c:947
 msgid "_Disable Account"
 msgstr "åçåè(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "Disable this account"
 msgstr "åçéååè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æäçéåææèæååçååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1163
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+msgid "Edit properties of this account"
+msgstr "çèéååèçåæ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "_Download Messages for Offline Usage"
 msgstr "äèéçäççéä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1165
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "äèæèçéçäççåèèèæåäéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Fl_ush Outbox"
 msgstr "æçåäå(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1177
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "_Copy Folder To..."
 msgstr "èèèæåå(_C)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1179
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Copy the selected folder into another folder"
 msgstr "èèåéåçèæåååäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1186
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Permanently remove this folder"
 msgstr "æäçééåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "E_xpunge"
 msgstr "åé(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1193
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æäçéåéåèæååååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Mar_k All Messages as Read"
 msgstr "æçææéäçåéè(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1200
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 msgid "Mark all messages in the folder as read"
 msgstr "åèæåäåéçéäæçæåéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "_Move Folder To..."
 msgstr "çåèæåå(_M)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1207
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Move the selected folder into another folder"
 msgstr "åéåçèæåçèåäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1250
 msgid "_New..."
 msgstr "æå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Create a new folder for storing mail"
 msgstr "åçäåæèæåäååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1221
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "Change the properties of this folder"
 msgstr "ææéåèæåçåæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Refresh the folder"
 msgstr "éæèåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Change the name of this folder"
 msgstr "ææéåèæåçåç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Select Message _Thread"
 msgstr "éæéäæé(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1242
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Select all messages in the same thread as the selected message"
 msgstr "éæææçéçéäçéåçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Select Message S_ubthread"
 msgstr "éæéäåçç(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Select all replies to the currently selected message"
 msgstr "éæææåèéåéäçä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Empty _Trash"
 msgstr "æçåæç(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æäçéåææåèååéååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "_New Label"
 msgstr "æåæç(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "N_one"
 msgstr "ææ(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1291
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "_Manage Subscriptions"
 msgstr "ççèé(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
-#: ../modules/mail/e-mail-shell-view-actions.c:1370
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "èéæåæèéåéçäæåçèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "Send / _Receive"
 msgstr "åé/ææ(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Send queued items and retrieve new items"
 msgstr "åéåéçéçäæææçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "R_eceive All"
 msgstr "åéææ(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Receive new items from all accounts"
 msgstr "ææåææåèåçæéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Send All"
 msgstr "åéåé(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "Send queued items in all accounts"
 msgstr "åéåææåèååéçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "Cancel the current mail operation"
 msgstr "åæçåéäæäçèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
+#: ../modules/mail/e-mail-shell-view-actions.c:1385
 msgid "Collapse All _Threads"
 msgstr "ææææçééä(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
 msgid "Collapse all message threads"
 msgstr "ææææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1354
+#: ../modules/mail/e-mail-shell-view-actions.c:1392
 msgid "E_xpand All Threads"
 msgstr "åéææçééä(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
 msgid "Expand all message threads"
 msgstr "åéææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1361
+#: ../modules/mail/e-mail-shell-view-actions.c:1399
 msgid "_Message Filters"
 msgstr "éäèå(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1363
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "Create or edit rules for filtering new mail"
 msgstr "çæéäåçæçèéæèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1368
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 msgid "_Subscriptions..."
 msgstr "èé(_S)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1415
 msgid "F_older"
 msgstr "èæå(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 msgid "_Label"
 msgstr "æç(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "C_reate Search Folder From Search..."
 msgstr "åæååçæåèæå(_R)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Search F_olders"
 msgstr "æåèæå(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1410
+#: ../modules/mail/e-mail-shell-view-actions.c:1448
 msgid "Create or edit search folder definitions"
 msgstr "åçæçèæåèæåçåç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1441
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "_New Folder..."
 msgstr "æåèæå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1469
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "Show Message _Preview"
 msgstr "éçéäéè(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1471
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Show message preview pane"
 msgstr "éçéäéèçæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Show _Deleted Messages"
 msgstr "éçååééä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "Show deleted messages with a line through them"
 msgstr "éçååéçéä (åäåéç)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1485
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
 msgid "_Group By Threads"
 msgstr "ææçééäççç(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1487
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "Threaded message list"
 msgstr "çééäæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Show message preview below the message list"
 msgstr "åéäæåäæéçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show message preview alongside the message list"
 msgstr "åéäæåæééçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1523
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "All Messages"
 msgstr "ææéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1530
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
 msgid "Important Messages"
 msgstr "éèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1537
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
 msgid "Last 5 Days' Messages"
 msgstr "æè 5 åçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1544
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Messages Not Junk"
 msgstr "éååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1551
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "Messages with Attachments"
 msgstr "æéäçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1558
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "No Label"
 msgstr "çæç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Read Messages"
 msgstr "åèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Recent Messages"
 msgstr "æèçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Unread Messages"
 msgstr "æèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Subject or Addresses contain"
 msgstr "äææéåéääååå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1641
+#: ../modules/mail/e-mail-shell-view-actions.c:1683
 msgid "All Accounts"
 msgstr "ææçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1648
+#: ../modules/mail/e-mail-shell-view-actions.c:1690
 msgid "Current Account"
 msgstr "çåçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1655
+#: ../modules/mail/e-mail-shell-view-actions.c:1697
 msgid "Current Folder"
 msgstr "çåçèæå"
 
@@ -16506,7 +16602,7 @@ msgstr "ææçåèæå"
 msgid "Account Search"
 msgstr "åèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:942
+#: ../modules/mail/e-mail-shell-view.c:945
 msgid "Proxy _Logout"
 msgstr "çåäçäæå(_L)"
 
@@ -16567,7 +16663,7 @@ msgstr "åæç"
 msgid "Send / Receive"
 msgstr "åé/ææ"
 
-#: ../modules/mail/em-composer-prefs.c:510
+#: ../modules/mail/em-composer-prefs.c:513
 msgid "Language(s)"
 msgstr "èè"
 
@@ -16794,7 +16890,7 @@ msgid ""
 "to your email accounts, and to import files from other applications."
 msgstr "æèäç Evolutionãääçéæè Evolution éçèäçéåéäåèïäåååäæççåååææã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:609
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
 msgid "Loading accounts..."
 msgstr "æåèååèâ"
 
@@ -17213,6 +17309,7 @@ msgstr "çè CalDAV èäæ"
 
 #: ../plugins/caldav/caldav-source.c:240
 #: ../plugins/calendar-http/calendar-http.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "_URL:"
 msgstr "çå(_U):"
 
@@ -17222,13 +17319,6 @@ msgstr "çå(_U):"
 msgid "Use _secure connection"
 msgstr "äçååéç(_S)"
 
-#: ../plugins/caldav/caldav-source.c:249
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:660
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
-msgid "User_name:"
-msgstr "äçèåç(_N):"
-
 #: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr "çèäæåçèäæ(_E)"
@@ -17255,8 +17345,10 @@ msgid "_Customize options"
 msgstr "èééé(_C)"
 
 #: ../plugins/calendar-file/calendar-file.c:153
-msgid "File _name:"
-msgstr "ææåç(_N):"
+#: ../widgets/misc/e-attachment-dialog.c:330
+#: ../widgets/misc/e-import-assistant.c:266
+msgid "F_ilename:"
+msgstr "ææåç(_I):"
 
 #: ../plugins/calendar-file/calendar-file.c:157
 msgid "Choose calendar file"
@@ -17493,16 +17585,12 @@ msgid "Command to be executed to launch the editor: "
 msgstr "çäååçèåçæä: "
 
 #: ../plugins/external-editor/external-editor.c:115
-#, fuzzy
-#| msgid ""
-#| "For Emacs use \"xemacs\"\n"
-#| "For VI use \"gvim -f\""
 msgid ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
 msgstr ""
-"Emacs äçãxemacsã\n"
-"VI äçãgvim -fã"
+"XEmacs äçãxemacsã\n"
+"Vim äçãgvim -fã"
 
 #: ../plugins/external-editor/external-editor.c:394
 #: ../plugins/external-editor/external-editor.c:396
@@ -17615,8 +17703,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:569
-#: ../plugins/mail-to-task/mail-to-task.c:828
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:838
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Unknown error."
 msgstr "äæçéèã"
 
@@ -18645,105 +18733,117 @@ msgid ""
 "old memo?"
 msgstr "éåçååéæååçååååéã%sããæåèçèæèçååéï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:641
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:643
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
-msgstr "äåçéæ %d åéäèèæçääãçåèæåååéåååï"
+msgid_plural ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+msgstr[0] "äåçéæ %d åéäèèæçääãçåèæåååéåååï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:644
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
-msgstr "äåçéæ %d åéäèèæçåäãçåèæåååéåååï"
+msgid_plural ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+msgstr[0] "äåçéæ %d åéäèèæçåäãçåèæåååéåååï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:647
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:655
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
-msgstr "äåçéæ %d åéäèèæçååéãçåèæåååéåååï"
+msgid_plural ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr[0] "äåçéæ %d åéäèèæçååéãçåèæåååéåååï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:666
+#: ../plugins/mail-to-task/mail-to-task.c:676
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "æåèççèæåéçéäï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:741
+#: ../plugins/mail-to-task/mail-to-task.c:751
 msgid "[No Summary]"
 msgstr "[æææè]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:763
 msgid "Invalid object returned from a server"
 msgstr "åäæåååçæççä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:803
+#: ../plugins/mail-to-task/mail-to-task.c:813
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "åèçæéççéèï%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:828
+#: ../plugins/mail-to-task/mail-to-task.c:838
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "çæéåèäæã%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:835
+#: ../plugins/mail-to-task/mail-to-task.c:845
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr "éåçäææåèçïåæäèåéèåçääãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:838
+#: ../plugins/mail-to-task/mail-to-task.c:848
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "éåçäææåèçïåæäèåéèåçåäãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:841
+#: ../plugins/mail-to-task/mail-to-task.c:851
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr "éåçäææåèçïåæäèåéèåçååéãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "äèååäææåã%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1152
+#: ../plugins/mail-to-task/mail-to-task.c:1162
 msgid "No writable calendar is available."
 msgstr "ææåååçèäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create an _Event"
 msgstr "åçää(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1256
 msgid "Create a new event from the selected message"
 msgstr "äéåçéäåçæçää"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1251
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a Mem_o"
 msgstr "åçååé(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1253
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 msgid "Create a new memo from the selected message"
 msgstr "äéåçéäåçæçååé"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1258
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a _Task"
 msgstr "åçåä(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1260
+#: ../plugins/mail-to-task/mail-to-task.c:1270
 msgid "Create a new task from the selected message"
 msgstr "äéåçéäåçæçåä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a _Meeting"
 msgstr "åçæè(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a new meeting from the selected message"
 msgstr "äéåçéäåçæçæè"
 
@@ -19227,10 +19327,6 @@ msgstr "WebDAV èçä"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
-msgid "URL:"
-msgstr "çå:"
-
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "éå IfM_atch (éäç Apache < 2.2.8)"
@@ -19741,7 +19837,7 @@ msgstr "éææèï%s"
 msgid "Execute these search parameters"
 msgstr "åèéäæååæ"
 
-#: ../shell/e-shell-window.c:445
+#: ../shell/e-shell-window.c:487
 msgid "New"
 msgstr "æå"
 
@@ -19752,7 +19848,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:189
+#: ../shell/main.c:188
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19787,7 +19883,7 @@ msgstr ""
 "æååæääååäææïèäæå\n"
 "çååæäæäæèï\n"
 
-#: ../shell/main.c:213
+#: ../shell/main.c:212
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19795,55 +19891,53 @@ msgstr ""
 "èè\n"
 "Evolution åçæä\n"
 
-#: ../shell/main.c:220
+#: ../shell/main.c:219
 msgid "Do not tell me again"
 msgstr "äèåéçéåèæ"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:311
+#: ../shell/main.c:310
 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:315
+#: ../shell/main.c:314
 msgid "Apply the given geometry to the main window"
 msgstr "åæåçåååçåäèç"
 
-#: ../shell/main.c:319
+#: ../shell/main.c:318
 msgid "Start in online mode"
 msgstr "äçäæååå"
 
-#: ../shell/main.c:321
+#: ../shell/main.c:320
 msgid "Ignore network availability"
 msgstr "åçäèçæååç"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:322
 msgid "Start in \"express\" mode"
 msgstr "äãåéãæååå"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:325
 msgid "Forcibly shut down Evolution"
 msgstr "ååéé Evoultion"
 
-#: ../shell/main.c:329
-msgid "Send the debugging output of all components to a file."
-msgstr "ååéåäçééèåèæåéèäåææã"
-
-#: ../shell/main.c:331
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "åçåääåæçåçèåã"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "åçéäãèçäååäçéèçæã"
 
-#: ../shell/main.c:337
-msgid "Import URIs or file names given as rest of arguments."
+#: ../shell/main.c:334
+#, fuzzy
+#| msgid "Import URIs or file names given as rest of arguments."
+msgid "Import URIs or filenames given as rest of arguments."
 msgstr "åæåç URI æææåçååçæääçåæã"
 
-#: ../shell/main.c:339
+#: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "èæåèäç Evolution çåçæ"
 
@@ -20078,27 +20172,27 @@ msgstr "MD5 æç"
 msgid "Email Address"
 msgstr "éåéääå"
 
-#: ../smime/gui/certificate-manager.c:575
+#: ../smime/gui/certificate-manager.c:576
 msgid "Select a certificate to import..."
 msgstr "éåèååçèæâ"
 
-#: ../smime/gui/certificate-manager.c:588
+#: ../smime/gui/certificate-manager.c:589
 msgid "All files"
 msgstr "ææææ"
 
-#: ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/certificate-manager.c:624
 msgid "Failed to import certificate"
 msgstr "çæååèæ"
 
-#: ../smime/gui/certificate-manager.c:992
+#: ../smime/gui/certificate-manager.c:993
 msgid "All PKCS12 files"
 msgstr "ææç PKCS12 ææ"
 
-#: ../smime/gui/certificate-manager.c:1009
+#: ../smime/gui/certificate-manager.c:1010
 msgid "All email certificate files"
 msgstr "ææçéåéäèæææ"
 
-#: ../smime/gui/certificate-manager.c:1026
+#: ../smime/gui/certificate-manager.c:1027
 msgid "All CA certificate files"
 msgstr "ææç CA èæææ"
 
@@ -20741,10 +20835,6 @@ msgstr "çæååéä"
 msgid "Attachment Properties"
 msgstr "éäåå"
 
-#: ../widgets/misc/e-attachment-dialog.c:330
-msgid "_Filename:"
-msgstr "ææåç(_F):"
-
 #: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "MIME éåï"
@@ -20807,40 +20897,40 @@ msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "ååéä"
 
-#: ../widgets/misc/e-attachment-view.c:404
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Open With Other Application..."
 msgstr "äåäæççåéåâ"
 
-#: ../widgets/misc/e-attachment-view.c:411
+#: ../widgets/misc/e-attachment-view.c:386
 msgid "S_ave All"
 msgstr "åååé(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:437
+#: ../widgets/misc/e-attachment-view.c:412
 msgid "A_dd Attachment..."
 msgstr "ååéä(_A)â"
 
-#: ../widgets/misc/e-attachment-view.c:461
+#: ../widgets/misc/e-attachment-view.c:436
 msgid "_Hide"
 msgstr "éè(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:468
+#: ../widgets/misc/e-attachment-view.c:443
 msgid "Hid_e All"
 msgstr "åééè(_E)"
 
-#: ../widgets/misc/e-attachment-view.c:475
+#: ../widgets/misc/e-attachment-view.c:450
 msgid "_View Inline"
 msgstr "æèèå(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:482
+#: ../widgets/misc/e-attachment-view.c:457
 msgid "Vie_w All Inline"
 msgstr "åéäèåæè(_W)"
 
-#: ../widgets/misc/e-attachment-view.c:803
+#: ../widgets/misc/e-attachment-view.c:778
 #, c-format
 msgid "Open With \"%s\""
 msgstr "äã%sãéå"
 
-#: ../widgets/misc/e-attachment-view.c:806
+#: ../widgets/misc/e-attachment-view.c:781
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å %s äéåéåéä"
@@ -20926,10 +21016,6 @@ msgid ""
 "of file it is from the list."
 msgstr "éåèåå Evolution çææïääåæååéåææéåã"
 
-#: ../widgets/misc/e-import-assistant.c:266
-msgid "F_ilename:"
-msgstr "ææåç(_I):"
-
 #: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "éæäåææ"
@@ -21041,7 +21127,7 @@ msgstr "Evolution çåçéçæåãæääææéäéèçäå
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "åççççæäçïEvolution çåçéçæåã"
 
-#: ../widgets/misc/e-preferences-window.c:279
+#: ../widgets/misc/e-preferences-window.c:308
 msgid "Evolution Preferences"
 msgstr "Evolution ååèå"
 
@@ -21598,3 +21684,36 @@ msgstr "åééå"
 #: ../widgets/text/e-text.c:2340
 msgid "Input Methods"
 msgstr "èåæ"
+
+#~ msgid "Recent _Documents"
+#~ msgstr "æèäçæä(_D)"
+
+#~ msgid "Categor_ies..."
+#~ msgstr "åé(_I)â"
+
+#~ msgid "File exists \"{0}\"."
+#~ msgstr "ææåååã{0}ãã"
+
+#~ msgid "Do you wish to overwrite it?"
+#~ msgstr "èèåå?"
+
+#~ msgid "File _name:"
+#~ msgstr "ææåç(_N):"
+
+#~ msgid "_Filename:"
+#~ msgstr "ææåç(_F):"
+
+#~ msgid "never"
+#~ msgstr "æä"
+
+#~ msgid "C_haracter set:"
+#~ msgstr "ååé(_H):"
+
+#~ msgid "cards"
+#~ msgstr "åç"
+
+#~ msgid "URL:"
+#~ msgstr "çå:"
+
+#~ msgid "Send the debugging output of all components to a file."
+#~ msgstr "ååéåäçééèåèæåéèäåææã"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 36454b2..cbcdf46 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,10 +10,10 @@
 #: ../shell/main.c:570
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 3.3.4\n"
+"Project-Id-Version: evolution 3.3.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-29 23:13+0800\n"
-"PO-Revision-Date: 2012-01-29 08:41+0800\n"
+"POT-Creation-Date: 2012-02-18 08:38+0800\n"
+"PO-Revision-Date: 2012-02-17 22:41+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "Language: zh_TW\n"
@@ -265,8 +265,8 @@ msgstr "éåçåæ"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:719
-#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
-#: ../shell/main.c:134
+#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:83
+#: ../shell/main.c:133
 msgid "Birthday"
 msgstr "çæ"
 
@@ -278,6 +278,7 @@ msgstr "éèæï"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Ca_tegories..."
 msgstr "åé(_T)â"
 
@@ -697,7 +698,7 @@ msgid "_List name:"
 msgstr "åååç(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:176
 msgid "_Select..."
 msgstr "éå(_S)â"
 
@@ -1398,27 +1399,39 @@ msgid "Importing..."
 msgstr "ååâ"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1075
-msgid "Outlook CSV or Tab (.csv, .tab)"
+#, fuzzy
+#| msgid "Outlook CSV or Tab (.csv, .tab)"
+msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1076
-msgid "Outlook CSV and Tab Importer"
+#, fuzzy
+#| msgid "Outlook CSV and Tab Importer"
+msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook CSV è Tab ååçå"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1084
-msgid "Mozilla CSV or Tab (.csv, .tab)"
+#, fuzzy
+#| msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1085
-msgid "Mozilla CSV and Tab Importer"
+#, fuzzy
+#| msgid "Mozilla CSV and Tab Importer"
+msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla CSV è Tab ååçå"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1093
-msgid "Evolution CSV or Tab (.csv, .tab)"
+#, fuzzy
+#| msgid "Evolution CSV or Tab (.csv, .tab)"
+msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1094
-msgid "Evolution CSV and Tab Importer"
+#, fuzzy
+#| msgid "Evolution CSV and Tab Importer"
+msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution CSV è Tab ååçå"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:796
@@ -2145,7 +2158,7 @@ msgid "Description Contains"
 msgstr "æèåå"
 
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:23
 msgid "Do Not Exist"
 msgstr "äåå"
 
@@ -2154,7 +2167,7 @@ msgid "Exactly"
 msgstr "ååçå"
 
 #: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:26
 msgid "Exist"
 msgstr "åå"
 
@@ -2227,12 +2240,12 @@ msgid "does not contain"
 msgstr "äåå"
 
 #: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:33
 msgid "is"
 msgstr "æ"
 
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:39
 msgid "is not"
 msgstr "äæ"
 
@@ -2276,7 +2289,7 @@ msgstr "èèæéèé"
 msgid "Mes_sage:"
 msgstr "èæ(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:80
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:76
 msgid "Options"
 msgstr "éé"
 
@@ -2369,7 +2382,7 @@ msgstr "éå:"
 msgid "_Type:"
 msgstr "éå(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:262 ../mail/mail-config.ui.h:167
+#: ../calendar/gui/dialogs/calendar-setup.c:262 ../mail/mail-config.ui.h:168
 #: ../modules/addressbook/ldap-config.ui.h:28
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
@@ -2399,7 +2412,7 @@ msgstr "éè(_R):"
 #: ../calendar/gui/dialogs/calendar-setup.c:462
 #: ../calendar/gui/dialogs/calendar-setup.c:474
 #: ../calendar/gui/dialogs/calendar-setup.c:485
-#: ../mail/em-folder-properties.c:234 ../mail/mail-config.ui.h:56
+#: ../mail/em-folder-properties.c:254 ../mail/mail-config.ui.h:54
 #: ../modules/addressbook/addressbook-config.c:1082
 #: ../modules/addressbook/autocompletion-config.c:240
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
@@ -2486,101 +2499,101 @@ msgstr "%s  æåçåääèæãææéäèæääææéåç
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  æææåääèæïææéåçèåï"
 
-#: ../calendar/gui/dialogs/comp-editor.c:276
+#: ../calendar/gui/dialogs/comp-editor.c:275
 msgid "Could not save attachments"
 msgstr "çæååéä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:621
 msgid "Could not update object"
 msgstr "çæææçä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:750
+#: ../calendar/gui/dialogs/comp-editor.c:749
 msgid "Edit Appointment"
 msgstr "çèçæ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:757
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Meeting - %s"
 msgstr "æè - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:759
+#: ../calendar/gui/dialogs/comp-editor.c:758
 #, c-format
 msgid "Appointment - %s"
 msgstr "çæ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:765
+#: ../calendar/gui/dialogs/comp-editor.c:764
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ææçåä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Task - %s"
 msgstr "åä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:771
 #, c-format
 msgid "Memo - %s"
 msgstr "ååé - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:788
+#: ../calendar/gui/dialogs/comp-editor.c:787
 msgid "No Summary"
 msgstr "æææè"
 
-#: ../calendar/gui/dialogs/comp-editor.c:909
+#: ../calendar/gui/dialogs/comp-editor.c:908
 msgid "Keep original item?"
 msgstr "æåäæååéçï"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Close the current window"
 msgstr "ééçåçèç"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129 ../mail/e-mail-browser.c:137
+#: ../calendar/gui/dialogs/comp-editor.c:1128 ../mail/e-mail-browser.c:137
 #: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:144
+#: ../calendar/gui/dialogs/comp-editor.c:1135 ../mail/e-mail-browser.c:144
 #: ../shell/e-shell-window-actions.c:1474
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "åäéåçå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1142
 #: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "åééåçå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1149
 msgid "View help"
 msgstr "æèæå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157 ../mail/e-mail-browser.c:151
+#: ../calendar/gui/dialogs/comp-editor.c:1156 ../mail/e-mail-browser.c:151
 #: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
 #: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "èäåèççåå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1177
 msgid "Save current changes"
 msgstr "ååçåçèæ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:158
+#: ../calendar/gui/dialogs/comp-editor.c:1184 ../mail/e-mail-browser.c:158
 #: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "éåæææå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../calendar/gui/dialogs/comp-editor.c:1191
 msgid "_Classification"
 msgstr "æé(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1199
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:172
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
@@ -2589,136 +2602,131 @@ msgstr "æé(_C)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206 ../mail/e-mail-browser.c:165
+#: ../calendar/gui/dialogs/comp-editor.c:1205 ../mail/e-mail-browser.c:165
 #: ../shell/e-shell-window-actions.c:1621
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "ææ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1212
 #: ../shell/e-shell-window-actions.c:1628
 msgid "_Help"
 msgstr "æå(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1220
+#: ../calendar/gui/dialogs/comp-editor.c:1219
 msgid "_Insert"
 msgstr "æå(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1227
+#: ../calendar/gui/dialogs/comp-editor.c:1226
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "éé(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1234 ../mail/e-mail-browser.c:179
+#: ../calendar/gui/dialogs/comp-editor.c:1233 ../mail/e-mail-browser.c:179
 #: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244
+#: ../calendar/gui/dialogs/comp-editor.c:1243
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "éä(_A)â"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1246
+#: ../calendar/gui/dialogs/comp-editor.c:1245
 #: ../composer/e-composer-actions.c:290
-#: ../widgets/misc/e-attachment-view.c:439
+#: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "éåææ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1253
 msgid "_Categories"
 msgstr "åé(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1255
 msgid "Toggles whether to display categories"
 msgstr "åææåéçãåéã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1261
 msgid "Time _Zone"
 msgstr "æå(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../calendar/gui/dialogs/comp-editor.c:1263
 msgid "Toggles whether the time zone is displayed"
 msgstr "åææåéçãæåã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1273
+#: ../calendar/gui/dialogs/comp-editor.c:1272
 msgid "Pu_blic"
 msgstr "åé(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1274
 msgid "Classify as public"
 msgstr "åéçåé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "_Private"
 msgstr "çä(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1281
 msgid "Classify as private"
 msgstr "æéççä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "_Confidential"
 msgstr "æå(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 msgid "Classify as confidential"
 msgstr "æéçæå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1297
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "R_ole Field"
 msgstr "èèæä(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Toggles whether the Role field is displayed"
 msgstr "åææåéçãèèãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1304
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1307
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "åææåéçãRSVPãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "_Status Field"
 msgstr "çææä(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Toggles whether the Status field is displayed"
 msgstr "åææåéçãçæãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1321
+#: ../calendar/gui/dialogs/comp-editor.c:1320
 msgid "_Type Field"
 msgstr "éåæä(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "åææåéçãåæèéåãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1347
-#: ../composer/e-composer-private.c:77
-msgid "Recent _Documents"
-msgstr "æèäçæä(_D)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2079
+#: ../calendar/gui/dialogs/comp-editor.c:2044
 #: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "éå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2427
-#: ../calendar/gui/dialogs/comp-editor.c:2590
-#: ../calendar/gui/dialogs/comp-editor.c:3582
+#: ../calendar/gui/dialogs/comp-editor.c:2390
+#: ../calendar/gui/dialogs/comp-editor.c:2553
+#: ../calendar/gui/dialogs/comp-editor.c:3545
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "åæææçææïåæææåæéçæåçèæ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3546
+#: ../calendar/gui/dialogs/comp-editor.c:3509
 #: ../plugins/prefer-plain/prefer-plain.c:66
 msgid "attachment"
 msgstr "éä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3614
+#: ../calendar/gui/dialogs/comp-editor.c:3577
 msgid "Unable to use current version!"
 msgstr "çæäççåççæï"
 
@@ -2731,15 +2739,15 @@ msgstr "çèäçéèï %s"
 msgid "Could not open destination"
 msgstr "çæéåççå"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:126
 msgid "Destination is read only"
 msgstr "ççåæåè"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+#: ../calendar/gui/dialogs/copy-source-dialog.c:160
 msgid "Cannot create object"
 msgstr "äèåççä"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+#: ../calendar/gui/dialogs/copy-source-dialog.c:189
 msgid "Could not open source"
 msgstr "çæéåäæ"
 
@@ -2910,7 +2918,6 @@ msgstr "éåääåææé"
 
 #: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:7
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æèåéä(_G):"
 
@@ -3161,12 +3168,18 @@ msgid "Unable to open memos in '%s': %s"
 msgstr "çæåã%sãéåååéï%s"
 
 #: ../calendar/gui/dialogs/memo-page.c:1154 ../em-format/em-format.c:1062
-#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2667
-#: ../mail/em-format-html.c:2732 ../mail/em-format-html.c:2756
+#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2663
+#: ../mail/em-format-html.c:2728 ../mail/em-format-html.c:2752
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "æäè"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+msgid "Organi_zer:"
+msgstr "æèåéä(_Z):"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
 #: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
@@ -3394,7 +3407,7 @@ msgstr "æ"
 msgid "Exceptions"
 msgstr "äå"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:88
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
 msgid "Preview"
 msgstr "éè"
 
@@ -3546,7 +3559,7 @@ msgstr "çæ(_U):"
 #: ../calendar/gui/e-cal-model.c:3500
 #: ../calendar/gui/e-meeting-list-view.c:661
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "çæ"
@@ -3618,11 +3631,6 @@ msgid ""
 "assigned tasks"
 msgstr "äèçèåäïåçéåçåäæåäææææåä"
 
-#: ../calendar/gui/dialogs/task-page.c:350
-#: ../calendar/gui/dialogs/task-page.ui.h:4
-msgid "Organi_zer:"
-msgstr "æèåéä(_Z):"
-
 #: ../calendar/gui/dialogs/task-page.c:822
 msgid "Due date is wrong"
 msgstr "åææéè"
@@ -3632,10 +3640,6 @@ msgstr "åææéè"
 msgid "Unable to open tasks in '%s': %s"
 msgstr "çæåã%sãéååäï%s"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Categor_ies..."
-msgstr "åé(_I)â"
-
 #: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "åææ(_U):"
@@ -3751,7 +3755,7 @@ 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:204 ../calendar/gui/e-day-view.c:1838
+#: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1839
 #: ../calendar/gui/e-day-view-top-item.c:852
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../modules/calendar/e-cal-shell-view-private.c:1054
@@ -3783,7 +3787,7 @@ 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:234 ../calendar/gui/e-day-view.c:1854
+#: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1855
 #: ../calendar/gui/e-day-view-top-item.c:856
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../modules/calendar/e-cal-shell-view-private.c:1090
@@ -3921,7 +3925,7 @@ msgstr "çæï"
 msgid "Priority:"
 msgstr "ååççï"
 
-#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "æèï"
 
@@ -4162,14 +4166,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1021 ../calendar/gui/e-week-view.c:773
+#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:774
 #: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
 #: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
 msgid "am"
 msgstr "äå"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1024 ../calendar/gui/e-week-view.c:776
+#: ../calendar/gui/e-day-view.c:1025 ../calendar/gui/e-week-view.c:777
 #: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
 #: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
 msgid "pm"
@@ -4181,13 +4185,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:1821 ../calendar/gui/e-day-view-top-item.c:848
+#: ../calendar/gui/e-day-view.c:1822 ../calendar/gui/e-day-view-top-item.c:848
 #: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1982
 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:2638
+#: ../calendar/gui/e-day-view.c:2639
 #, c-format
 msgid "Week %d"
 msgstr "ç %d é"
@@ -4869,11 +4873,11 @@ msgstr "ååæ"
 msgid "In progress"
 msgstr "æåéè"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:37
 msgid "is greater than"
 msgstr "åæ"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:38
 msgid "is less than"
 msgstr "åæ"
 
@@ -6609,38 +6613,38 @@ msgid "Pacific/Yap"
 msgstr "ååæ/éæå"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:153
+#: ../capplet/anjal-settings-main.c:161
 msgid "ID of the socket to embed in"
 msgstr "socket ç IDïååæ"
 
-#: ../capplet/anjal-settings-main.c:154
+#: ../capplet/anjal-settings-main.c:162
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "èèåæçååã"
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
 msgstr "èèåæçéåéääåã"
 
-#: ../capplet/settings/mail-account-view.c:78
+#: ../capplet/settings/mail-account-view.c:79
 msgid "The email address you have entered is invalid."
 msgstr "æèåçéåéääåæçæçã"
 
-#: ../capplet/settings/mail-account-view.c:79
+#: ../capplet/settings/mail-account-view.c:80
 msgid "Please enter your password."
 msgstr "èèåæçåçã"
 
-#: ../capplet/settings/mail-account-view.c:280
-#: ../mail/em-account-editor.c:5352 ../plugins/caldav/caldav-source.c:67
+#: ../capplet/settings/mail-account-view.c:282
+#: ../mail/em-account-editor.c:5395 ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:374
-#: ../capplet/settings/mail-account-view.c:419
-#: ../mail/em-account-editor.c:5223 ../mail/em-account-editor.c:5280
+#: ../capplet/settings/mail-account-view.c:376
+#: ../capplet/settings/mail-account-view.c:421
+#: ../mail/em-account-editor.c:5266 ../mail/em-account-editor.c:5323
 #: ../modules/online-accounts/e-online-accounts-google.c:295
 #: ../modules/online-accounts/e-online-accounts-google.c:369
 #: ../plugins/google-account-setup/google-contacts-source.c:55
@@ -6648,52 +6652,66 @@ msgstr "CalDAV"
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:486
+#: ../capplet/settings/mail-account-view.c:498
+#: ../capplet/settings/mail-account-view.c:602
+#: ../mail/em-account-editor.c:4799 ../mail/em-account-editor.c:4834
+msgid "Always (SSL)"
+msgstr "æé (SSL)"
+
+#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:605
+#: ../mail/em-account-editor.c:4802 ../mail/em-account-editor.c:4837
+msgid "When possible (TLS)"
+msgstr "åèçè (TLS)"
+
+#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:1738 ../mail/em-account-editor.c:4805
+#: ../mail/em-account-editor.c:4840
+msgid "Never"
+msgstr "æä"
+
+#: ../capplet/settings/mail-account-view.c:512
 msgid "Personal details:"
 msgstr "åäèçèæï"
 
-#: ../capplet/settings/mail-account-view.c:493 ../mail/mail-config.ui.h:75
+#: ../capplet/settings/mail-account-view.c:519 ../mail/mail-config.ui.h:71
 msgid "Name:"
 msgstr "åçï"
 
-#: ../capplet/settings/mail-account-view.c:502 ../mail/mail-config.ui.h:46
+#: ../capplet/settings/mail-account-view.c:528 ../mail/mail-config.ui.h:44
 msgid "Email address:"
 msgstr "Email äåï"
 
-#: ../capplet/settings/mail-account-view.c:512 ../mail/mail-config.ui.h:38
+#: ../capplet/settings/mail-account-view.c:538 ../mail/mail-config.ui.h:37
 msgid "Details:"
 msgstr "èçèæï"
 
-#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:93
+#: ../capplet/settings/mail-account-view.c:546 ../mail/mail-config.ui.h:88
 msgid "Receiving"
 msgstr "ææä"
 
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:129
+#: ../capplet/settings/mail-account-view.c:553 ../mail/mail-config.ui.h:129
 msgid "Server type:"
 msgstr "äæåéåï"
 
-#: ../capplet/settings/mail-account-view.c:536 ../mail/mail-config.ui.h:128
+#: ../capplet/settings/mail-account-view.c:562 ../mail/mail-config.ui.h:128
 msgid "Server address:"
 msgstr "äæåäåï"
 
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:153
+#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:154
 msgid "Username:"
 msgstr "äçèåçï"
 
-#: ../capplet/settings/mail-account-view.c:554
+#: ../capplet/settings/mail-account-view.c:580
 msgid "Use encryption:"
 msgstr "äçååï"
 
-#: ../capplet/settings/mail-account-view.c:559
-#: ../capplet/settings/mail-account-view.c:594
-msgid "never"
-msgstr "æä"
-
-#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:113
+#: ../capplet/settings/mail-account-view.c:613 ../mail/mail-config.ui.h:113
 msgid "Sending"
 msgstr "åéä"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:656
 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. "
@@ -6703,7 +6721,7 @@ msgstr ""
 "çïæåæåèäæåææçèååãåææåçæèååæéåæéïæåéèäç"
 "èååèçäæåèçèæã"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:658
 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 "
@@ -6712,11 +6730,11 @@ msgstr ""
 "ææïæåçæèåæåæçéäèååãèåäéèåååãæåæäæååèåç"
 "èçèæèèéåïäææäæåèéèæèååã"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:660
 msgid "You can specify more options to configure the account."
 msgstr "æåäæåæåçäèåéååèçééã"
 
-#: ../capplet/settings/mail-account-view.c:619
+#: ../capplet/settings/mail-account-view.c:662
 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."
@@ -6724,113 +6742,113 @@ msgstr ""
 "çåæåéèæçèååæèåééäãæååçèèçæéåèåïäæææèææ"
 "ååäéèçèã"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:663
 msgid "You can specify your default settings for your account."
 msgstr "æåäæåèååèçéèèååã"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:664
 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:636
-#: ../mail/em-account-editor.c:2915 ../mail/em-account-editor.c:3051
+#: ../capplet/settings/mail-account-view.c:679
+#: ../mail/em-account-editor.c:2924 ../mail/em-account-editor.c:3063
 msgid "Identity"
 msgstr "èå"
 
-#: ../capplet/settings/mail-account-view.c:636
+#: ../capplet/settings/mail-account-view.c:679
 msgid "Next - Receiving mail"
 msgstr "ääæ - ææéä"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Receiving mail"
 msgstr "ææéä"
 
-#: ../capplet/settings/mail-account-view.c:637
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:681
 msgid "Next - Sending mail"
 msgstr "ääæ - åééä"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Back - Identity"
 msgstr "ääæ - èå"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:680
 msgid "Next - Receiving options"
 msgstr "ääæ - ææéé"
 
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:681
 msgid "Receiving options"
 msgstr "ææéé"
 
-#: ../capplet/settings/mail-account-view.c:638
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:681
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Back - Receiving mail"
 msgstr "ääæ - ææéä"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Sending mail"
 msgstr "åééä"
 
-#: ../capplet/settings/mail-account-view.c:640
-#: ../capplet/settings/mail-account-view.c:641
+#: ../capplet/settings/mail-account-view.c:683
+#: ../capplet/settings/mail-account-view.c:684
 msgid "Next - Review account"
 msgstr "ääæ - æéåè"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Next - Defaults"
 msgstr "ääæ - èçèæ"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Back - Receiving options"
 msgstr "ääæ - ææéé"
 
-#: ../capplet/settings/mail-account-view.c:641
-#: ../mail/em-account-editor.c:4033
+#: ../capplet/settings/mail-account-view.c:684
+#: ../mail/em-account-editor.c:4076
 msgid "Defaults"
 msgstr "éèå"
 
-#: ../capplet/settings/mail-account-view.c:641
+#: ../capplet/settings/mail-account-view.c:684
 msgid "Back - Sending mail"
 msgstr "ääæ - åééä"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Review account"
 msgstr "æéåè"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Finish"
 msgstr "åæ"
 
-#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:686
 msgid "Back - Sending"
 msgstr "ääæ - åé"
 
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:856
 msgid "Setup Google contacts with Evolution"
 msgstr "å Google éçäåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:767
+#: ../capplet/settings/mail-account-view.c:857
 msgid "Setup Google calendar with Evolution"
 msgstr "å Google ææåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:772
-#: ../mail/em-account-editor.c:4851
+#: ../capplet/settings/mail-account-view.c:862
+#: ../mail/em-account-editor.c:4894
 msgid "You may need to enable IMAP access."
 msgstr "æåèéèåç IMAP ååã"
 
-#: ../capplet/settings/mail-account-view.c:780
-#: ../mail/em-account-editor.c:4828
+#: ../capplet/settings/mail-account-view.c:870
+#: ../mail/em-account-editor.c:4871
 msgid "Google account settings:"
 msgstr "Google åèèååï"
 
-#: ../capplet/settings/mail-account-view.c:806
+#: ../capplet/settings/mail-account-view.c:896
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "å Yahoo èäæåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:810
-#: ../mail/em-account-editor.c:4898
+#: ../capplet/settings/mail-account-view.c:900
+#: ../mail/em-account-editor.c:4941
 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 "
@@ -6839,25 +6857,25 @@ msgstr ""
 "Yahoo èäææååç åå_åæãæåååèçæéåèäæçåçãåæèçè"
 "åïåææéèèéæèåèäæçåçã"
 
-#: ../capplet/settings/mail-account-view.c:819
-#: ../mail/em-account-editor.c:4883
+#: ../capplet/settings/mail-account-view.c:909
+#: ../mail/em-account-editor.c:4926
 msgid "Yahoo account settings:"
 msgstr "Yahoo åèèååï"
 
-#: ../capplet/settings/mail-account-view.c:833
+#: ../capplet/settings/mail-account-view.c:923
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo èäæåçï"
 
-#: ../capplet/settings/mail-account-view.c:1020
+#: ../capplet/settings/mail-account-view.c:1116
 msgid "Password:"
 msgstr "åçï"
 
-#: ../capplet/settings/mail-account-view.c:1072
+#: ../capplet/settings/mail-account-view.c:1168
 #: ../capplet/settings/mail-settings-view.c:256
 msgid "Close Tab"
 msgstr "ééåé"
 
-#: ../capplet/settings/mail-account-view.c:1082
+#: ../capplet/settings/mail-account-view.c:1178
 msgid "Account Wizard"
 msgstr "åèçé"
 
@@ -6953,7 +6971,7 @@ msgstr "ååçèç(_D)"
 msgid "Save as draft"
 msgstr "ååçèç"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:349
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:317
 msgid "S_end"
 msgstr "åé(_E)"
 
@@ -7100,23 +7118,23 @@ msgstr "æéèæåçéæå"
 msgid "Click here to select folders to post to"
 msgstr "æääéèïéåèåèçèæå"
 
-#: ../composer/e-composer-private.c:247
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "åæååæçåä"
 
-#: ../composer/e-composer-private.c:251
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "éèååæçåä"
 
-#: ../composer/e-composer-private.c:255
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "æåæå"
 
-#: ../composer/e-composer-private.c:259
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "æåååäæå"
 
-#: ../composer/e-composer-private.c:369
+#: ../composer/e-composer-private.c:337
 msgid "Save draft"
 msgstr "ååèç"
 
@@ -7676,201 +7694,209 @@ msgid "Month view vertical pane position"
 msgstr "ææèçåççæäç"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+msgid "Name of the preferred New toolbar button item"
+msgstr "ååçæåååæééççåç"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
 msgid "Number of units for determining a birthday or anniversary reminder"
 msgstr "æåçææéåçåææéçåäæç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
 msgid "Number of units for determining a default reminder"
 msgstr "æåéèæéçåäæç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
 msgid "Number of units for determining when to hide tasks"
 msgstr "æåäæéèåäçåäæç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "éæçåäèå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
 msgstr ""
 "æåçæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçè"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels"
 msgstr ""
 "æåçæçäçïåææèäçæèèçèææåèèäæãåäæåäéïäåçè"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr "æåçåçæååééèçæçäç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr "æåçæåæåäéèçæçäç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "æåçåçæåäéèçæçäç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar"
 msgstr "åççæçäçïåèäææåèææåèèäæäé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+msgid "Preferred New button item"
+msgstr "ååçææééç"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "äèèäæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "äèååéæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "äèåäæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 msgid "Programs that are allowed to be run by reminders"
 msgstr "çäåçæéèåèççå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "æèåææèääçççäæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "éææäääæééç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
 msgid "Reminder programs"
 msgstr "æéçåéçå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for reminder audio"
 msgstr "ååæééææçé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
 msgid "Scroll Month View by a week, not by a month"
 msgstr "æåäéçåäæåææèïèéäæçåä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "åää/åä/æèçèåäéç RSVP æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "åää/åä/æèçèåäéç èè æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "åéåæçæèåéççæççææé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "åää/æè/åäçèåäéç åé æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr "ååäèäæäåéææääéååäæééç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display reminders in notification tray"
 msgstr "åéçåäéçæéçé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
 msgstr "åää/åä/æèçèåäéç çæ æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the memo preview pane"
 msgstr "éçååééèçæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
 msgid "Show the task preview pane"
 msgstr "éçåäéèçæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
 msgstr "åää/æèçèåäéç æå æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
 msgid "Show type field in the event/task/meeting editor"
 msgstr "åää/åä/æèçèåäéç éå æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "åææèãåäéæèåææåèéçéæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key"
 msgstr "åæèååæåææèäéççäæåãæåéäæãtimezoneãèåéççæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
 msgstr "åäéçæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (horizontal)"
 msgstr "åäéèçæäçïæåï"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
 msgid "Task preview pane position (vertical)"
 msgstr "åäéèçæäçïåçï"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "äååæåäçèå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
 msgstr "ãèäæãæèåéæäåéåïæãäèãïèäæç UID"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
 msgstr "ãååéãæèåéæäåéåïæãäèãïååéæåç UID"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
 msgstr "ãåäãæèåéæäåéåïæãäèãïåäæåç UID"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -7879,7 +7905,7 @@ msgstr ""
 "äççé/åçèæåéäçççåçæï%u èäéåéääåçäçèåçéåäå"
 "äïè %d èææççååç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -7887,7 +7913,7 @@ msgstr ""
 "çæèäæäææèæåçéèæåïæçèç Olsen æåèæåäçåå "
 "\"America/New York\""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -7896,7 +7922,7 @@ msgstr ""
 "éçæåæåäåååéæåäéèçæçäçãã0ã (æææè) åéèçææåå"
 "åéæåäæãã1ã (åçæè) åéèçææåååéæåæé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -7905,181 +7931,181 @@ msgstr ""
 "éçæåæåäååäæåäéèçæçäçãã0ã (æææè) åéèçææååä"
 "æåäæãã1ã (åçæè) åéèçææååäæåæé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
 msgid "The second timezone for a Day View"
 msgstr "çæææèççäæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
 msgid "Time divisions"
 msgstr "æéåé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Time the last reminder ran, in time_t"
 msgstr "äææéåèçæé(_T)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Timezone"
 msgstr "æå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
 msgid "Twenty four hour time format"
 msgstr "24 åæåæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 "\"days\""
 msgstr ""
 "çæåéåçåææéçåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "éèæéåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 msgstr ""
 "æåäæéèåäçåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
 msgstr "äçççæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "äçççæååäå Evolution äéåçæå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Vertical position for the tag pane"
 msgstr "æççæåçäç"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "äééåæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 msgstr "æéçéåïåæææ (0) åææå (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr "æåäçåçéèåèéæçåä (task-overdue-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr "æåäçåçéèåèäååæçåä (task-due-today-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Whether or not to use the notification tray for display reminders"
 msgstr "æåäçéçåéçæé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to ask for confirmation when deleting an appointment or task"
 msgstr "åéçææåäææåèæçè"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Whether to ask for confirmation when expunging appointments and tasks"
 msgstr "æéçæååäææåèæçè"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday"
 msgstr "æååçææèäçéæïéæåäéäçéåèéæçæäåçää"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "æååéåæçæèåéçääççææé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr "æååèäæäçå Marcus Bains ç (äèçåæåççç)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Whether to hide completed tasks in the tasks view"
 msgstr "æåååäæèäéèåæçåä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "æåäéçåäæåææèïèéäæçåä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Whether to set a default reminder for appointments"
 msgstr "æåèåçæçéèæé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "æåèåçæåéåçåæçæé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "æååää/åä/æèçèåäéç RSVP æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "æååää/æèçèåäéç çæ æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "æååää/åä/æèçèåäéç èè æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "æååää/åä/æèçèåäéç çæ æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "æåäç 24 åæåæéèäæäçäå/äå"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "æååää/æèçèåäéç æå æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "æååää/åä/æèçèåäéç éå æä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "æååèäæçååäçéçéæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "åäæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "åäæçæåæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "åäæçæåé"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "åäæéååæ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "åäæéååé"
@@ -8493,15 +8519,23 @@ msgid "Enable/disable caret mode"
 msgstr "åç/åçæåèæå"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:77 ../mail/mail-config.ui.h:48
-msgid "Encode file names in an Outlook/GMail way"
+#: ../mail/evolution-mail.schemas.in.h:77
+#, fuzzy
+#| msgid "Encode file names in an Outlook/GMail way"
+msgid "Encode filenames in an Outlook/GMail way"
 msgstr "åææåçççç Outlook/GMail åå"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 #: ../mail/evolution-mail.schemas.in.h:78
+#, fuzzy
+#| msgid ""
+#| "Encode file names in the mail headers same as Outlook or GMail do, to let "
+#| "them display correctly file names with UTF-8 letters sent by Evolution, "
+#| "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+#| "standard."
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail do, to let "
-"them display correctly file names with UTF-8 letters sent by Evolution, "
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 msgstr ""
@@ -9273,13 +9307,13 @@ msgstr "ääæçåçäæéäæå"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 #: ../mail/evolution-mail.schemas.in.h:222
-msgid "Timeout for marking message as seen"
+msgid "Timeout for marking messages as seen"
 msgstr "åéäæçæåéèçæé"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 #: ../mail/evolution-mail.schemas.in.h:223
-msgid "Timeout for marking message as seen."
-msgstr "åéäæçæåéèçæéã"
+msgid "Timeout in milliseconds for marking messages as seen."
+msgstr "åéäæçæåéèçæéïäæçèã"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 #: ../mail/evolution-mail.schemas.in.h:224
@@ -9561,13 +9595,15 @@ msgstr "çæéäåéæåéçåéçæéäåçã"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid "Sound file name to be played."
-msgstr "èææçèéææåçã"
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "æéäéåæèææçéæææïåæäæäçåèæåã"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr "æéäéåæèææçéæææïåæäæäçåèæåã"
+#, fuzzy
+#| msgid "Sound file name to be played."
+msgid "Sound filename to be played."
+msgstr "èææçèéææåçã"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
@@ -9673,7 +9709,7 @@ msgid "Skip development warning dialog"
 msgstr "åçéçèååèç"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:317
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:316
 msgid "Start in offline mode"
 msgstr "äéçæååå"
 
@@ -9788,19 +9824,19 @@ msgid "Reply-To"
 msgstr "åè"
 
 #: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2668 ../mail/em-format-html.c:2736
-#: ../mail/em-format-html.c:2759 ../modules/mail/em-mailer-prefs.c:73
+#: ../mail/em-format-html.c:2664 ../mail/em-format-html.c:2732
+#: ../mail/em-format-html.c:2755 ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "åæ"
 
 #: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2669 ../mail/em-format-html.c:2740
-#: ../mail/em-format-html.c:2762 ../modules/mail/em-mailer-prefs.c:74
+#: ../mail/em-format-html.c:2665 ../mail/em-format-html.c:2736
+#: ../mail/em-format-html.c:2758 ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "åäåæ"
 
 #: ../em-format/em-format.c:1065 ../em-format/em-format-quote.c:463
-#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:74
+#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
 #: ../smime/lib/e-cert.c:1147
 msgid "Subject"
@@ -9864,7 +9900,7 @@ msgid "Could not parse PGP message: "
 msgstr "çæèæ PGP éäï"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2861
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2857
 #: ../modules/mail/em-mailer-prefs.c:1025
 msgid "Mailer"
 msgstr "åäè"
@@ -10104,28 +10140,33 @@ msgid ""
 msgstr "ååççææååääéææéèçéåèèã"
 
 #: ../e-util/e-system.error.xml.h:1
+#, fuzzy
+#| msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgstr "åçæåççã{0}ãçèæåååãèäçäåçåçã"
+
+#: ../e-util/e-system.error.xml.h:2
 msgid "Because \"{1}\"."
 msgstr "åçã{1}ãã"
 
-#: ../e-util/e-system.error.xml.h:2
+#: ../e-util/e-system.error.xml.h:3
 msgid "Cannot open file \"{0}\"."
 msgstr "äèéåææã{0}ãã"
 
-#: ../e-util/e-system.error.xml.h:3
+#: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
 msgstr "äèååææã{0}ãã"
 
-#: ../e-util/e-system.error.xml.h:4
-msgid "Do you wish to overwrite it?"
-msgstr "èèåå?"
-
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists \"{0}\"."
-msgstr "ææåååã{0}ãã"
+msgid ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr ""
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
-msgid "_Overwrite"
-msgstr "èå(_O)"
+#: ../e-util/e-system.error.xml.h:6
+#, fuzzy
+#| msgid "_Reply"
+msgid "_Replace"
+msgstr "åè(_R)"
 
 #: ../e-util/e-util.c:245
 msgid "Could not open the link."
@@ -10329,7 +10370,9 @@ msgid "Missing date."
 msgstr "çåææã"
 
 #: ../filter/filter.error.xml.h:5
-msgid "Missing file name."
+#, fuzzy
+#| msgid "Missing file name."
+msgid "Missing filename."
 msgstr "çåææåçã"
 
 #: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
@@ -10353,7 +10396,9 @@ msgid "You must name this filter."
 msgstr "æåéçéåéæåååã"
 
 #: ../filter/filter.error.xml.h:11
-msgid "You must specify a file name."
+#, fuzzy
+#| msgid "You must specify a file name."
+msgid "You must specify a filename."
 msgstr "æåéæåäåææåçã"
 
 #: ../filter/filter.ui.h:1
@@ -10434,46 +10479,47 @@ msgstr "ååéäåèæåã%sã"
 msgid "Forwarded messages"
 msgstr "åèåçéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:385
-msgid "Scanning messages for duplicates"
-msgstr "ææéäæåæéè"
-
-#: ../libemail-engine/e-mail-folder-utils.c:576
+#: ../libemail-engine/e-mail-folder-utils.c:378
+#: ../libemail-engine/e-mail-folder-utils.c:627
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "åå %d åéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:824
+#: ../libemail-engine/e-mail-folder-utils.c:472
+msgid "Scanning messages for duplicates"
+msgstr "ææéäæåæéè"
+
+#: ../libemail-engine/e-mail-folder-utils.c:875
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "çéèæåã%sã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:956
+#: ../libemail-engine/e-mail-folder-utils.c:1007
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "ææã%sãåçèçéã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:960
+#: ../libemail-engine/e-mail-folder-utils.c:1011
 msgid "File has been removed."
 msgstr "ææåçèçéã"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1019
+#: ../libemail-engine/e-mail-folder-utils.c:1070
 msgid "Removing attachments"
 msgstr "æåçééä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1181
+#: ../libemail-engine/e-mail-folder-utils.c:1232
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "åå %d åéä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:624
+#: ../libemail-engine/e-mail-folder-utils.c:1586 ../mail/em-folder-utils.c:624
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "çæçèæå URIã%sã"
 
-#: ../libemail-engine/e-mail-session.c:106 ../mail/em-folder-properties.c:310
+#: ../libemail-engine/e-mail-session.c:106 ../mail/em-folder-properties.c:330
 #: ../mail/em-folder-tree-model.c:714
 #: ../modules/mail/e-mail-shell-view-private.c:1095
 #: ../modules/mail/e-mail-shell-view-private.c:1106
@@ -10580,7 +10626,7 @@ msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "çæéåèæåãåäåãèæåï%s"
 
 #: ../libemail-engine/e-mail-session-utils.c:790
-#: ../libemail-engine/mail-ops.c:810 ../libemail-engine/mail-ops.c:906
+#: ../libemail-engine/mail-ops.c:810 ../libemail-engine/mail-ops.c:909
 msgid "Sending message"
 msgstr "æååééä"
 
@@ -10589,17 +10635,17 @@ msgstr "æååééä"
 msgid "Unsubscribing from folder '%s'"
 msgstr "åæèéèæå ã%sã"
 
-#: ../libemail-engine/e-mail-store-utils.c:166
+#: ../libemail-engine/e-mail-store-utils.c:169
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "äæèã%sãçéç"
 
-#: ../libemail-engine/e-mail-store-utils.c:255
+#: ../libemail-engine/e-mail-store-utils.c:260
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "éæéçåã%sã"
 
-#: ../libemail-engine/e-mail-store-utils.c:328
+#: ../libemail-engine/e-mail-store-utils.c:335
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æååèã%sãéçåä"
@@ -10622,60 +10668,62 @@ msgstr "ææéä"
 msgid "Sending message %d of %d"
 msgstr "æååééä %d / %d"
 
-#: ../libemail-engine/mail-ops.c:869
+#. Translators: The string is distinguished by total count of messages to be send. Failed messages is always more than zero.
+#: ../libemail-engine/mail-ops.c:870
 #, c-format
-msgid "Failed to send %d of %d messages"
-msgstr "çæåéç %d åéä (å %d å)"
+msgid "Failed to send a message"
+msgid_plural "Failed to send %d of %d messages"
+msgstr[0] "çæåé %d / %d åéä"
 
-#: ../libemail-engine/mail-ops.c:873 ../mail/mail-send-recv.c:883
+#: ../libemail-engine/mail-ops.c:876 ../mail/mail-send-recv.c:883
 msgid "Canceled."
 msgstr "ååæã"
 
-#: ../libemail-engine/mail-ops.c:875 ../mail/mail-send-recv.c:885
+#: ../libemail-engine/mail-ops.c:878 ../mail/mail-send-recv.c:885
 msgid "Complete."
 msgstr "åæã"
 
-#: ../libemail-engine/mail-ops.c:987
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "åéäçåã%sã"
 
-#: ../libemail-engine/mail-ops.c:988
+#: ../libemail-engine/mail-ops.c:991
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "åéäèèåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1105
+#: ../libemail-engine/mail-ops.c:1108
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æåèèèæåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1178
+#: ../libemail-engine/mail-ops.c:1181
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æçååååè '%s'"
 
-#: ../libemail-engine/mail-ops.c:1179
+#: ../libemail-engine/mail-ops.c:1182
 #, c-format
 msgid "Storing account '%s'"
 msgstr "åååè '%s'"
 
-#: ../libemail-engine/mail-ops.c:1241
+#: ../libemail-engine/mail-ops.c:1244
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "éææçèæåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1458
+#: ../libemail-engine/mail-ops.c:1461
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "æåååèæåã%sã"
 
-#: ../libemail-engine/mail-ops.c:1551
+#: ../libemail-engine/mail-ops.c:1554
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æçã%sãçåæç"
 
-#: ../libemail-engine/mail-ops.c:1647
+#: ../libemail-engine/mail-ops.c:1650
 #, c-format
 msgid "Disconnecting %s"
 msgstr "æåäæ %s"
@@ -10716,7 +10764,7 @@ msgid "De_fault"
 msgstr "éèå(_F)"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:509
 #: ../modules/plugin-manager/evolution-plugin-manager.c:360
 #: ../plugins/publish-calendar/publish-calendar.c:849
 msgid "Enabled"
@@ -10728,8 +10776,8 @@ msgstr "åèåç"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3406
-#: ../mail/mail-config.ui.h:32
+#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3418
+#: ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:316
 #: ../plugins/google-account-setup/google-source.c:558
 #: ../plugins/google-account-setup/google-source.c:695
@@ -10737,7 +10785,6 @@ msgid "Default"
 msgstr "éèå"
 
 #: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/em-format-html-display.c:1398 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:172
 #: ../widgets/misc/e-attachment-paned.c:177
 msgid "Attachment"
@@ -10827,7 +10874,7 @@ msgid "_Later"
 msgstr "çå(_L)"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:705
+#: ../modules/mail/e-mail-shell-view-actions.c:736
 msgid "Add Label"
 msgstr "ååæç"
 
@@ -10855,7 +10902,7 @@ msgstr "éè"
 msgid "Name"
 msgstr "åç"
 
-#: ../mail/e-mail-migrate.c:1185
+#: ../mail/e-mail-migrate.c:1264
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "çæåã%sãåçæåéäèæåï%s"
@@ -10872,605 +10919,605 @@ msgstr "èèèèæå"
 msgid "C_opy"
 msgstr "èè(_O)"
 
-#: ../mail/e-mail-reader.c:829 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:841 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "çèèæå"
 
-#: ../mail/e-mail-reader.c:829 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:841 ../mail/em-folder-utils.c:488
 msgid "_Move"
 msgstr "çå(_M)"
 
-#: ../mail/e-mail-reader.c:1190 ../mail/e-mail-reader.c:1370
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1202 ../mail/e-mail-reader.c:1382
+#: ../mail/e-mail-reader.c:1421
 msgid "_Do not ask me again."
 msgstr "äèåèåæ(_D)ã"
 
-#: ../mail/e-mail-reader.c:1415
+#: ../mail/e-mail-reader.c:1427
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æéåçéäèåçåèæä(_A)"
 
-#: ../mail/e-mail-reader.c:1776
+#: ../mail/e-mail-reader.c:1788
 msgid "A_dd Sender to Address Book"
 msgstr "åååäèåçéæå(_D)"
 
-#: ../mail/e-mail-reader.c:1778
+#: ../mail/e-mail-reader.c:1790
 msgid "Add sender to address book"
 msgstr "æååäèèéèé"
 
-#: ../mail/e-mail-reader.c:1783
+#: ../mail/e-mail-reader.c:1795
 msgid "Check for _Junk"
 msgstr "ææååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1785
+#: ../mail/e-mail-reader.c:1797
 msgid "Filter the selected messages for junk status"
 msgstr "çéæéääçååéäçæ"
 
-#: ../mail/e-mail-reader.c:1790
+#: ../mail/e-mail-reader.c:1802
 msgid "_Copy to Folder..."
 msgstr "èèèèæå(_C)â"
 
-#: ../mail/e-mail-reader.c:1792
+#: ../mail/e-mail-reader.c:1804
 msgid "Copy selected messages to another folder"
 msgstr "èèåéåçéäååäåèæå"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1809
 msgid "_Delete Message"
 msgstr "åééä(_D)"
 
-#: ../mail/e-mail-reader.c:1799
+#: ../mail/e-mail-reader.c:1811
 msgid "Mark the selected messages for deletion"
 msgstr "åéåçéäæçæèåé"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1816
 msgid "Filter on Mailing _List..."
 msgstr "éäèåéæå(_L)â"
 
-#: ../mail/e-mail-reader.c:1806
+#: ../mail/e-mail-reader.c:1818
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "çéåéäèååçéæåèå"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1823
 msgid "Filter on _Recipients..."
 msgstr "æäèéæå(_R)â"
 
-#: ../mail/e-mail-reader.c:1813
+#: ../mail/e-mail-reader.c:1825
 msgid "Create a rule to filter messages to these recipients"
 msgstr "çéäæäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1830
 msgid "Filter on Se_nder..."
 msgstr "åäèéæå(_N)â"
 
-#: ../mail/e-mail-reader.c:1820
+#: ../mail/e-mail-reader.c:1832
 msgid "Create a rule to filter messages from this sender"
 msgstr "çéååäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1837
 msgid "Filter on _Subject..."
 msgstr "äæéæå(_S)â"
 
-#: ../mail/e-mail-reader.c:1827
+#: ../mail/e-mail-reader.c:1839
 msgid "Create a rule to filter messages with this subject"
 msgstr "çéåäæåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1844
 msgid "A_pply Filters"
 msgstr "åçéæå(_P)"
 
-#: ../mail/e-mail-reader.c:1834
+#: ../mail/e-mail-reader.c:1846
 msgid "Apply filter rules to the selected messages"
 msgstr "åçéæåèåææéåçéä"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1851
 msgid "_Find in Message..."
 msgstr "åéäååæ(_F)â"
 
-#: ../mail/e-mail-reader.c:1841
+#: ../mail/e-mail-reader.c:1853
 msgid "Search for text in the body of the displayed message"
 msgstr "æåéççéäææäçæå"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1858
 msgid "_Clear Flag"
 msgstr "æéæå(_C)"
 
-#: ../mail/e-mail-reader.c:1848
+#: ../mail/e-mail-reader.c:1860
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "çééåéäçèéææ"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1865
 msgid "_Flag Completed"
 msgstr "æèçååæ(_F)"
 
-#: ../mail/e-mail-reader.c:1855
+#: ../mail/e-mail-reader.c:1867
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ååéåéäçèéææèçååæ"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1872
 msgid "Follow _Up..."
 msgstr "èé(_U)â"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1874
 msgid "Flag the selected messages for follow-up"
 msgstr "åéåçéäåäèéææ"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1879
 msgid "_Attached"
 msgstr "éä(_A)"
 
-#: ../mail/e-mail-reader.c:1869 ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1881 ../mail/e-mail-reader.c:1888
 msgid "Forward the selected message to someone as an attachment"
 msgstr "åéåçéääéäååèåçæä"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1886
 msgid "Forward As _Attached"
 msgstr "äéäèå(_A)"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1893
 msgid "_Inline"
 msgstr "èå(_I)"
 
-#: ../mail/e-mail-reader.c:1883 ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1895 ../mail/e-mail-reader.c:1902
 msgid "Forward the selected message in the body of a new message"
 msgstr "åéèèåçéäåéææéäçåæä"
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1900
 msgid "Forward As _Inline"
 msgstr "äèåèå(_I)"
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1907
 msgid "_Quoted"
 msgstr "åæ(_Q)"
 
-#: ../mail/e-mail-reader.c:1897 ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1909 ../mail/e-mail-reader.c:1916
 msgid "Forward the selected message quoted like a reply"
 msgstr "åéèèåçéääåèéäæååå"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1914
 msgid "Forward As _Quoted"
 msgstr "äåæèå(_Q)"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1921
 msgid "_Load Images"
 msgstr "èååç(_L)"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1923
 msgid "Force images in HTML mail to be loaded"
 msgstr "éè HTML æåçéäæåèèååç"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1928
 msgid "_Important"
 msgstr "éè(_I)"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1930
 msgid "Mark the selected messages as important"
 msgstr "åéåçéäæçæéè"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1935
 msgid "_Junk"
 msgstr "ååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1937
 msgid "Mark the selected messages as junk"
 msgstr "åéåçéäæçæååéä"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1942
 msgid "_Not Junk"
 msgstr "äæååéä(_N)"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1944
 msgid "Mark the selected messages as not being junk"
 msgstr "åéåçéäæçæäæååéä"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1949
 msgid "_Read"
 msgstr "åéè(_R)"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1951
 msgid "Mark the selected messages as having been read"
 msgstr "åéåçéäæçæåçéè"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1956
 msgid "Uni_mportant"
 msgstr "äéè(_M)"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1958
 msgid "Mark the selected messages as unimportant"
 msgstr "åéåçéäæçæäéè"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1963
 msgid "_Unread"
 msgstr "æéè(_U)"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1965
 msgid "Mark the selected messages as not having been read"
 msgstr "åéåçéäæçææéè"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1970
 msgid "_Edit as New Message..."
 msgstr "çèçæéä(_E)â"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1972
 msgid "Open the selected messages in the composer for editing"
 msgstr "åæåèçéåéåçéäääçè"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1977
 msgid "Compose _New Message"
 msgstr "æåæéä(_N)"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1979
 msgid "Open a window for composing a mail message"
 msgstr "éåèçääæåéä"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1984
 msgid "_Open in New Window"
 msgstr "åæèçéå(_O)"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1986
 msgid "Open the selected messages in a new window"
 msgstr "äçæèçéåéåçéä"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1991
 msgid "_Move to Folder..."
 msgstr "çèèæå(_M)â"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1993
 msgid "Move selected messages to another folder"
 msgstr "åéåçéäçèåäåèæå"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1998
 msgid "_Switch to Folder"
 msgstr "åæèèæå(_S)"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2000
 msgid "Display the parent folder"
 msgstr "éçäåèæå"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2005
 msgid "Switch to _next tab"
 msgstr "åæèääååé(_N)"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2007
 msgid "Switch to the next tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2012
 msgid "Switch to _previous tab"
 msgstr "åæèääååé(_P)"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2014
 msgid "Switch to the previous tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2019
 msgid "Cl_ose current tab"
 msgstr "ééçåçåé(_O)"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2021
 msgid "Close current tab"
 msgstr "ééçåçåé"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2026
 msgid "_Next Message"
 msgstr "ääåéä(_N)"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2028
 msgid "Display the next message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2033
 msgid "Next _Important Message"
 msgstr "ääåéèéä(_I)"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2035
 msgid "Display the next important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2040
 msgid "Next _Thread"
 msgstr "ääåçééä(_T)"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2042
 msgid "Display the next thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2047
 msgid "Next _Unread Message"
 msgstr "ääåæéèçéä(_U)"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2049
 msgid "Display the next unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2054
 msgid "_Previous Message"
 msgstr "ääåéä(_P)"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2056
 msgid "Display the previous message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2061
 msgid "Pr_evious Important Message"
 msgstr "ääåéèéä(_E)"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2063
 msgid "Display the previous important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2068
 msgid "Previous T_hread"
 msgstr "ääåçééä(_H)"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2070
 msgid "Display the previous thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2075
 msgid "P_revious Unread Message"
 msgstr "ääåæéèçéä(_R)"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2077
 msgid "Display the previous unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2084
 msgid "Print this message"
 msgstr "ååéä"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2091
 msgid "Preview the message to be printed"
 msgstr "éèéèååçéä"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2096
 msgid "Re_direct"
 msgstr "éæåå(_D)"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2098
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "åéåçéäéæååçæä"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2103
 msgid "Remo_ve Attachments"
 msgstr "çééä(_V)"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2105
 msgid "Remove attachments"
 msgstr "çééä"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2110
 msgid "Remove Du_plicate Messages"
 msgstr "çééèçéä(_P)"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2112
 msgid "Checks selected messages for duplicates"
 msgstr "ææéåçéäæåæéè"
 
-#: ../mail/e-mail-reader.c:2105 ../mail/mail.error.xml.h:107
+#: ../mail/e-mail-reader.c:2117 ../mail/mail.error.xml.h:107
 #: ../modules/calendar/e-cal-shell-view-actions.c:1510
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "åèææä(_A)"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2119
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æååéçåéåéäçåéæäè"
 
-#: ../mail/e-mail-reader.c:2112 ../mail/mail.error.xml.h:108
+#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:108
 msgid "Reply to _List"
 msgstr "åèèæå(_L)"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2126
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æååéçæéåéäçéäèå"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2131
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "åèåäè(_R)"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2133
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æååéçæéåçéäçåäè"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2138
 msgid "_Save as mbox..."
 msgstr "ååæ mbox(_S)â"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2140
 msgid "Save selected messages as an mbox file"
 msgstr "åéåçéäååæ mbox ææ"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2145
 msgid "_Message Source"
 msgstr "éääæ(_M)"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2147
 msgid "Show the raw email source of the message"
 msgstr "éçéäååæ"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2159
 msgid "_Undelete Message"
 msgstr "åååééä(_U)"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2161
 msgid "Undelete the selected messages"
 msgstr "åæåééåçéä"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2166
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2168
 msgid "Reset the text to its original size"
 msgstr "éèæåçåååå"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2173
 msgid "_Zoom In"
 msgstr "æè(_Z)"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2175
 msgid "Increase the text size"
 msgstr "åæåæå"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2180
 msgid "Zoom _Out"
 msgstr "æé(_O)"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2182
 msgid "Decrease the text size"
 msgstr "åæåçå"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2189
 msgid "Create R_ule"
 msgstr "åçèå(_U)"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2196
 msgid "Ch_aracter Encoding"
 msgstr "ååçç(_A)"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2203
 msgid "F_orward As"
 msgstr "èåç(_O)"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2210
 msgid "_Group Reply"
 msgstr "ççåè(_G)"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2217
 msgid "_Go To"
 msgstr "çè(_G)"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2224
 msgid "Mar_k As"
 msgstr "æçæ(_K)"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2231
 msgid "_Message"
 msgstr "éä(_M)"
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2238
 msgid "_Zoom"
 msgstr "çæ(_Z)"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2248
 msgid "Search Folder from Mailing _List..."
 msgstr "éäèåæåèæå(_L)â"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2250
 msgid "Create a search folder for this mailing list"
 msgstr "çéåéäèååçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2255
 msgid "Search Folder from Recipien_ts..."
 msgstr "åæäèæåèæå(_T)â"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2257
 msgid "Create a search folder for these recipients"
 msgstr "çéäæäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2262
 msgid "Search Folder from Sen_der..."
 msgstr "åäèæåèæå(_D)â"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2264
 msgid "Create a search folder for this sender"
 msgstr "çéååäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2269
 msgid "Search Folder from S_ubject..."
 msgstr "äææåèæå(_U)â"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2271
 msgid "Create a search folder for this subject"
 msgstr "çéåäæåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2294
 msgid "Mark for Follo_w Up..."
 msgstr "æççèé(_W)â"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2302
 msgid "Mark as _Important"
 msgstr "æçæéè(_I)"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2306
 msgid "Mark as _Junk"
 msgstr "æçæååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2310
 msgid "Mark as _Not Junk"
 msgstr "æçæéååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2314
 msgid "Mar_k as Read"
 msgstr "æçæåéè(_K)"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2318
 msgid "Mark as Uni_mportant"
 msgstr "æçæäéè(_M)"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2322
 msgid "Mark as _Unread"
 msgstr "æçææéè(_U)"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2366
 msgid "_Caret Mode"
 msgstr "æåæå(_C)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2368
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "åéççéäåæäéçéçææ"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2374
 msgid "All Message _Headers"
 msgstr "ææéäæé(_H)"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2376
 msgid "Show messages with all email headers"
 msgstr "éçéäåèçæé"
 
-#: ../mail/e-mail-reader.c:2679
+#: ../mail/e-mail-reader.c:2691
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æåååéäã%sã"
 
-#: ../mail/e-mail-reader.c:3599
+#: ../mail/e-mail-reader.c:3611
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "èå(_F)"
 
-#: ../mail/e-mail-reader.c:3600
+#: ../mail/e-mail-reader.c:3612
 msgid "Forward the selected message to someone"
 msgstr "åéåçéäèåçæä"
 
-#: ../mail/e-mail-reader.c:3619
+#: ../mail/e-mail-reader.c:3631
 msgid "Group Reply"
 msgstr "ççåè"
 
-#: ../mail/e-mail-reader.c:3620
+#: ../mail/e-mail-reader.c:3632
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "åèçéäèåïææçææçæäè"
 
-#: ../mail/e-mail-reader.c:3673 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3685 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "åé"
 
-#: ../mail/e-mail-reader.c:3706
+#: ../mail/e-mail-reader.c:3718
 #: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3710
+#: ../mail/e-mail-reader.c:3722
 #: ../modules/calendar/e-cal-shell-view-actions.c:1349
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3719 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3731 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "åè"
 
-#: ../mail/e-mail-reader.c:4420
+#: ../mail/e-mail-reader.c:4432
 #, c-format
 msgid "Folder '%s'"
 msgstr "èæåã%sã"
@@ -11515,37 +11562,32 @@ msgid "Search Folders"
 msgstr "æåèæå"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:1652 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:1656 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "ææ"
 
-#: ../mail/em-account-editor.c:1734 ../mail/em-account-editor.c:4762
-#: ../mail/em-account-editor.c:4797
-msgid "Never"
-msgstr "æä"
-
-#: ../mail/em-account-editor.c:1735
+#: ../mail/em-account-editor.c:1739
 msgid "Always"
 msgstr "æé"
 
-#: ../mail/em-account-editor.c:1736
+#: ../mail/em-account-editor.c:1740
 msgid "Ask for each message"
 msgstr "æåéäçèå"
 
-#: ../mail/em-account-editor.c:2872 ../mail/mail-config.ui.h:169
+#: ../mail/em-account-editor.c:2881 ../mail/mail-config.ui.h:170
 msgid "_Path:"
 msgstr "èå(_P):"
 
-#: ../mail/em-account-editor.c:2875
+#: ../mail/em-account-editor.c:2884
 msgid "Fil_e:"
 msgstr "ææ(_E):"
 
-#: ../mail/em-account-editor.c:2912
+#: ../mail/em-account-editor.c:2921
 msgid "Mail Configuration"
 msgstr "éäçæ"
 
-#: ../mail/em-account-editor.c:2913
+#: ../mail/em-account-editor.c:2922
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11555,7 +11597,7 @@ msgstr ""
 "\n"
 "æääãççãéåã "
 
-#: ../mail/em-account-editor.c:2916
+#: ../mail/em-account-editor.c:2925
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -11564,19 +11606,19 @@ msgstr ""
 "èåäéèåæçåçåééååããéææãçæäääåèåïééæåæåéå"
 "çéäåååéäèèã"
 
-#: ../mail/em-account-editor.c:2918 ../mail/em-account-editor.c:3110
+#: ../mail/em-account-editor.c:2927 ../mail/em-account-editor.c:3136
 msgid "Receiving Email"
 msgstr "ææéåéä"
 
-#: ../mail/em-account-editor.c:2919
+#: ../mail/em-account-editor.c:2928
 msgid "Please configure the following account settings."
 msgstr "èåèåäååèçèååã"
 
-#: ../mail/em-account-editor.c:2921 ../mail/em-account-editor.c:3712
+#: ../mail/em-account-editor.c:2930 ../mail/em-account-editor.c:3755
 msgid "Sending Email"
 msgstr "åééåéä"
 
-#: ../mail/em-account-editor.c:2922
+#: ../mail/em-account-editor.c:2931
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -11584,20 +11626,20 @@ msgstr ""
 "èèåääéæåééäæåçèèãåææäææïèèçççççåæçèæåä"
 "æåã"
 
-#: ../mail/em-account-editor.c:2924
+#: ../mail/em-account-editor.c:2933
 msgid "Account Summary"
 msgstr "åèæè"
 
-#: ../mail/em-account-editor.c:2925
+#: ../mail/em-account-editor.c:2934
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr "éæçäååæéäçèååçæèã"
 
-#: ../mail/em-account-editor.c:2929
+#: ../mail/em-account-editor.c:2938
 msgid "Done"
 msgstr "åæ"
 
-#: ../mail/em-account-editor.c:2930
+#: ../mail/em-account-editor.c:2939
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11611,49 +11653,41 @@ msgstr ""
 "\n"
 "èæääãåçãååèåã"
 
-#: ../mail/em-account-editor.c:3475
+#: ../mail/em-account-editor.c:3502
 msgid "Check for _new messages every"
 msgstr "èåæææéäæ(_N)"
 
-#: ../mail/em-account-editor.c:3483
+#: ../mail/em-account-editor.c:3510
 msgid "minu_tes"
 msgstr "åé(_T)"
 
-#: ../mail/em-account-editor.c:4175 ../mail/mail-config.ui.h:109
+#: ../mail/em-account-editor.c:4218 ../mail/mail-config.ui.h:109
 msgid "Security"
 msgstr "ååæ"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:4230 ../mail/em-account-editor.c:4332
+#: ../mail/em-account-editor.c:4273 ../mail/em-account-editor.c:4375
 msgid "Receiving Options"
 msgstr "ææéé"
 
-#: ../mail/em-account-editor.c:4231 ../mail/em-account-editor.c:4333
+#: ../mail/em-account-editor.c:4274 ../mail/em-account-editor.c:4376
 msgid "Checking for New Messages"
 msgstr "æææéä"
 
-#: ../mail/em-account-editor.c:4756 ../mail/em-account-editor.c:4791
-msgid "Always (SSL)"
-msgstr "æé (SSL)"
-
-#: ../mail/em-account-editor.c:4759 ../mail/em-account-editor.c:4794
-msgid "When possible (TLS)"
-msgstr "åèçè (TLS)"
-
-#: ../mail/em-account-editor.c:4836
+#: ../mail/em-account-editor.c:4879
 msgid "Setup Google con_tacts with Evolution"
 msgstr "å Google éçäåå Evolu_tion"
 
-#: ../mail/em-account-editor.c:4843
+#: ../mail/em-account-editor.c:4886
 msgid "Setup Google ca_lendar with Evolution"
 msgstr "å Google ææåå Evo_lution"
 
-#: ../mail/em-account-editor.c:4891
+#: ../mail/em-account-editor.c:4934
 msgid "Setup _Yahoo calendar with Evolution"
 msgstr "å _Yahoo èäæåå Evolution"
 
-#: ../mail/em-account-editor.c:4916
+#: ../mail/em-account-editor.c:4959
 msgid "Yahoo Calen_dar name:"
 msgstr "Yahoo èäæåç(_D):"
 
@@ -11673,15 +11707,15 @@ msgstr ""
 msgid "-----Original Message-----"
 msgstr "-----ååéä-----"
 
-#: ../mail/em-composer-utils.c:2418
+#: ../mail/em-composer-utils.c:2442
 msgid "an unknown sender"
 msgstr "äæçåäè"
 
-#: ../mail/em-composer-utils.c:2813
+#: ../mail/em-composer-utils.c:2837
 msgid "Posting destination"
 msgstr "åèçççç"
 
-#: ../mail/em-composer-utils.c:2814
+#: ../mail/em-composer-utils.c:2838
 msgid "Choose folders to post the message to."
 msgstr "éåèæåäåèéäã"
 
@@ -11739,195 +11773,207 @@ msgid "does not exist"
 msgstr "äåå"
 
 #: ../mail/em-filter-i18n.h:19
+msgid "does not have words"
+msgstr "äååæå"
+
+#: ../mail/em-filter-i18n.h:20
 msgid "does not return"
 msgstr "ææåå"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:21
 msgid "does not sound like"
 msgstr "äéä"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:22
 msgid "does not start with"
 msgstr "äæäæéå"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:24
 msgid "Draft"
 msgstr "èç"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:25
 msgid "ends with"
 msgstr "äæçç"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:27
 msgid "exists"
 msgstr "åå"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:28
 msgid "Expression"
 msgstr "èå"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:29
 msgid "Follow Up"
 msgstr "èé"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:30
 msgid "Forward to"
 msgstr "èåè"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:31
+msgid "has words"
+msgstr "ååæå"
+
+#: ../mail/em-filter-i18n.h:32
 msgid "Important"
 msgstr "éè"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:34
 msgid "is after"
 msgstr "æäåç"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:35
 msgid "is before"
 msgstr "æäåç"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:36
 msgid "is Flagged"
 msgstr "ææå"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:40
 msgid "is not Flagged"
 msgstr "æææå"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:41
 msgid "is not set"
 msgstr "æèå"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:42
 msgid "is set"
 msgstr "èå"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:67
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "ååéä"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:44
 msgid "Junk Test"
 msgstr "ååéäæè"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:45
 msgid "Label"
 msgstr "æç"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:46
 msgid "Mailing list"
 msgstr "éäåè"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:47
 msgid "Match All"
 msgstr "çååé"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:48
 msgid "Message Body"
 msgstr "éäåå"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:49
 msgid "Message Header"
 msgstr "éäæé"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:50
 msgid "Message is Junk"
 msgstr "ååéä"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:51
 msgid "Message is not Junk"
 msgstr "éååéä"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Message Location"
 msgstr "éääç"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:54
 msgid "Pipe to Program"
 msgstr "åççåçé"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:55
 msgid "Play Sound"
 msgstr "ææéæ"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "åè"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:57 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "æäè"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "Regex Match"
 msgstr "æèèçåçé"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "Replied to"
 msgstr "åè"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns"
 msgstr "åå"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "returns greater than"
 msgstr "åååæ"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:62
 msgid "returns less than"
 msgstr "åååæ"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:63
 msgid "Run Program"
 msgstr "åèçå"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:64 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "åæ"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "åäè"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Sender or Recipients"
 msgstr "åäèææäè"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Set Label"
 msgstr "èåæç"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "Set Status"
 msgstr "èåçæ"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Size (kB)"
 msgstr "åå (kB)"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "sounds like"
 msgstr "éä"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "Source Account"
 msgstr "äæåè"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:72
 msgid "Specific header"
 msgstr "æåæé"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "starts with"
 msgstr "äæéå"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Stop Processing"
 msgstr "åæèç"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:77
+msgid "Unset Color"
+msgstr "åæèåéè"
+
+#: ../mail/em-filter-i18n.h:78
 msgid "Unset Status"
 msgstr "åæèåçæ"
 
@@ -11940,27 +11986,27 @@ msgstr "æèä"
 msgid "Add Ac_tion"
 msgstr "åååä(_T)"
 
-#: ../mail/em-folder-properties.c:144
+#: ../mail/em-folder-properties.c:145
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "æèéä:"
 
-#: ../mail/em-folder-properties.c:155
+#: ../mail/em-folder-properties.c:156
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ææéä:"
 
-#: ../mail/em-folder-properties.c:176
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "ééäçé (%s):"
 
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:179
 #, c-format
 msgid "Quota usage"
 msgstr "éåçé"
 
-#: ../mail/em-folder-properties.c:315
+#: ../mail/em-folder-properties.c:335
 msgid "Folder Properties"
 msgstr "èæååå"
 
@@ -12000,12 +12046,12 @@ msgstr "æåçåèæå %s"
 msgid "Copying folder %s"
 msgstr "æåèèèæå %s"
 
-#: ../mail/em-folder-tree.c:2103 ../mail/message-list.c:2301
+#: ../mail/em-folder-tree.c:2103 ../mail/message-list.c:2304
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æååéäçèèæå %s"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2306
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æåèèéäèèæå %s"
@@ -12048,93 +12094,93 @@ msgstr "æååéä"
 msgid "Formatting Message..."
 msgstr "æååéäâ"
 
-#: ../mail/em-format-html.c:1637 ../mail/em-format-html.c:1647
+#: ../mail/em-format-html.c:1636 ../mail/em-format-html.c:1650
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æåååã%sã"
 
-#: ../mail/em-format-html.c:1798 ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html.c:1801 ../mail/em-format-html-display.c:93
 msgid "Unsigned"
 msgstr "æçå"
 
-#: ../mail/em-format-html.c:1799 ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html.c:1802 ../mail/em-format-html-display.c:94
 msgid "Valid signature"
 msgstr "ææççå"
 
-#: ../mail/em-format-html.c:1800 ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html.c:1803 ../mail/em-format-html-display.c:95
 msgid "Invalid signature"
 msgstr "çæççå"
 
-#: ../mail/em-format-html.c:1801 ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html.c:1804 ../mail/em-format-html-display.c:96
 msgid "Valid signature, but cannot verify sender"
 msgstr "çåææïäæçææéåäè"
 
-#: ../mail/em-format-html.c:1802 ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:97
 msgid "Signature exists, but need public key"
 msgstr "ççååïäéèåééé"
 
-#: ../mail/em-format-html.c:1808 ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html.c:1811 ../mail/em-format-html-display.c:104
 msgid "Unencrypted"
 msgstr "æåå"
 
-#: ../mail/em-format-html.c:1809 ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html.c:1812 ../mail/em-format-html-display.c:105
 msgid "Encrypted, weak"
 msgstr "åååïäåå"
 
-#: ../mail/em-format-html.c:1810 ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html.c:1813 ../mail/em-format-html-display.c:106
 msgid "Encrypted"
 msgstr "ååå"
 
-#: ../mail/em-format-html.c:1811 ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html.c:1814 ../mail/em-format-html-display.c:107
 msgid "Encrypted, strong"
 msgstr "åååïåå"
 
-#: ../mail/em-format-html.c:2211
+#: ../mail/em-format-html.c:2207
 msgid "Unknown external-body part."
 msgstr "æççååææéåã"
 
-#: ../mail/em-format-html.c:2221
+#: ../mail/em-format-html.c:2217
 msgid "Malformed external-body part."
 msgstr "æåäèçååææéåã"
 
-#: ../mail/em-format-html.c:2252
+#: ../mail/em-format-html.c:2248
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP çæç (%s)"
 
-#: ../mail/em-format-html.c:2263
+#: ../mail/em-format-html.c:2259
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æåçææ (%s) æ ã%sãææçæç"
 
-#: ../mail/em-format-html.c:2265
+#: ../mail/em-format-html.c:2261
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æåæææç (%s)"
 
-#: ../mail/em-format-html.c:2286
+#: ../mail/em-format-html.c:2282
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "éçèææç (%s)"
 
-#: ../mail/em-format-html.c:2301
+#: ../mail/em-format-html.c:2297
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "äæçåéæææç (ã%sãéå)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:3009
+#: ../mail/em-format-html.c:3005
 #: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "åäèï%s"
 
-#: ../mail/em-format-html.c:3031
+#: ../mail/em-format-html.c:3027
 msgid "(no subject)"
 msgstr "(ææäæ)"
 
-#: ../mail/em-format-html.c:3107
+#: ../mail/em-format-html.c:3103
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "éåéäæç %s äè %s åå"
@@ -12199,15 +12245,15 @@ msgstr ""
 "æéäåååïäçååçååæçæãçäçéäææéïåéçäåéæéæéä"
 "çååã"
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:253 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æèæè(_V)"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:266
 msgid "This certificate is not viewable"
 msgstr "ææèçææè"
 
-#: ../mail/em-format-html-display.c:575
+#: ../mail/em-format-html-display.c:578
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12215,42 +12261,48 @@ msgstr ""
 "Evolution çæéçæåéåéäïåçååèåèèççååãæåäçäæççæ"
 "åæäçåéæåçèåäéèåã"
 
-#: ../mail/em-format-html-display.c:765
+#: ../mail/em-format-html-display.c:762
 msgid "Save Image"
 msgstr "åååç"
 
-#: ../mail/em-format-html-display.c:813
+#: ../mail/em-format-html-display.c:810
 msgid "Save _Image..."
 msgstr "åååç(_I)â"
 
-#: ../mail/em-format-html-display.c:815
+#: ../mail/em-format-html-display.c:812
 msgid "Save the image to a file"
 msgstr "ååçååçææ"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1013
 msgid "Completed on"
 msgstr "ååææ"
 
-#: ../mail/em-format-html-display.c:1028
+#: ../mail/em-format-html-display.c:1025
 msgid "Overdue:"
 msgstr "åææ:"
 
-#: ../mail/em-format-html-display.c:1036
+#: ../mail/em-format-html-display.c:1033
 msgid "by"
 msgstr "æ"
 
-#: ../mail/em-format-html-display.c:1317 ../mail/em-format-html-display.c:1368
+#: ../mail/em-format-html-display.c:1314 ../mail/em-format-html-display.c:1365
 msgid "View _Unformatted"
 msgstr "æéææçç(_U)"
 
-#: ../mail/em-format-html-display.c:1319
+#: ../mail/em-format-html-display.c:1316
 msgid "Hide _Unformatted"
 msgstr "éèææçç(_U)"
 
-#: ../mail/em-format-html-display.c:1390
+#: ../mail/em-format-html-display.c:1387
 msgid "O_pen With"
 msgstr "äâéå(_O)"
 
+#. Translators: Name of an Attachment button for a11y object
+#: ../mail/em-format-html-display.c:1396
+msgctxt "Button"
+msgid "Attachment"
+msgstr "éä"
+
 #: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
@@ -12275,7 +12327,7 @@ msgid "Subscribe To _All"
 msgstr "åéèé(_A)"
 
 #: ../mail/em-subscription-editor.c:971 ../mail/em-subscription-editor.c:1824
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "_Unsubscribe"
 msgstr "åæèé(_U)"
 
@@ -12312,7 +12364,7 @@ msgid "Su_bscribe"
 msgstr "èé(_B)"
 
 #: ../mail/em-subscription-editor.c:1823
-#: ../modules/mail/e-mail-shell-view-actions.c:1256
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Unsubscribe from the selected folder"
 msgstr "åæèééåçèæå"
 
@@ -12458,9 +12510,9 @@ msgstr "éäçèåèççéèååã"
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
-"Define the email export format when doing drag'n'drop. Possible values are : "
+"Define the email export format when doing drag'n'drop. Possible values are "
 "mbox or pdf"
-msgstr "åçäçææåèæéåéäååçæåãåèçæåçïmbox æ pdf"
+msgstr "åçäçææåèæéåéäååçæåãåèçæåæïmbox æ pdf"
 
 #: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
@@ -12477,12 +12529,16 @@ msgid "Drag'n'drop export format"
 msgstr "ææååæå"
 
 #: ../mail/evolution-mail.schemas.in.h:79
+#, fuzzy
+#| msgid ""
+#| "Exported file name will be YYYYmmDDHHMMSS_email_title Possible values: 1 "
+#| "(: email sent date), 2 (: drag'n'drop date)"
 msgid ""
-"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
-"(: email sent date), 2 (: drag'n'drop date)"
+"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
+"email sent date), 2 (: drag'n'drop date)"
 msgstr ""
-"ååçææåçææïYYYmmDDHHMMSS_email_title åèçæåï1 (: éåéäåéæ"
-"æ), 2 (: ææææ)"
+"ååçææåçææïYYYYmmDDHHMMSS_email_title åèçæåï1 (: éåéäåé"
+"ææ), 2 (: ææææ)"
 
 #: ../mail/evolution-mail.schemas.in.h:81
 msgid "Format of the drag'n'drop export filename"
@@ -12698,7 +12754,7 @@ msgid "Importing Elm data"
 msgstr "èå Elm èæ"
 
 #: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:460
-#: ../modules/mail/e-mail-shell-view.c:1035
+#: ../modules/mail/e-mail-shell-view.c:1042
 #: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "éä"
@@ -12874,292 +12930,307 @@ msgstr "æéèæèäåæ(_D)"
 msgid "Apply the same _view settings to all folders"
 msgstr "åææèæååççåçæèèåå(_V)"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:14
 #: ../modules/addressbook/addressbook-config.c:1090
 msgid "Authentication"
 msgstr "éè"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "èåæåèæçè(_E)"
 
-#: ../mail/mail-config.ui.h:17
-msgid "C_haracter set:"
-msgstr "ååé(_H):"
+#: ../mail/mail-config.ui.h:16
+msgid "Ch_aracter encoding:"
+msgstr "ååçç(_A):"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "ææææçéå(_E) "
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "äèèæéææååéä(_S)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:19
 msgid "Check for new _messages on start"
 msgstr "ååææææéä(_M)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new messa_ges in all active accounts"
 msgstr "ææææäçäåèçæéä(_G)"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "ææåééäæåçååéä(_M)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "çæèåææææå(_T)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "æé(_A)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "æé(_R)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "æéåçéè(_M):"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "æåçèéä"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:27
 #: ../modules/plugin-manager/evolution-plugin-manager.c:160
 msgid "Configuration"
 msgstr "çæ"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "åéèæåæçè(_W)"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:29
 msgid "Confirmations"
 msgstr "çè"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:30
 #: ../modules/addressbook/autocompletion-config.c:188
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Date/Time Format"
 msgstr "ææ/æåæå"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "éèèç"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "éèååçç(_N):"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:34
 msgid "Delete Mail"
 msgstr "åééä"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:35
 msgid "Delete junk messages on e_xit"
 msgstr "ééæåéååéä(_X)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "çååéäåçå (PGP æ S/MIME) æäåéäæäçå(_S)"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:39
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "çåéçéäåäæäçç [éèå](_U)"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:40
 msgid "Displayed Message Headers"
 msgstr "éççéäæé"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "èåäèåæçéèéäåäèåéäæèçååéä(_K)"
 
-#: ../mail/mail-config.ui.h:43
-msgid "Do not quote"
-msgstr "ääçåæ"
-
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "èçå(_F):"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "éåéääå(_A):"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "ééææçåæçèæå(_X)"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:46
+#, fuzzy
+#| msgid "Encode file names in an _Outlook/GMail way"
+msgid "Encode filenames in an _Outlook/GMail way"
+msgstr "åææåçççç _Outlook/GMail åå"
+
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "ååæè(_P):"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "åååéçéä (éèå)(_E)"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:49
 msgid "Encryption:"
 msgstr "ååï"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:50
 msgid "F_all back to threading messages by subject"
 msgstr "éååääæççééä(_A)"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:51
 msgid "Fix_ed Width Font:"
 msgstr "åååååå(_E):"
 
-#: ../mail/mail-config.ui.h:54
-msgid "Format messages in _HTML"
-msgstr "åéäæååç _HTML"
+#: ../mail/mail-config.ui.h:52
+msgid "For_mat messages in HTML"
+msgstr "ä HT_ML æååéä"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "åå(_E):"
 
-#: ../mail/mail-config.ui.h:57
-msgid "Group Reply goes only to mailing list, if possible"
-msgstr "åæåèïççåèåçæéäèå"
+#: ../mail/mail-config.ui.h:55
+msgid "Gro_up Reply goes only to mailing list, if possible"
+msgstr "åæåèïççåèåçæéäèå(_U)"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:56
 msgid "HTML Messages"
 msgstr "HTML éä"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:57
 msgid "H_TTP Proxy:"
 msgstr "H_TTP äçäæå:"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:58
 msgid "Header content"
 msgstr "æéåå"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:59
 msgid "Header name"
 msgstr "æéåç"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:60
 msgid "Headers"
 msgstr "æé"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:61
 msgid "Highlight _quotations with"
 msgstr "åèåæç(_Q)"
 
-#: ../mail/mail-config.ui.h:64
-msgid "Ignore Reply-To: for mailing lists"
-msgstr "åçéäèåç Reply-To:"
-
-#: ../mail/mail-config.ui.h:65
-msgid "Inline"
-msgstr "èå"
-
-#: ../mail/mail-config.ui.h:66
-msgid "Inline (Outlook style)"
-msgstr "èåïOutlook éæï"
+#: ../mail/mail-config.ui.h:62
+msgid "Ig_nore Reply-To: for mailing lists"
+msgstr "æéåçéäèåçåèæä(_N)"
 
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æç"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "èèè"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "æåèååç"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "éäæéè"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "äçäç"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "éäéç"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "éäåæ"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "ææäçäæåç(_P):"
 
-#: ../mail/mail-config.ui.h:77 ../modules/addressbook/ldap-config.ui.h:9
+#: ../mail/mail-config.ui.h:73 ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "ææåå"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "åææåçåçèèååéäæééåééåæèåçã"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:75
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "éææçèè"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "åé(_G):"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG éé ID:"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "åç(_W):"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:80
 msgid "Personal Details:"
 msgstr "åäèçèæï"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:81
 #: ../modules/calendar/e-calendar-preferences.ui.h:23
 msgid "Pick a color"
 msgstr "æééè"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "éæå:"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:83
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "ååéçæ (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:85
 msgid "Proxy Settings"
 msgstr "äçäæåèåå"
 
-#: ../mail/mail-config.ui.h:90
-msgid "Quoted"
-msgstr "åæ"
-
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:86
 msgid "Re_member password"
 msgstr "èäåç(_M)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:87
 msgid "Re_ply-To:"
 msgstr "åèåå(_P):"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:89
 msgid "Remember _password"
 msgstr "èäåç(_P)"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:90
 msgid "Replies and Forwards"
 msgstr "åèåèå"
 
+#: ../mail/mail-config.ui.h:91
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "éä"
+
+#: ../mail/mail-config.ui.h:92
+msgctxt "ReplyForward"
+msgid "Do not quote"
+msgstr "ääçåæ"
+
+#: ../mail/mail-config.ui.h:93
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "èå"
+
+#: ../mail/mail-config.ui.h:94
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "èå (Outlook éæ)"
+
+#: ../mail/mail-config.ui.h:95
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "åæ"
+
 #: ../mail/mail-config.ui.h:96
 msgid "Required Information"
 msgstr "åèçèè"
@@ -13361,133 +13432,140 @@ msgstr "äçéè(_N)"
 msgid "User _Name:"
 msgstr "äçèåç(_N):"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:153 ../plugins/caldav/caldav-source.c:249
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:660
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
+msgid "User_name:"
+msgstr "äçèåç(_N):"
+
+#: ../mail/mail-config.ui.h:155
 msgid "_Add Signature"
 msgstr "ååçåæ(_A)"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:156
 msgid "_Always load images from the Internet"
 msgstr "äåèçèäèåç(_A)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:157
 msgid "_Authentication Type"
 msgstr "éèéå(_A)"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:158
 msgid "_Direct connection to the Internet"
 msgstr "çæéçåçéçè(_D)"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:159
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "äççæèéè (çåæ _Outlook)"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:160
 msgid "_Forward style:"
 msgstr "èåæå(_F):"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:161
 msgid "_Junk Folder:"
 msgstr "ååéäèæå(_J):"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:162
 msgid "_Keep signature above the original message on replying"
 msgstr "åäæäçååéäççå(_K)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:163
 msgid "_Languages"
 msgstr "èè(_L)"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:164
 msgid "_Load images only in messages from contacts"
 msgstr "åèåçéçäååéääçåç(_L)"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:165
 msgid "_Lookup in local address book only"
 msgstr "ååæåéèéæè(_L)"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:166
 msgid "_Make this my default account"
 msgstr "èçæçéèåè(_M)"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:167
 msgid "_Manual proxy configuration:"
 msgstr "æåäçäæåçæ(_M):"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:169
 msgid "_Never load images from the Internet"
 msgstr "äåäèçèäèåç(_N)"
 
-#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:171 ../modules/addressbook/ldap-config.ui.h:29
 msgid "_Port:"
 msgstr "éæå(_P):"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:172
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "çåé HTML éäçäææåéééäçéçäæéçæç(_P)"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:173
 msgid "_Reply style:"
 msgstr "åèæå(_R):"
 
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:174
 msgid "_Script:"
 msgstr "åäç(_S):"
 
-#: ../mail/mail-config.ui.h:174
+#: ../mail/mail-config.ui.h:175
 msgid "_Secure HTTP Proxy:"
 msgstr "åå HTTP äçäæå(_S):"
 
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:177
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "äæå(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:178
+#: ../mail/mail-config.ui.h:179
 msgid "_Show animated images"
 msgstr "ææåçåç(_S)"
 
-#: ../mail/mail-config.ui.h:179
+#: ../mail/mail-config.ui.h:180
 msgid "_Show the photograph of sender in the message preview"
 msgstr "åéäéèéçåäèçç(_S)"
 
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:181
 msgid "_Trash Folder:"
 msgstr "åæçèæå(_T):"
 
-#: ../mail/mail-config.ui.h:181
+#: ../mail/mail-config.ui.h:182
 msgid "_Use secure connection:"
 msgstr "äçååéç(_U):"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:183
 msgid "_Use system defaults"
 msgstr "äçççéèå(_U)"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:184
 msgid "_Use the same fonts as other applications"
 msgstr "äçèåäæççåçåçåå(_U)"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:185 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:185 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:186 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:186
+#: ../mail/mail-config.ui.h:187
 msgid "color"
 msgstr "èå"
 
-#: ../mail/mail-config.ui.h:187
+#: ../mail/mail-config.ui.h:188
 msgid "description"
 msgstr "æè"
 
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:189
 msgid "label"
 msgstr "æç"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:190
 msgid "none"
 msgstr "ææ"
 
@@ -14257,7 +14335,7 @@ msgid "_Discard changes"
 msgstr "ææèæ(_D)"
 
 #: ../mail/mail.error.xml.h:157
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "_Empty Trash"
 msgstr "æçåæç(_E)"
 
@@ -14281,6 +14359,10 @@ msgstr "å(_N)"
 msgid "_Open Messages"
 msgstr "éåéä(_O)"
 
+#: ../mail/mail.error.xml.h:163
+msgid "_Overwrite"
+msgstr "èå(_O)"
+
 #: ../mail/mail.error.xml.h:165
 msgid "_Synchronize"
 msgstr "åæå(_S)"
@@ -14325,8 +14407,8 @@ msgstr "èåæåèæåï %s"
 
 #: ../mail/mail-vfolder.c:219
 #, c-format
-msgid "Updating Search Folders for '%s' : %s"
-msgstr "ææã%sãçæåèæåï%s"
+msgid "Updating Search Folders for '%s' - %s"
+msgstr "ææã%sãçæåèæå- %s"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
@@ -14395,58 +14477,58 @@ msgstr "é"
 msgid "Highest"
 msgstr "æé"
 
-#: ../mail/message-list.c:1906 ../widgets/table/e-cell-date.c:51
+#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1913 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %l:%M %p"
 msgstr "äå %p %l:%M"
 
-#: ../mail/message-list.c:1922
+#: ../mail/message-list.c:1925
 msgid "Yesterday %l:%M %p"
 msgstr "æå %p %l:%M"
 
-#: ../mail/message-list.c:1934
+#: ../mail/message-list.c:1937
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../mail/message-list.c:1942
+#: ../mail/message-list.c:1945
 msgid "%b %d %l:%M %p"
 msgstr "%mæ%dæ %p %l:%M"
 
-#: ../mail/message-list.c:1944
+#: ../mail/message-list.c:1947
 msgid "%b %d %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../mail/message-list.c:2743
+#: ../mail/message-list.c:2746
 msgid "Select all visible messages"
 msgstr "éæåéåèçéä"
 
-#: ../mail/message-list.c:2879 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2882 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "éä"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4092
+#: ../mail/message-list.c:4095
 msgid "Follow-up"
 msgstr "èé"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4629 ../mail/message-list.c:5049
+#: ../mail/message-list.c:4632 ../mail/message-list.c:5052
 msgid "Generating message list"
 msgstr "ççéäæå"
 
-#: ../mail/message-list.c:4866
+#: ../mail/message-list.c:4869
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 "ææéäçåæçæåæäãåääçãæå->æéãéåéçäæéæåææèåã"
 
-#: ../mail/message-list.c:4868
+#: ../mail/message-list.c:4871
 msgid "There are no messages in this folder."
 msgstr "éåèæåäææéäã"
 
@@ -14484,27 +14566,27 @@ msgid "Subject - Trimmed"
 msgstr "äæ - åæç"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Body contains"
 msgstr "åæåå"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "Message contains"
 msgstr "éäåå"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Recipients contain"
 msgstr "æäèåå"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "Sender contains"
 msgstr "åäèåå"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Subject contains"
 msgstr "äæåå"
 
@@ -14591,11 +14673,11 @@ msgstr "æåæå"
 msgid "Downloading"
 msgstr "äèä"
 
-#: ../modules/addressbook/addressbook-config.c:1311
+#: ../modules/addressbook/addressbook-config.c:1312
 msgid "Address Book Properties"
 msgstr "éèéåå"
 
-#: ../modules/addressbook/addressbook-config.c:1313
+#: ../modules/addressbook/addressbook-config.c:1314
 msgid "New Address Book"
 msgstr "æéèé"
 
@@ -14710,7 +14792,7 @@ msgstr "åçæéèé"
 msgid "Contacts"
 msgstr "éçä"
 
-#: ../modules/addressbook/e-book-shell-backend.c:355
+#: ../modules/addressbook/e-book-shell-backend.c:356
 msgid "Certificates"
 msgstr "æè"
 
@@ -14768,7 +14850,7 @@ msgstr "éçåéåéèéäææéçäçåå"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1405
 #: ../modules/calendar/e-memo-shell-view-actions.c:640
 #: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "_Rename..."
 msgstr "éæåå(_R)â"
 
@@ -14849,7 +14931,7 @@ msgstr "åä(_A)"
 #: ../modules/addressbook/e-book-shell-view-actions.c:944
 #: ../modules/calendar/e-memo-shell-view-actions.c:677
 #: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "_Preview"
 msgstr "éè(_P)"
 
@@ -14861,6 +14943,7 @@ msgid "_Delete"
 msgstr "åé(_D)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "_Properties"
 msgstr "åæ(_P)"
 
@@ -14887,7 +14970,7 @@ msgstr "åéçäéèèçéçåå"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1022
 #: ../modules/calendar/e-memo-shell-view-actions.c:747
 #: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1506
+#: ../modules/mail/e-mail-shell-view-actions.c:1548
 msgid "_Classic View"
 msgstr "åçæè(_C)"
 
@@ -14898,7 +14981,7 @@ msgstr "åéçäæåäæéçéçäéè"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1029
 #: ../modules/calendar/e-memo-shell-view-actions.c:754
 #: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "_Vertical View"
 msgstr "åçæè(_V)"
 
@@ -14924,7 +15007,7 @@ msgstr "ææççèæ"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "ééæå"
@@ -15073,8 +15156,8 @@ msgid "_Timeout:"
 msgstr "æé(_T):"
 
 #: ../modules/addressbook/ldap-config.ui.h:32
-msgid "cards"
-msgstr "åç"
+msgid "contacts"
+msgstr "éçä"
 
 #: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
@@ -15650,45 +15733,45 @@ msgstr "åæ"
 msgid "Birthdays & Anniversaries"
 msgstr "çæåéåçåæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-cal-shell-backend.c:449
 msgctxt "New"
 msgid "_Appointment"
 msgstr "çæ(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-backend.c:451
 #: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "åçäåæççæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:452
+#: ../modules/calendar/e-cal-shell-backend.c:456
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "åæçæ(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:454
+#: ../modules/calendar/e-cal-shell-backend.c:458
 msgid "Create a new all-day appointment"
 msgstr "åçæçåæçæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:459
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æè(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:461
+#: ../modules/calendar/e-cal-shell-backend.c:465
 msgid "Create a new meeting request"
 msgstr "åçææèèæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:469
+#: ../modules/calendar/e-cal-shell-backend.c:473
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "èäæ(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:471
+#: ../modules/calendar/e-cal-shell-backend.c:475
 #: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "åçæèäæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:794
+#: ../modules/calendar/e-cal-shell-backend.c:798
 msgid "Calendar and Tasks"
 msgstr "èäæèåä"
 
@@ -16386,343 +16469,356 @@ msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d éåä"
 
-#: ../modules/mail/em-account-prefs.c:209
-msgid "Evolution Account Assistant"
-msgstr "Evolution åèåç"
-
-#: ../modules/mail/em-account-prefs.c:253
-msgid "Account Editor"
-msgstr "åèçèå"
-
-#. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:384
+#: ../modules/mail/e-mail-attachment-handler.c:385
 #, c-format
-msgid "%d attached messages"
-msgstr "%d åéåçéä"
+msgid "%d attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "%d åéåçéä"
 
-#: ../modules/mail/e-mail-shell-backend.c:204
+#: ../modules/mail/e-mail-shell-backend.c:226
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "éäèæ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:206
+#: ../modules/mail/e-mail-shell-backend.c:228
 msgid "Compose a new mail message"
 msgstr "çèæçéäèæ"
 
-#: ../modules/mail/e-mail-shell-backend.c:214
+#: ../modules/mail/e-mail-shell-backend.c:236
+msgctxt "New"
+msgid "Mail Acco_unt"
+msgstr "éäåè(_U)"
+
+#: ../modules/mail/e-mail-shell-backend.c:238
+msgid "Create a new mail account"
+msgstr "åçæéäåè"
+
+#: ../modules/mail/e-mail-shell-backend.c:243
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "éäèæå(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:216
+#: ../modules/mail/e-mail-shell-backend.c:245
 msgid "Create a new mail folder"
 msgstr "åçæéäèæå"
 
-#: ../modules/mail/e-mail-shell-backend.c:431
+#: ../modules/mail/e-mail-shell-backend.c:460
 msgid "Mail Accounts"
 msgstr "éäåè"
 
-#: ../modules/mail/e-mail-shell-backend.c:439
+#: ../modules/mail/e-mail-shell-backend.c:469
 msgid "Mail Preferences"
 msgstr "éäååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:447
+#: ../modules/mail/e-mail-shell-backend.c:478
 msgid "Composer Preferences"
 msgstr "éäçèåååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:455
+#: ../modules/mail/e-mail-shell-backend.c:487
 msgid "Network Preferences"
 msgstr "çèååèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-#: ../modules/mail/e-mail-shell-view.c:944
+#: ../modules/mail/e-mail-shell-backend.c:721
+msgid "Evolution Account Assistant"
+msgstr "Evolution åèåç"
+
+#: ../modules/mail/e-mail-shell-backend.c:767
+msgid "Account Editor"
+msgstr "åèçèå"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view.c:947
 msgid "_Disable Account"
 msgstr "åçåè(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "Disable this account"
 msgstr "åçéååè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æäçéåææèæååçååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1163
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+msgid "Edit properties of this account"
+msgstr "çèéååèçåæ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "_Download Messages for Offline Usage"
 msgstr "äèéçäççéä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1165
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "äèæèçéçäççåèèèæåäéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Fl_ush Outbox"
 msgstr "æçåäå(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1177
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "_Copy Folder To..."
 msgstr "èèèæåå(_C)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1179
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Copy the selected folder into another folder"
 msgstr "èèåéåçèæåååäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1186
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Permanently remove this folder"
 msgstr "æäçééåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "E_xpunge"
 msgstr "åé(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1193
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æäçéåéåèæååååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Mar_k All Messages as Read"
 msgstr "æçææéäçåéè(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1200
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 msgid "Mark all messages in the folder as read"
 msgstr "åèæåäåéçéäæçæåéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "_Move Folder To..."
 msgstr "çåèæåå(_M)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1207
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Move the selected folder into another folder"
 msgstr "åéåçèæåçèåäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1250
 msgid "_New..."
 msgstr "æå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Create a new folder for storing mail"
 msgstr "åçäåæèæåäååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1221
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "Change the properties of this folder"
 msgstr "èæéåèæåçåæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Refresh the folder"
 msgstr "éæèåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Change the name of this folder"
 msgstr "èæéåèæåçåç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Select Message _Thread"
 msgstr "éæéäæé(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1242
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Select all messages in the same thread as the selected message"
 msgstr "éæææçéçéäçéåçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Select Message S_ubthread"
 msgstr "éæéäåçç(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Select all replies to the currently selected message"
 msgstr "éæææåèéåéäçä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Empty _Trash"
 msgstr "æçåæç(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æäçéåææåèååéååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "_New Label"
 msgstr "æåæç(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "N_one"
 msgstr "ææ(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1291
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "_Manage Subscriptions"
 msgstr "ççèé(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
-#: ../modules/mail/e-mail-shell-view-actions.c:1370
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "èéæåæèéåéçäæåçèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "Send / _Receive"
 msgstr "åé/ææ(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Send queued items and retrieve new items"
 msgstr "åéåéçéçäæææçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "R_eceive All"
 msgstr "åéææ(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Receive new items from all accounts"
 msgstr "ææåææåèåçæéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Send All"
 msgstr "åéåé(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "Send queued items in all accounts"
 msgstr "åéåææåèååéçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "Cancel the current mail operation"
 msgstr "åæçåéäæäçèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
+#: ../modules/mail/e-mail-shell-view-actions.c:1385
 msgid "Collapse All _Threads"
 msgstr "ææææçééä(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
 msgid "Collapse all message threads"
 msgstr "ææææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1354
+#: ../modules/mail/e-mail-shell-view-actions.c:1392
 msgid "E_xpand All Threads"
 msgstr "åéææçééä(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
 msgid "Expand all message threads"
 msgstr "åéææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1361
+#: ../modules/mail/e-mail-shell-view-actions.c:1399
 msgid "_Message Filters"
 msgstr "éäèå(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1363
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "Create or edit rules for filtering new mail"
 msgstr "çæéäåçæçèéæèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1368
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 msgid "_Subscriptions..."
 msgstr "èé(_S)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1415
 msgid "F_older"
 msgstr "èæå(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 msgid "_Label"
 msgstr "æç(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "C_reate Search Folder From Search..."
 msgstr "åæååçæåèæå(_R)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Search F_olders"
 msgstr "æåèæå(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1410
+#: ../modules/mail/e-mail-shell-view-actions.c:1448
 msgid "Create or edit search folder definitions"
 msgstr "åçæçèæåèæåçåç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1441
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "_New Folder..."
 msgstr "æåèæå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1469
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "Show Message _Preview"
 msgstr "éçéäéè(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1471
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Show message preview pane"
 msgstr "éçéäéèçæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Show _Deleted Messages"
 msgstr "éçååééä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "Show deleted messages with a line through them"
 msgstr "éçååéçéä (åäåéç)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1485
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
 msgid "_Group By Threads"
 msgstr "äçééäççç(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1487
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "Threaded message list"
 msgstr "çééäæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Show message preview below the message list"
 msgstr "åéäæåäæéçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show message preview alongside the message list"
 msgstr "åéäæåæééçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1523
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "All Messages"
 msgstr "ææéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1530
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
 msgid "Important Messages"
 msgstr "éèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1537
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
 msgid "Last 5 Days' Messages"
 msgstr "æè 5 åçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1544
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Messages Not Junk"
 msgstr "éååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1551
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "Messages with Attachments"
 msgstr "æéäçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1558
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "No Label"
 msgstr "çæç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Read Messages"
 msgstr "åèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Recent Messages"
 msgstr "æèçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Unread Messages"
 msgstr "æèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Subject or Addresses contain"
 msgstr "äææéåéääååå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1641
+#: ../modules/mail/e-mail-shell-view-actions.c:1683
 msgid "All Accounts"
 msgstr "ææçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1648
+#: ../modules/mail/e-mail-shell-view-actions.c:1690
 msgid "Current Account"
 msgstr "çåçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1655
+#: ../modules/mail/e-mail-shell-view-actions.c:1697
 msgid "Current Folder"
 msgstr "çåçèæå"
 
@@ -16734,7 +16830,7 @@ msgstr "ææçåèæå"
 msgid "Account Search"
 msgstr "åèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:942
+#: ../modules/mail/e-mail-shell-view.c:945
 msgid "Proxy _Logout"
 msgstr "çåäçäæå(_L)"
 
@@ -16795,7 +16891,7 @@ msgstr "åæç"
 msgid "Send / Receive"
 msgstr "åé/ææ"
 
-#: ../modules/mail/em-composer-prefs.c:510
+#: ../modules/mail/em-composer-prefs.c:513
 msgid "Language(s)"
 msgstr "èè"
 
@@ -17025,7 +17121,7 @@ msgstr ""
 "æèäç Evolutionãääçéæè Evolution éçèæçéåéäåèïäåååä"
 "æççåååææã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:609
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
 msgid "Loading accounts..."
 msgstr "æåèååèâ"
 
@@ -17452,6 +17548,7 @@ msgstr "çè CalDAV èäæ"
 
 #: ../plugins/caldav/caldav-source.c:240
 #: ../plugins/calendar-http/calendar-http.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "_URL:"
 msgstr "çå(_U):"
 
@@ -17461,13 +17558,6 @@ msgstr "çå(_U):"
 msgid "Use _secure connection"
 msgstr "äçååéç(_S)"
 
-#: ../plugins/caldav/caldav-source.c:249
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:660
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
-msgid "User_name:"
-msgstr "äçèåç(_N):"
-
 #: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr "çèäæåçèäæ(_E)"
@@ -17494,8 +17584,10 @@ msgid "_Customize options"
 msgstr "èèéé(_C)"
 
 #: ../plugins/calendar-file/calendar-file.c:153
-msgid "File _name:"
-msgstr "ææåç(_N):"
+#: ../widgets/misc/e-attachment-dialog.c:330
+#: ../widgets/misc/e-import-assistant.c:266
+msgid "F_ilename:"
+msgstr "ææåç(_I):"
 
 #: ../plugins/calendar-file/calendar-file.c:157
 msgid "Choose calendar file"
@@ -17732,16 +17824,12 @@ msgid "Command to be executed to launch the editor: "
 msgstr "çäååçèåçæä: "
 
 #: ../plugins/external-editor/external-editor.c:115
-#, fuzzy
-#| msgid ""
-#| "For Emacs use \"xemacs\"\n"
-#| "For VI use \"gvim -f\""
 msgid ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
 msgstr ""
-"Emacs äçãxemacsã\n"
-"VI äçãgvim -fã"
+"XEmacs äçãxemacsã\n"
+"Vim äçãgvim -fã"
 
 #: ../plugins/external-editor/external-editor.c:394
 #: ../plugins/external-editor/external-editor.c:396
@@ -17855,8 +17943,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:569
-#: ../plugins/mail-to-task/mail-to-task.c:828
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:838
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Unknown error."
 msgstr "äæçéèã"
 
@@ -18889,105 +18977,117 @@ msgid ""
 "old memo?"
 msgstr "éåçååéæååçååååéã%sããæåèçèæèçååéï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:641
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:643
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
-msgstr "æåçéæ %d åéäèèæçääãçåèæåååéåååï"
+msgid_plural ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+msgstr[0] "æåçéæ %d åéäèèæçääãçåèæåååéåååï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:644
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
-msgstr "æåçéæ %d åéäèèæçåäãçåèæåååéåååï"
+msgid_plural ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+msgstr[0] "æåçéæ %d åéäèèæçåäãçåèæåååéåååï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:647
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:655
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
-msgstr "æåçéæ %d åéäèèæçååéãçåèæåååéåååï"
+msgid_plural ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr[0] "æåçéæ %d åéäèèæçååéãçåèæåååéåååï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:666
+#: ../plugins/mail-to-task/mail-to-task.c:676
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "æåèççèæåéçéäï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:741
+#: ../plugins/mail-to-task/mail-to-task.c:751
 msgid "[No Summary]"
 msgstr "[æææè]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:763
 msgid "Invalid object returned from a server"
 msgstr "åäæåååçæççä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:803
+#: ../plugins/mail-to-task/mail-to-task.c:813
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "åèçæéççéèï%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:828
+#: ../plugins/mail-to-task/mail-to-task.c:838
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "çæéåèäæã%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:835
+#: ../plugins/mail-to-task/mail-to-task.c:845
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr "éåçäææåèçïåæäèåéèåçääãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:838
+#: ../plugins/mail-to-task/mail-to-task.c:848
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "éåçäææåèçïåæäèåéèåçåäãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:841
+#: ../plugins/mail-to-task/mail-to-task.c:851
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr "éåçäææåèçïåæäèåéèåçååéãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "äèååäææåã%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1152
+#: ../plugins/mail-to-task/mail-to-task.c:1162
 msgid "No writable calendar is available."
 msgstr "ææåååçèäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create an _Event"
 msgstr "åçää(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1256
 msgid "Create a new event from the selected message"
 msgstr "äéåçéäåçæçää"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1251
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a Mem_o"
 msgstr "åçååé(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1253
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 msgid "Create a new memo from the selected message"
 msgstr "äéåçéäåçæçååé"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1258
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a _Task"
 msgstr "åçåä(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1260
+#: ../plugins/mail-to-task/mail-to-task.c:1270
 msgid "Create a new task from the selected message"
 msgstr "äéåçéäåçæçåä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a _Meeting"
 msgstr "åçæè(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a new meeting from the selected message"
 msgstr "äéåçéäåçæçæè"
 
@@ -19475,10 +19575,6 @@ msgstr "WebDAV éçä"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
-msgid "URL:"
-msgstr "çå:"
-
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "éå IfM_atch (éäç Apache < 2.2.8)"
@@ -20004,7 +20100,7 @@ msgstr "éææèï%s"
 msgid "Execute these search parameters"
 msgstr "åèéäæååæ"
 
-#: ../shell/e-shell-window.c:445
+#: ../shell/e-shell-window.c:487
 msgid "New"
 msgstr "æå"
 
@@ -20015,7 +20111,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:189
+#: ../shell/main.c:188
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20050,7 +20146,7 @@ msgstr ""
 "æååææäååäææïèäæå\n"
 "çååæææäæèï\n"
 
-#: ../shell/main.c:213
+#: ../shell/main.c:212
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20058,13 +20154,13 @@ msgstr ""
 "èè\n"
 "Evolution åçæä\n"
 
-#: ../shell/main.c:220
+#: ../shell/main.c:219
 msgid "Do not tell me again"
 msgstr "äèåéçéåèæ"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:311
+#: ../shell/main.c:310
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20072,43 +20168,41 @@ msgstr ""
 "åå Evolution æäæåçåäéçãåççééæãmailãããcalendarãã"
 "ãcontactsãããtasksãåãmemosã"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:314
 msgid "Apply the given geometry to the main window"
 msgstr "åæåçåååçåäèç"
 
-#: ../shell/main.c:319
+#: ../shell/main.c:318
 msgid "Start in online mode"
 msgstr "äçäæååå"
 
-#: ../shell/main.c:321
+#: ../shell/main.c:320
 msgid "Ignore network availability"
 msgstr "åççéçèæååç"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:322
 msgid "Start in \"express\" mode"
 msgstr "äãåéãæååå"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:325
 msgid "Forcibly shut down Evolution"
 msgstr "ååéé Evoultion"
 
-#: ../shell/main.c:329
-msgid "Send the debugging output of all components to a file."
-msgstr "ååéåäçééèåèæåéèäåææã"
-
-#: ../shell/main.c:331
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "åçåääåæçåçèåã"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "åçéäãéçäååäçéèçæã"
 
-#: ../shell/main.c:337
-msgid "Import URIs or file names given as rest of arguments."
+#: ../shell/main.c:334
+#, fuzzy
+#| msgid "Import URIs or file names given as rest of arguments."
+msgid "Import URIs or filenames given as rest of arguments."
 msgstr "åæåç URI æææåçååçæääçåæã"
 
-#: ../shell/main.c:339
+#: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "èæåèäç Evolution çåçæ"
 
@@ -20346,27 +20440,27 @@ msgstr "MD5 æç"
 msgid "Email Address"
 msgstr "éåéääå"
 
-#: ../smime/gui/certificate-manager.c:575
+#: ../smime/gui/certificate-manager.c:576
 msgid "Select a certificate to import..."
 msgstr "éåèååçæèâ"
 
-#: ../smime/gui/certificate-manager.c:588
+#: ../smime/gui/certificate-manager.c:589
 msgid "All files"
 msgstr "ææææ"
 
-#: ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/certificate-manager.c:624
 msgid "Failed to import certificate"
 msgstr "çæååæè"
 
-#: ../smime/gui/certificate-manager.c:992
+#: ../smime/gui/certificate-manager.c:993
 msgid "All PKCS12 files"
 msgstr "ææç PKCS12 ææ"
 
-#: ../smime/gui/certificate-manager.c:1009
+#: ../smime/gui/certificate-manager.c:1010
 msgid "All email certificate files"
 msgstr "ææçéåéäæèææ"
 
-#: ../smime/gui/certificate-manager.c:1026
+#: ../smime/gui/certificate-manager.c:1027
 msgid "All CA certificate files"
 msgstr "ææç CA æèææ"
 
@@ -21015,10 +21109,6 @@ msgstr "çæååéä"
 msgid "Attachment Properties"
 msgstr "éäåå"
 
-#: ../widgets/misc/e-attachment-dialog.c:330
-msgid "_Filename:"
-msgstr "ææåç(_F):"
-
 #: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "MIME éåï"
@@ -21081,40 +21171,40 @@ msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "ååéä"
 
-#: ../widgets/misc/e-attachment-view.c:404
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Open With Other Application..."
 msgstr "äåäæççåéåâ"
 
-#: ../widgets/misc/e-attachment-view.c:411
+#: ../widgets/misc/e-attachment-view.c:386
 msgid "S_ave All"
 msgstr "åååé(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:437
+#: ../widgets/misc/e-attachment-view.c:412
 msgid "A_dd Attachment..."
 msgstr "ååéä(_A)â"
 
-#: ../widgets/misc/e-attachment-view.c:461
+#: ../widgets/misc/e-attachment-view.c:436
 msgid "_Hide"
 msgstr "éè(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:468
+#: ../widgets/misc/e-attachment-view.c:443
 msgid "Hid_e All"
 msgstr "åééè(_E)"
 
-#: ../widgets/misc/e-attachment-view.c:475
+#: ../widgets/misc/e-attachment-view.c:450
 msgid "_View Inline"
 msgstr "æèèå(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:482
+#: ../widgets/misc/e-attachment-view.c:457
 msgid "Vie_w All Inline"
 msgstr "åéäèåæè(_W)"
 
-#: ../widgets/misc/e-attachment-view.c:803
+#: ../widgets/misc/e-attachment-view.c:778
 #, c-format
 msgid "Open With \"%s\""
 msgstr "äã%sãéå"
 
-#: ../widgets/misc/e-attachment-view.c:806
+#: ../widgets/misc/e-attachment-view.c:781
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å %s äéåéåéä"
@@ -21200,10 +21290,6 @@ msgid ""
 "of file it is from the list."
 msgstr "éåèåå Evolution çææïääåæååéåææéåã"
 
-#: ../widgets/misc/e-import-assistant.c:266
-msgid "F_ilename:"
-msgstr "ææåç(_I):"
-
 #: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "éæäåææ"
@@ -21319,7 +21405,7 @@ msgstr "Evolution çåçéçæåãæääææéäéèçäå
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "åççèçæäçïEvolution çåçéçæåã"
 
-#: ../widgets/misc/e-preferences-window.c:279
+#: ../widgets/misc/e-preferences-window.c:308
 msgid "Evolution Preferences"
 msgstr "Evolution ååèå"
 
@@ -21876,3 +21962,36 @@ msgstr "åééå"
 #: ../widgets/text/e-text.c:2340
 msgid "Input Methods"
 msgstr "èåæ"
+
+#~ msgid "Recent _Documents"
+#~ msgstr "æèäçæä(_D)"
+
+#~ msgid "Categor_ies..."
+#~ msgstr "åé(_I)â"
+
+#~ msgid "File exists \"{0}\"."
+#~ msgstr "ææåååã{0}ãã"
+
+#~ msgid "Do you wish to overwrite it?"
+#~ msgstr "èèåå?"
+
+#~ msgid "File _name:"
+#~ msgstr "ææåç(_N):"
+
+#~ msgid "_Filename:"
+#~ msgstr "ææåç(_F):"
+
+#~ msgid "never"
+#~ msgstr "æä"
+
+#~ msgid "C_haracter set:"
+#~ msgstr "ååé(_H):"
+
+#~ msgid "cards"
+#~ msgstr "åç"
+
+#~ msgid "URL:"
+#~ msgstr "çå:"
+
+#~ msgid "Send the debugging output of all components to a file."
+#~ msgstr "ååéåäçééèåèæåéèäåææã"



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