[evolution] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- From: Chao-Hsiung Liao <chliao src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- Date: Wed, 18 Jul 2012 11:29:25 +0000 (UTC)
commit abeae376f4c0a3499a1d526af8a0179ba9513986
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date: Wed Jul 18 19:29:10 2012 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 924 ++++++++++++++++++++++++++++++-----------------------------
po/zh_TW.po | 924 ++++++++++++++++++++++++++++++-----------------------------
2 files changed, 934 insertions(+), 914 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 84446bd..96b68bd 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: evolution 3.3.91\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-09 19:16+0800\n"
-"PO-Revision-Date: 2012-07-09 19:18+0800\n"
+"POT-Creation-Date: 2012-07-18 19:28+0800\n"
+"PO-Revision-Date: 2012-07-18 19:28+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"
@@ -79,7 +79,7 @@ msgid "This address book will be removed permanently."
msgstr "æéèéåèæéçéã"
#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
msgid "Do _Not Delete"
msgstr "äèåé(_N)"
@@ -165,7 +165,7 @@ msgid ""
msgstr "æèçäçéåéäåååçååãäçèåäéèåååæäåçæåçåï"
#: ../addressbook/addressbook.error.xml.h:33
-#: ../mail/em-vfolder-editor-rule.c:364 ../widgets/table/e-table-config.ui.h:6
+#: ../mail/em-vfolder-editor-rule.c:388 ../widgets/table/e-table-config.ui.h:6
msgid "_Add"
msgstr "åå(_A)"
@@ -1521,21 +1521,38 @@ msgid "Appointments"
msgstr "çæ"
#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "åéèé(_A)"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3
msgid "_Snooze"
msgstr "åæ(_S)"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
#: ../libevolution-utils/e-alert-dialog.c:162
msgid "_Dismiss"
msgstr "èé(_D)"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-queue.c:1755
+#: ../calendar/alarm-notify/alarm-queue.c:1765
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
+#: ../modules/itip-formatter/itip-view.c:1413
+#: ../modules/itip-formatter/itip-view.c:1513
+msgid "Location:"
+msgstr "äç:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+msgid "location of appointment"
+msgstr "çæçåé"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
msgid "Snooze _time:"
msgstr "åçæé(_T):"
#. Translators: This is the last part of the sentence:
#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
#: ../modules/calendar/e-cal-shell-view-actions.c:352
#: ../plugins/publish-calendar/publish-calendar.ui.h:6
@@ -1543,7 +1560,7 @@ msgstr "åçæé(_T):"
msgid "days"
msgstr "å"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
#: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
#: ../widgets/misc/e-interval-chooser.c:141
@@ -1551,58 +1568,41 @@ msgid "hours"
msgstr "åæ"
#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
-#: ../mail/e-mail-config-provider-page.c:541
+#: ../mail/e-mail-config-provider-page.c:527
#: ../modules/addressbook/ldap-config.ui.h:29
#: ../widgets/misc/e-interval-chooser.c:139
msgid "minutes"
msgstr "åé"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
-msgid "location of appointment"
-msgstr "çæçåé"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/alarm-notify/alarm-queue.c:1754
-#: ../calendar/alarm-notify/alarm-queue.c:1764
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:216
-#: ../modules/itip-formatter/itip-view.c:1413
-#: ../modules/itip-formatter/itip-view.c:1513
-msgid "Location:"
-msgstr "äç:"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-msgid "Dismiss _All"
-msgstr "åéèé(_A)"
-
-#: ../calendar/alarm-notify/alarm-queue.c:1603
-#: ../calendar/alarm-notify/alarm-queue.c:1735
+#: ../calendar/alarm-notify/alarm-queue.c:1604
+#: ../calendar/alarm-notify/alarm-queue.c:1736
msgid "No summary available."
msgstr "ææåççæèã"
-#: ../calendar/alarm-notify/alarm-queue.c:1612
-#: ../calendar/alarm-notify/alarm-queue.c:1614
+#: ../calendar/alarm-notify/alarm-queue.c:1613
+#: ../calendar/alarm-notify/alarm-queue.c:1615
msgid "No description available."
msgstr "ææääæèã"
-#: ../calendar/alarm-notify/alarm-queue.c:1622
+#: ../calendar/alarm-notify/alarm-queue.c:1623
msgid "No location information available."
msgstr "ææåççåéèèã"
-#: ../calendar/alarm-notify/alarm-queue.c:1668
+#: ../calendar/alarm-notify/alarm-queue.c:1669
#, c-format
msgid "You have %d reminder"
msgid_plural "You have %d reminders"
msgstr[0] "äæ %d åéé"
-#: ../calendar/alarm-notify/alarm-queue.c:1864
-#: ../calendar/alarm-notify/alarm-queue.c:1899
+#: ../calendar/alarm-notify/alarm-queue.c:1865
+#: ../calendar/alarm-notify/alarm-queue.c:1900
msgid "Warning"
msgstr "èå"
-#: ../calendar/alarm-notify/alarm-queue.c:1868
+#: ../calendar/alarm-notify/alarm-queue.c:1869
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -1614,7 +1614,7 @@ msgstr ""
"éåéåéäã Evolution æéç\n"
"æéçæéåèçääæã"
-#: ../calendar/alarm-notify/alarm-queue.c:1905
+#: ../calendar/alarm-notify/alarm-queue.c:1906
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1631,7 +1631,7 @@ msgstr ""
"\n"
"äçåèåèéåçåï"
-#: ../calendar/alarm-notify/alarm-queue.c:1920
+#: ../calendar/alarm-notify/alarm-queue.c:1921
msgid "Do not ask me about this program again."
msgstr "äèåèåæéæéåçåã"
@@ -2053,7 +2053,7 @@ msgstr "äæéçåäææç GroupWise äæåèäåèéåäç
msgid "Could not perform this operation."
msgstr "çæéèéåæäã"
-#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:166
+#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:169
msgid "You must be working online to complete this operation."
msgstr "äåéæçäåäæèåæææäã"
@@ -2423,11 +2423,11 @@ msgstr "æææè"
msgid "Keep original item?"
msgstr "æåäæååéçï"
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1157
msgid "Close the current window"
msgstr "ééçåçèç"
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:134
+#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
#: ../shell/e-shell-window-actions.c:1446
#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
#: ../widgets/misc/e-web-view.c:327 ../widgets/misc/e-web-view.c:1413
@@ -2436,53 +2436,53 @@ msgstr "ééçåçèç"
msgid "Copy the selection"
msgstr "èèéåçåå"
-#: ../calendar/gui/dialogs/comp-editor.c:1167 ../mail/e-mail-browser.c:141
+#: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
#: ../shell/e-shell-window-actions.c:1453
#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
#: ../widgets/misc/e-web-view.c:1407 ../widgets/misc/e-web-view-gtkhtml.c:1293
msgid "Cut the selection"
msgstr "åäéåçå"
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1178
#: ../shell/e-shell-window-actions.c:1460
#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
msgid "Delete the selection"
msgstr "åééåçå"
-#: ../calendar/gui/dialogs/comp-editor.c:1181
+#: ../calendar/gui/dialogs/comp-editor.c:1185
msgid "View help"
msgstr "æèæå"
-#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:148
+#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
#: ../shell/e-shell-window-actions.c:1481
#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
#: ../widgets/misc/e-web-view.c:1419 ../widgets/misc/e-web-view-gtkhtml.c:1305
msgid "Paste the clipboard"
msgstr "èäåèççåå"
-#: ../calendar/gui/dialogs/comp-editor.c:1209
+#: ../calendar/gui/dialogs/comp-editor.c:1213
msgid "Save current changes"
msgstr "ååçåçææ"
-#: ../calendar/gui/dialogs/comp-editor.c:1214
+#: ../calendar/gui/dialogs/comp-editor.c:1218
msgid "Save and Close"
msgstr "ååäéé"
-#: ../calendar/gui/dialogs/comp-editor.c:1216
+#: ../calendar/gui/dialogs/comp-editor.c:1220
msgid "Save current changes and close editor"
msgstr "ååçåçææääééçèå"
-#: ../calendar/gui/dialogs/comp-editor.c:1223 ../mail/e-mail-browser.c:155
+#: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
#: ../shell/e-shell-window-actions.c:1558
#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
msgid "Select all text"
msgstr "éåæææå"
-#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../calendar/gui/dialogs/comp-editor.c:1234
msgid "_Classification"
msgstr "æé(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1237
+#: ../calendar/gui/dialogs/comp-editor.c:1241
#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
#: ../mail/e-mail-browser.c:169
#: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -2491,131 +2491,131 @@ msgstr "æé(_C)"
msgid "_Edit"
msgstr "çè(_E)"
-#: ../calendar/gui/dialogs/comp-editor.c:1244 ../mail/e-mail-browser.c:162
+#: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
#: ../shell/e-shell-window-actions.c:1593
#: ../widgets/misc/e-mail-signature-editor.c:299
msgid "_File"
msgstr "ææ(_F)"
-#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../calendar/gui/dialogs/comp-editor.c:1255
#: ../shell/e-shell-window-actions.c:1600
msgid "_Help"
msgstr "æå(_H)"
-#: ../calendar/gui/dialogs/comp-editor.c:1258
+#: ../calendar/gui/dialogs/comp-editor.c:1262
msgid "_Insert"
msgstr "æå(_I)"
-#: ../calendar/gui/dialogs/comp-editor.c:1265
+#: ../calendar/gui/dialogs/comp-editor.c:1269
#: ../composer/e-composer-actions.c:339
msgid "_Options"
msgstr "éé(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1272 ../mail/e-mail-browser.c:176
+#: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
msgid "_View"
msgstr "æè(_V)"
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1286
#: ../composer/e-composer-actions.c:288
msgid "_Attachment..."
msgstr "éä(_A)â"
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../calendar/gui/dialogs/comp-editor.c:1288
#: ../composer/e-composer-actions.c:290
#: ../widgets/misc/e-attachment-view.c:414
msgid "Attach a file"
msgstr "éåææ"
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1296
msgid "_Categories"
msgstr "åé(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1298
msgid "Toggles whether to display categories"
msgstr "åææåéçãåéã"
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1304
msgid "Time _Zone"
msgstr "æå(_Z)"
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1306
msgid "Toggles whether the time zone is displayed"
msgstr "åææåéçãæåã"
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1315
msgid "Pu_blic"
msgstr "åé(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1317
msgid "Classify as public"
msgstr "åéçåé"
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1322
msgid "_Private"
msgstr "çä(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1320
+#: ../calendar/gui/dialogs/comp-editor.c:1324
msgid "Classify as private"
msgstr "æéççä"
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1329
msgid "_Confidential"
msgstr "æå(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1327
+#: ../calendar/gui/dialogs/comp-editor.c:1331
msgid "Classify as confidential"
msgstr "æéçæå"
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../calendar/gui/dialogs/comp-editor.c:1339
msgid "R_ole Field"
msgstr "èèæä(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1337
+#: ../calendar/gui/dialogs/comp-editor.c:1341
msgid "Toggles whether the Role field is displayed"
msgstr "åææåéçãèèãæä"
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1347
msgid "_RSVP"
msgstr "_RSVP"
-#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../calendar/gui/dialogs/comp-editor.c:1349
msgid "Toggles whether the RSVP field is displayed"
msgstr "åææåéçãRSVPãæä"
-#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../calendar/gui/dialogs/comp-editor.c:1355
msgid "_Status Field"
msgstr "çææä(_S)"
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1357
msgid "Toggles whether the Status field is displayed"
msgstr "åææåéçãçæãæä"
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1363
msgid "_Type Field"
msgstr "éåæä(_T)"
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1365
msgid "Toggles whether the Attendee Type is displayed"
msgstr "åææåéçãåæèéåãæä"
-#: ../calendar/gui/dialogs/comp-editor.c:2110
+#: ../calendar/gui/dialogs/comp-editor.c:2114
#: ../composer/e-composer-actions.c:507
msgid "Attach"
msgstr "éå"
-#: ../calendar/gui/dialogs/comp-editor.c:2459
-#: ../calendar/gui/dialogs/comp-editor.c:2643
-#: ../calendar/gui/dialogs/comp-editor.c:3647
+#: ../calendar/gui/dialogs/comp-editor.c:2463
+#: ../calendar/gui/dialogs/comp-editor.c:2647
+#: ../calendar/gui/dialogs/comp-editor.c:3651
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "åæææçææïåæææåæéçæåçææ"
-#: ../calendar/gui/dialogs/comp-editor.c:3611
+#: ../calendar/gui/dialogs/comp-editor.c:3615
#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
msgid "attachment"
msgstr "éä"
-#: ../calendar/gui/dialogs/comp-editor.c:3679
+#: ../calendar/gui/dialogs/comp-editor.c:3683
msgid "Unable to use current version!"
msgstr "çæäççåççæï"
@@ -3044,12 +3044,12 @@ msgstr "çæåã%sãéåååéï%s"
#: ../calendar/gui/dialogs/memo-page.c:983
#: ../em-format/e-mail-parser-application-mbox.c:111
-#: ../em-format/e-mail-parser-application-smime.c:105
+#: ../em-format/e-mail-parser-application-smime.c:107
#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:94
#: ../em-format/e-mail-parser-inlinepgp-signed.c:96
#: ../em-format/e-mail-parser-multipart-encrypted.c:122
#: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:715 ../mail/e-mail-reader.c:1748
+#: ../libemail-engine/mail-ops.c:716 ../mail/e-mail-reader.c:1748
#: ../mail/em-folder-tree.c:678 ../modules/itip-formatter/itip-view.c:4459
#: ../modules/itip-formatter/itip-view.c:4857 ../plugins/face/face.c:174
#: ../smime/gui/certificate-manager.c:317
@@ -3819,7 +3819,7 @@ msgid "Priority:"
msgstr "ååççï"
#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../mail/e-mail-config-service-page.c:720
+#: ../mail/e-mail-config-service-page.c:672
msgid "Description:"
msgstr "æèï"
@@ -3839,7 +3839,7 @@ msgstr "éåææ"
#: ../calendar/gui/e-meeting-list-view.c:644
#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../mail/e-mail-account-tree-view.c:139
+#: ../mail/e-mail-account-tree-view.c:157
#: ../widgets/misc/e-attachment-tree-view.c:586
msgid "Type"
msgstr "éå"
@@ -7140,7 +7140,7 @@ msgstr "ååçéèç "{0}"ãéäååèææååã"
msgid "An error occurred while sending. How do you want to proceed?"
msgstr "ååäæççéèãäèåäççï"
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:151
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:154
msgid "The reported error was "{0}"."
msgstr "ååçéèç "{0}"ã"
@@ -9291,9 +9291,11 @@ msgstr "åæ"
msgid "Bcc"
msgstr "åäåæ"
-#: ../em-format/e-mail-formatter.c:1367 ../mail/e-mail-tag-editor.c:332
-#: ../mail/em-filter-i18n.h:76 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:72 ../smime/lib/e-cert.c:1125
+#: ../em-format/e-mail-formatter.c:1367
+#: ../em-format/e-mail-formatter-quote-headers.c:166
+#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
+#: ../smime/lib/e-cert.c:1125
msgid "Subject"
msgstr "äæ"
@@ -9348,7 +9350,7 @@ msgstr "åéåæåå RFC822 éä"
#: ../em-format/e-mail-formatter-print.c:53
#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1236
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1238
#: ../modules/cal-config-google/e-google-chooser.c:209
#: ../modules/plugin-manager/evolution-plugin-manager.c:68
#: ../widgets/menus/gal-define-views-dialog.c:352
@@ -9385,6 +9387,13 @@ msgstr "S/MIME çç"
msgid "S/MIME encrpyted"
msgstr "S/MIME åå"
+#. pseudo-header
+#: ../em-format/e-mail-formatter-quote-headers.c:177
+#: ../em-format/e-mail-formatter-utils.c:316
+#: ../modules/mail/em-mailer-prefs.c:1048
+msgid "Mailer"
+msgstr "åäè"
+
#: ../em-format/e-mail-formatter-quote-text-enriched.c:102
#: ../em-format/e-mail-formatter-text-enriched.c:115
msgid "Richtext"
@@ -9524,18 +9533,12 @@ msgstr "äæ"
msgid "Display source of a MIME part"
msgstr "éç MIME éåçäæ"
-#. pseudo-header
-#: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1048
-msgid "Mailer"
-msgstr "åäè"
-
#: ../em-format/e-mail-parser-application-mbox.c:108
#, c-format
msgid "Error parsing MBOX part: %s"
msgstr "èæ MBOX éåæåçéèï%s"
-#: ../em-format/e-mail-parser-application-smime.c:102
+#: ../em-format/e-mail-parser-application-smime.c:104
#, c-format
msgid "Could not parse S/MIME message: %s"
msgstr "çæèæ S/MIME éäï%s"
@@ -10068,7 +10071,7 @@ msgstr "éèçæèèçåã{0}ãã"
msgid "Could not compile regular expression "{1}"."
msgstr "çæçèæèèçåã{1}ãã"
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:97
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
msgid "Missing name."
msgstr "çååçã"
@@ -10162,56 +10165,56 @@ msgstr ""
msgid "Invalid authentication result code (%d)"
msgstr "çæçéèçæäç (%d)"
-#: ../libemail-engine/e-mail-folder-utils.c:109
+#: ../libemail-engine/e-mail-folder-utils.c:112
#, c-format
msgid "Saving message to folder '%s'"
msgstr "ååéäåèæåã%sã"
-#: ../libemail-engine/e-mail-folder-utils.c:272
+#: ../libemail-engine/e-mail-folder-utils.c:557
msgid "Forwarded messages"
msgstr "åèåçéä"
-#: ../libemail-engine/e-mail-folder-utils.c:382
-#: ../libemail-engine/e-mail-folder-utils.c:633
+#: ../libemail-engine/e-mail-folder-utils.c:667
+#: ../libemail-engine/e-mail-folder-utils.c:918
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "åå %d åéä"
-#: ../libemail-engine/e-mail-folder-utils.c:476
+#: ../libemail-engine/e-mail-folder-utils.c:761
msgid "Scanning messages for duplicates"
msgstr "ææéäæåæéè"
-#: ../libemail-engine/e-mail-folder-utils.c:883
+#: ../libemail-engine/e-mail-folder-utils.c:1169
#, c-format
msgid "Removing folder '%s'"
msgstr "çéèæåã%sã"
-#: ../libemail-engine/e-mail-folder-utils.c:1019
+#: ../libemail-engine/e-mail-folder-utils.c:1306
#, c-format
msgid "File \"%s\" has been removed."
msgstr "ææã%sãåçèçéã"
-#: ../libemail-engine/e-mail-folder-utils.c:1023
+#: ../libemail-engine/e-mail-folder-utils.c:1310
msgid "File has been removed."
msgstr "ææåçèçéã"
-#: ../libemail-engine/e-mail-folder-utils.c:1082
+#: ../libemail-engine/e-mail-folder-utils.c:1369
msgid "Removing attachments"
msgstr "æåçééä"
-#: ../libemail-engine/e-mail-folder-utils.c:1246
+#: ../libemail-engine/e-mail-folder-utils.c:1533
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messages"
msgstr[0] "åå %d åéä"
-#: ../libemail-engine/e-mail-folder-utils.c:1602 ../mail/em-folder-utils.c:609
+#: ../libemail-engine/e-mail-folder-utils.c:1889 ../mail/em-folder-utils.c:609
#, c-format
msgid "Invalid folder URI '%s'"
msgstr "çæçèæå URIã%sã"
-#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-properties.c:333
+#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-properties.c:333
#: ../mail/em-folder-tree-model.c:765
#: ../modules/mail/e-mail-shell-view-private.c:1033
#: ../modules/mail/e-mail-shell-view-private.c:1044
@@ -10219,25 +10222,25 @@ msgid "Inbox"
msgstr "æäå"
#. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:758
+#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:758
#: ../modules/mail/e-mail-shell-view-private.c:1031
msgid "Drafts"
msgstr "èç"
#. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-tree-model.c:769
+#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:769
#: ../modules/mail/e-mail-shell-view-private.c:1035
msgid "Outbox"
msgstr "åäå"
#. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:773
+#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-tree-model.c:773
#: ../modules/mail/e-mail-shell-view-private.c:1037
msgid "Sent"
msgstr "ååé"
#. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:761
+#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:761
#: ../modules/mail/e-mail-shell-view-private.c:1039
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
#: ../plugins/templates/templates.c:1049 ../plugins/templates/templates.c:1349
@@ -10245,29 +10248,29 @@ msgstr "ååé"
msgid "Templates"
msgstr "çæ"
-#: ../libemail-engine/e-mail-session.c:1246
+#: ../libemail-engine/e-mail-session.c:1326
#, c-format
msgid "User cancelled operation"
msgstr "äçèåæçæä"
-#: ../libemail-engine/e-mail-session.c:1371
+#: ../libemail-engine/e-mail-session.c:1451
#, c-format
msgid ""
"No destination address provided, forwarding of the message has been "
"cancelled."
msgstr "æææäççåäåïéäçèååçåæã"
-#: ../libemail-engine/e-mail-session.c:1384
+#: ../libemail-engine/e-mail-session.c:1464
#, c-format
msgid "No identity found to use, forwarding of the message has been cancelled."
msgstr "æäååäççèåçïéäçèååçåæã"
-#: ../libemail-engine/e-mail-session.c:1546
+#: ../libemail-engine/e-mail-session.c:1626
#, c-format
msgid "%s authentication failed"
msgstr "%s éèåæ"
-#: ../libemail-engine/e-mail-session.c:1591
+#: ../libemail-engine/e-mail-session.c:1671
#, c-format
msgid "No data source found for UID '%s'"
msgstr "ææ UIDã%sãçèæäæ"
@@ -10278,14 +10281,14 @@ msgid "Cannot get transport for account '%s'"
msgstr "äèåååèã%sãçåè"
#: ../libemail-engine/e-mail-session-utils.c:508
-#: ../libemail-engine/mail-ops.c:693
+#: ../libemail-engine/mail-ops.c:694
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "çæåçååéæåï%s"
#: ../libemail-engine/e-mail-session-utils.c:537
#: ../libemail-engine/e-mail-session-utils.c:571
-#: ../libemail-engine/mail-ops.c:710 ../libemail-engine/mail-ops.c:746
+#: ../libemail-engine/mail-ops.c:711 ../libemail-engine/mail-ops.c:747
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -10295,21 +10298,16 @@ msgstr ""
"æéåèæåãåäåãèæåã"
#: ../libemail-engine/e-mail-session-utils.c:591
-#: ../libemail-engine/mail-ops.c:768
+#: ../libemail-engine/mail-ops.c:769
#, c-format
msgid "Failed to append to local 'Sent' folder: %s"
msgstr "çæéåèæåãåäåãèæåï%s"
#: ../libemail-engine/e-mail-session-utils.c:821
-#: ../libemail-engine/mail-ops.c:896 ../libemail-engine/mail-ops.c:997
+#: ../libemail-engine/mail-ops.c:897 ../libemail-engine/mail-ops.c:998
msgid "Sending message"
msgstr "æååééä"
-#: ../libemail-engine/e-mail-session-utils.c:897
-#, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "åæèéèæå ã%sã"
-
#: ../libemail-engine/e-mail-store-utils.c:171
#, c-format
msgid "Disconnecting from '%s'"
@@ -10325,20 +10323,20 @@ msgstr "éæéçåã%sã"
msgid "Preparing account '%s' for offline"
msgstr "æååèã%sãéçåä"
-#: ../libemail-engine/mail-folder-cache.c:887
+#: ../libemail-engine/mail-folder-cache.c:884
#, c-format
msgid "Pinging %s"
msgstr "Pinging %s"
-#: ../libemail-engine/mail-ops.c:93
+#: ../libemail-engine/mail-ops.c:94
msgid "Filtering Selected Messages"
msgstr "éæéæçéä"
-#: ../libemail-engine/mail-ops.c:215
+#: ../libemail-engine/mail-ops.c:216
msgid "Fetching Mail"
msgstr "ææéä"
-#: ../libemail-engine/mail-ops.c:907
+#: ../libemail-engine/mail-ops.c:908
#, c-format
msgid "Sending message %d of %d"
msgstr "æååééä %d / %d"
@@ -10346,61 +10344,51 @@ msgstr "æååééä %d / %d"
#. Translators: The string is distinguished by total
#. * count of messages to be sent. Failed messages is
#. * always more than zero.
-#: ../libemail-engine/mail-ops.c:958
+#: ../libemail-engine/mail-ops.c:959
#, c-format
msgid "Failed to send a message"
msgid_plural "Failed to send %d of %d messages"
msgstr[0] "çæåé %d / %d åéä"
-#: ../libemail-engine/mail-ops.c:964 ../mail/mail-send-recv.c:854
+#: ../libemail-engine/mail-ops.c:965 ../mail/mail-send-recv.c:846
msgid "Canceled."
msgstr "ååæã"
-#: ../libemail-engine/mail-ops.c:966 ../mail/mail-send-recv.c:856
+#: ../libemail-engine/mail-ops.c:967 ../mail/mail-send-recv.c:848
msgid "Complete."
msgstr "åæã"
-#: ../libemail-engine/mail-ops.c:1078
+#: ../libemail-engine/mail-ops.c:1079
#, c-format
msgid "Moving messages to '%s'"
msgstr "åéäçåã%sã"
-#: ../libemail-engine/mail-ops.c:1079
+#: ../libemail-engine/mail-ops.c:1080
#, c-format
msgid "Copying messages to '%s'"
msgstr "åéäèèåã%sã"
-#: ../libemail-engine/mail-ops.c:1196
+#: ../libemail-engine/mail-ops.c:1197
#, c-format
msgid "Storing folder '%s'"
msgstr "æåèèèæåã%sã"
-#: ../libemail-engine/mail-ops.c:1269
+#: ../libemail-engine/mail-ops.c:1270
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "æçååååè '%s'"
-#: ../libemail-engine/mail-ops.c:1270
+#: ../libemail-engine/mail-ops.c:1271
#, c-format
msgid "Storing account '%s'"
msgstr "åååè '%s'"
-#: ../libemail-engine/mail-ops.c:1332
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "éææçèæåã%sã"
-
-#: ../libemail-engine/mail-ops.c:1562
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr "æåååèæåã%sã"
-
-#: ../libemail-engine/mail-ops.c:1655
+#: ../libemail-engine/mail-ops.c:1345
#, c-format
msgid "Emptying trash in '%s'"
msgstr "æçã%sãçåæç"
-#: ../libemail-engine/mail-ops.c:1751
+#: ../libemail-engine/mail-ops.c:1431
#, c-format
msgid "Disconnecting %s"
msgstr "æåäæ %s"
@@ -10424,12 +10412,12 @@ msgstr "èåçéä - %s"
msgid "Forwarded message"
msgstr "èåçéä"
-#: ../libemail-engine/mail-vfolder.c:77
+#: ../libemail-engine/mail-vfolder.c:129
#, c-format
msgid "Setting up Search Folder: %s"
msgstr "èåæåèæåï %s"
-#: ../libemail-engine/mail-vfolder.c:218
+#: ../libemail-engine/mail-vfolder.c:282
#, c-format
msgid "Updating Search Folders for '%s' - %s"
msgstr "ææã%sãçæåèæå- %s"
@@ -10439,7 +10427,7 @@ msgstr "ææã%sãçæåèæå- %s"
#. * removed folder. For more than one search folder is
#. * each of them on a separate line, with four spaces
#. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:560
+#: ../libemail-engine/mail-vfolder.c:647
#, c-format
msgid ""
"The Search Folder \"%s\" has been modified to account for the deleted "
@@ -10472,11 +10460,11 @@ msgstr "éèå(_F)"
msgid "Enabled"
msgstr "ååç"
-#: ../mail/e-mail-account-tree-view.c:105
+#: ../mail/e-mail-account-tree-view.c:109
msgid "Account Name"
msgstr "åèåç"
-#: ../mail/e-mail-account-tree-view.c:116
+#: ../mail/e-mail-account-tree-view.c:134
#: ../mail/e-mail-config-security-page.c:333
#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3661
#: ../mail/mail-config.ui.h:44
@@ -10529,7 +10517,7 @@ msgstr "(ææäæ)"
msgid "Evolution Account Assistant"
msgstr "Evolution åèåç"
-#: ../mail/e-mail-config-auth-check.c:346
+#: ../mail/e-mail-config-auth-check.c:347
msgid "Check for Supported Types"
msgstr "ææææçéå"
@@ -10681,15 +10669,15 @@ msgstr "ååæççåæ(_W)â"
msgid "Looking up account details..."
msgstr "åæåèèçèæâ"
-#: ../mail/e-mail-config-provider-page.c:499
+#: ../mail/e-mail-config-provider-page.c:485
msgid "Checking for New Mail"
msgstr "æææéä"
-#: ../mail/e-mail-config-provider-page.c:515
+#: ../mail/e-mail-config-provider-page.c:501
msgid "Check for _new messages every"
msgstr "èåæææéäæ(_N)"
-#: ../mail/e-mail-config-provider-page.c:787
+#: ../mail/e-mail-config-provider-page.c:700
msgid "Receiving Options"
msgstr "ææéé"
@@ -10791,7 +10779,7 @@ msgstr "çåéååéäææéèæåå"
msgid "Sending Email"
msgstr "åééåéä"
-#: ../mail/e-mail-config-service-page.c:688
+#: ../mail/e-mail-config-service-page.c:640
msgid "Server _Type:"
msgstr "äæåéå(_T):"
@@ -10924,7 +10912,7 @@ msgid "_Later"
msgstr "çå(_L)"
#: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:745
+#: ../modules/mail/e-mail-shell-view-actions.c:718
msgid "Add Label"
msgstr "ååæç"
@@ -11588,7 +11576,7 @@ msgstr "ääå"
msgid "Previous"
msgstr "ääå"
-#: ../mail/e-mail-reader.c:3981 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3981 ../mail/mail-dialogs.ui.h:15
msgid "Reply"
msgstr "åè"
@@ -11597,17 +11585,17 @@ msgstr "åè"
msgid "Folder '%s'"
msgstr "èæåã%sã"
-#: ../mail/e-mail-reader-utils.c:152
+#: ../mail/e-mail-reader-utils.c:154
msgid "Do not warn me again"
msgstr "äèåèåæ"
-#: ../mail/e-mail-reader-utils.c:551
+#: ../mail/e-mail-reader-utils.c:948
msgid "Printing"
msgstr "åå"
#. Translators: %s is replaced with a folder
#. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:730
+#: ../mail/e-mail-reader-utils.c:1127
#, c-format
msgid ""
"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11617,7 +11605,7 @@ msgid_plural ""
"them?"
msgstr[0] "èæåã%sãåå %u åéèçéäãäçåèåéåï"
-#: ../mail/e-mail-reader-utils.c:1134
+#: ../mail/e-mail-reader-utils.c:1531
msgid "Save Message"
msgid_plural "Save Messages"
msgstr[0] "ååéä"
@@ -11627,12 +11615,12 @@ msgstr[0] "ååéä"
#. * mbox format, when the first message doesn't have a
#. * subject. The extension ".mbox" is appended to the
#. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1155
+#: ../mail/e-mail-reader-utils.c:1552
msgid "Message"
msgid_plural "Messages"
msgstr[0] "éä"
-#: ../mail/e-mail-reader-utils.c:1609
+#: ../mail/e-mail-reader-utils.c:2006
msgid "Parsing message"
msgstr "èæéä"
@@ -11849,7 +11837,7 @@ msgid "Play Sound"
msgstr "ææéæ"
#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:19
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
msgid "Read"
msgstr "åè"
@@ -12055,7 +12043,7 @@ msgid "Subscribe To _All"
msgstr "åéèé(_A)"
#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1844
-#: ../modules/mail/e-mail-shell-view-actions.c:1363
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
msgid "_Unsubscribe"
msgstr "åæèé(_U)"
@@ -12092,7 +12080,7 @@ msgid "Su_bscribe"
msgstr "èé(_B)"
#: ../mail/em-subscription-editor.c:1843
-#: ../modules/mail/e-mail-shell-view-actions.c:1365
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
msgid "Unsubscribe from the selected folder"
msgstr "åæèééåçèæå"
@@ -12139,7 +12127,7 @@ msgstr "äèåéçéåèæ(_D)"
msgid "Message Filters"
msgstr "éäèå"
-#: ../mail/em-utils.c:1000
+#: ../mail/em-utils.c:1064
#, c-format
msgid "Messages from %s"
msgstr "äè %s çéä"
@@ -12148,16 +12136,44 @@ msgstr "äè %s çéä"
msgid "Search _Folders"
msgstr "æåèæå(_F)"
-#: ../mail/em-vfolder-editor-rule.c:364
+#: ../mail/em-vfolder-editor-rule.c:388
msgid "Add Folder"
msgstr "ååèæå"
+#: ../mail/em-vfolder-editor-rule.c:514
+msgid "Search Folder Sources"
+msgstr "æåèæåäæ"
+
+#: ../mail/em-vfolder-editor-rule.c:544
+msgid "Automatically update on any _source folder change"
+msgstr "äæèæåäæääæææèåææ(_S)"
+
+#: ../mail/em-vfolder-editor-rule.c:556
+msgid "All local folders"
+msgstr "æææåçèæå"
+
+#: ../mail/em-vfolder-editor-rule.c:557
+msgid "All active remote folders"
+msgstr "ææåççéçèæå"
+
+#: ../mail/em-vfolder-editor-rule.c:558
+msgid "All local and active remote folders"
+msgstr "æææåçååççéçèæå"
+
+#: ../mail/em-vfolder-editor-rule.c:559
+msgid "Specific folders"
+msgstr "æåçèæå"
+
+#: ../mail/em-vfolder-editor-rule.c:594
+msgid "include subfolders"
+msgstr "åæåçé"
+
#: ../mail/importers/elm-importer.c:179
msgid "Importing Elm data"
msgstr "èå Elm èæ"
#: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1069
+#: ../modules/mail/e-mail-shell-view.c:1071
#: ../widgets/misc/e-send-options.c:538
msgid "Mail"
msgstr "éä"
@@ -12682,26 +12698,6 @@ msgid "SSL encryption"
msgstr "SSL åå"
#: ../mail/mail-dialogs.ui.h:1
-msgid "Search Folder Sources"
-msgstr "æåèæåäæ"
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local folders"
-msgstr "æææåçèæå"
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All active remote folders"
-msgstr "ææåççéçèæå"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "All local and active remote folders"
-msgstr "æææåçååççéçèæå"
-
-#: ../mail/mail-dialogs.ui.h:5
-msgid "Specific folders"
-msgstr "æåçèæå"
-
-#: ../mail/mail-dialogs.ui.h:6
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
@@ -12709,72 +12705,72 @@ msgstr ""
"äéæèèéçéäååäéååã\n"
"èåãæåãéåäéæèéçåäã"
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:3
msgid "_Flag:"
msgstr "æå(_F):"
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:4
msgid "_Due By:"
msgstr "åææ(_D):"
#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:6
msgid "Co_mpleted"
msgstr "ååæ(_M)"
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:7
msgid "Call"
msgstr "ååäç"
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:8
msgid "Do Not Forward"
msgstr "äèèå"
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:9
msgid "Follow-Up"
msgstr "èé"
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:10
msgid "For Your Information"
msgstr "çäçèè"
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:11
msgid "Forward"
msgstr "ääé"
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:12
msgid "No Response Necessary"
msgstr "äéèåæ"
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:16
msgid "Reply to All"
msgstr "åèåé"
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:17
msgid "Review"
msgstr "æé"
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:18
msgid "License Agreement"
msgstr "ææåç"
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
msgid "_Tick this to accept the license agreement"
msgstr "éåæéäæåææåç(_T)"
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
msgid "_Accept License"
msgstr "æåææ(_A)"
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
msgid "Security Information"
msgstr "äåæèè"
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
msgid "Digital Signature"
msgstr "æççç"
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:23
msgid "Encryption"
msgstr "åå"
@@ -12948,7 +12944,7 @@ msgid ""
msgstr "èæäçéææèæåäææåéçéäï"
#: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
msgid "_Empty Trash"
msgstr "æçåæç(_E)"
@@ -13028,96 +13024,108 @@ msgid ""
msgstr "Evolution éèççèæåæèæåäæïèäèèæåäåäéæååãçåæåéã"
#: ../mail/mail.error.xml.h:60
+msgid "Failed to expunge folder "{0}"."
+msgstr "çææéèæå "{0}"ã"
+
+#: ../mail/mail.error.xml.h:61
+msgid "The reported error was "{1}"."
+msgstr "ååçéèç "{1}"ã"
+
+#: ../mail/mail.error.xml.h:62
+msgid "Failed to refresh folder "{0}"."
+msgstr "çæéææçèæå "{0}"ã"
+
+#: ../mail/mail.error.xml.h:63
msgid "Cannot rename or move system folder \"{0}\"."
msgstr "äèéæååæçåççèæåã{0}ãã"
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
msgid "Really delete folder \"{0}\" and all of its subfolders?"
msgstr "çåèåéèæåã{0}ãäååææçåèæå?"
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
msgid ""
"If you delete the folder, all of its contents and its subfolders' contents "
"will be deleted permanently."
msgstr "åæäåéèæåïåçææååååèæåååææéåéã"
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
msgid "Really delete folder \"{0}\"?"
msgstr "çåèåéèæåã{0}ãï"
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
msgid ""
"If you delete the folder, all of its contents will be deleted permanently."
msgstr "åæäéæåéèæåïåçææååææéæåã"
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
msgid "These messages are not copies."
msgstr "éäéääæèæã"
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
msgid ""
"Messages shown in Search Folders are not copies. Deleting them from a Search "
"Folder will delete the actual messages from the folder or folders in which "
"they physically reside. Do you really want to delete these messages?"
msgstr "åæåèæåäéççéäääæèæãåæåèæåäåééäåæèäçæåæéçèæååéåéçéäãæåçåèåééäéäï"
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr "äèåã{0}ãéæååæã{1}ãã"
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr "åçæåççã{1}ãçèæåååãèäçäåçåçã"
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "äèåèæåã{0}ãçèã{1}ãã"
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
msgid "Cannot open source \"{2}\"."
msgstr "äèéåäæã{2}ãã"
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
msgid "Cannot open target \"{2}\"."
msgstr "äèéåçæã{2}ãã"
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
msgstr "çæåã{0}ãèæåèèèã{1}ãã"
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
msgid "Cannot create folder \"{0}\"."
msgstr "äèåçèæåã{0}ãã"
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
msgid "Cannot open source \"{1}\"."
msgstr "äèéåäæã{1}ãã"
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
msgid "Cannot save changes to account."
msgstr "çæåååèææã"
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
msgid "You have not filled in all of the required information."
msgstr "äææååææåéçèèã"
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
msgid "You may not create two accounts with the same name."
msgstr "ääèççåçåçåçåååèã"
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
msgid "Are you sure you want to delete this account?"
msgstr "çåèåééååèï"
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
msgid "If you proceed, the account information will be deleted permanently."
msgstr "åæççïåèèèææäåéã"
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
msgid "Are you sure you want to delete this account and all its proxies?"
msgstr "çåèåééååèäååææçäçäæåï"
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
@@ -13125,29 +13133,29 @@ msgstr ""
"åæççïèåèçèèäå\n"
"åææçäçäæåææéåéã"
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
msgid ""
"Are you sure you want to disable this account and delete all its proxies?"
msgstr "çåèåééååèäååææçäçäæåï"
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
msgid "If you proceed, all proxy accounts will be deleted permanently."
msgstr "åæççïææçäçäæååèææäåéã"
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
msgid "Do _Not Disable"
msgstr "äèåç(_N)"
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
#: ../plugins/publish-calendar/publish-calendar.c:628
msgid "_Disable"
msgstr "åç(_D)"
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
msgstr "äèçèæåèæåã{0}ãïåçåäååã"
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
@@ -13155,39 +13163,39 @@ msgstr ""
"æèæååèåçèåæåã\n"
"éèæïèçèæåèæåçèåïäæåæåæååã"
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
msgid "Cannot add Search Folder \"{0}\"."
msgstr "äèååæåèæåã{0}ãã"
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
msgid "A folder named \"{0}\" already exists. Please use a different name."
msgstr "åçæåççã{0}ãçèæåååãèäçäåçåçã"
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:96
msgid "Search Folders automatically updated."
msgstr "æåèæåèåææã"
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
msgid "Mail filters automatically updated."
msgstr "éäéæåèåææã"
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
msgid "Missing folder."
msgstr "éæèæåã"
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
msgid "You must specify a folder."
msgstr "äåéæåäåèæåã"
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:101
msgid "You must name this Search Folder."
msgstr "äåéååææåèæåã"
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:102
msgid "No sources selected."
msgstr "æéåäæã"
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:103
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -13196,11 +13204,11 @@ msgstr ""
"äåéèåæåäåèæåçæäæã\n"
"ååéåèæåïçå/æéåæææåèæåãææéçèæåæäèçéã"
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
msgid "Problem migrating old mail folder \"{0}\"."
msgstr "èçèéäèæåã{0}ãççåéã"
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:106
msgid ""
"A non-empty folder at \"{1}\" already exists.\n"
"\n"
@@ -13211,23 +13219,23 @@ msgstr ""
"\n"
"äåäéæåçæèæåãèåæéååçååæèçæã"
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
msgid "Ignore"
msgstr "åç"
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:110
msgid "_Overwrite"
msgstr "èå(_O)"
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:111
msgid "_Append"
msgstr "æå(_A)"
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:112
msgid "Evolution's local mail format has changed."
msgstr "Evolution çæåçéäæååçæèäã"
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
msgid ""
"Evolution's local mail format has changed from mbox to Maildir. Your local "
"mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -13241,219 +13249,219 @@ msgstr ""
"\n"
"çåæåçäå mbox åèääçèç mbox èæåãäåäåçèèæéååèæåååååéãåæäéæèæïèçåæèåççéã"
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
msgid "_Exit Evolution"
msgstr "çæ _Evolution "
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:117
msgid "_Migrate Now"
msgstr "çåèç(_M)"
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
msgid "Unable to read license file."
msgstr "çæèåææææã"
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
msgid ""
"Cannot read the license file \"{0}\", due to an installation problem. You "
"will not be able to use this provider until you can accept its license."
msgstr "äèèåææææææã{0}ãïæèæåèåééæçãåäåæééææäååçæäçåã"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
msgid "Please wait."
msgstr "èçåã"
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "åäæåæèææçéèæçææåã"
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
msgid ""
"Failed to query server for a list of supported authentication mechanisms."
msgstr "çæåäæåæèææçéèæçææåã"
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
msgid "Unable to connect to the GroupWise server."
msgstr "çæéçè GroupWise äæåã"
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
msgid "Please check your account settings and try again."
msgstr "èææåèèåäåèäæã"
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:125
msgid "Synchronize folders locally for offline usage?"
msgstr "æååæèæåääéçäçï"
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
msgid ""
"Do you want to locally synchronize the folders that are marked for offline "
"usage?"
msgstr "æåèåæåçåæéäæèçéçäççèæåï"
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
msgid "Do _Not Synchronize"
msgstr "äèåæ(_N)"
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
msgid "_Synchronize"
msgstr "åæå(_S)"
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
msgid "Do you want to mark all messages as read?"
msgstr "æåèååéçéäæçæåéèï"
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
msgid "This will mark all messages as read in the selected folder."
msgstr "éæåæçéåçèæåäææéäçåéèã"
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
msgid ""
"This will mark all messages as read in the selected folder and its "
"subfolders."
msgstr "éæåæçéåçèæååååèæåäææéäçåéèã"
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
msgid "Close message window."
msgstr "éééäèçã"
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:133
msgid "Would you like to close the message window?"
msgstr "äæèéééäèçåï"
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
msgid "_Yes"
msgstr "æ(_Y)"
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
msgid "_No"
msgstr "å(_N)"
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
msgid "_Always"
msgstr "çæ(_A)"
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
msgid "N_ever"
msgstr "æä(_E)"
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:138
msgid "Copy folder in folder tree."
msgstr "æèæåæçåèèã"
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
msgstr "æåçåèåèæåã{0}ãèèåèæåã{1}ãï"
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
msgid "Move folder in folder tree."
msgstr "æèæåæçåçåã"
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:141
msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
msgstr "æåçåèåèæåã{0}ãçååèæåã{1}ãï"
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:142
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
msgstr "åçäææåçéæçäåéçåèïæäçæåéæéäã"
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:143
msgid "Please enable the account or send using another account."
msgstr "èåçèåèæäçåäåèåéã"
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:144
msgid "Mail Deletion Failed"
msgstr "åééäåæ"
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:145
msgid "You do not have sufficient permissions to delete this mail."
msgstr "äææèåçæéåéæåéäã"
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:146
msgid "\"Check Junk\" Failed"
msgstr "ãææååéäãåæ"
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:147
msgid "\"Report Junk\" Failed"
msgstr "ãååååéäãåæ"
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:148
msgid "\"Report Not Junk\" Failed"
msgstr "ãååçéååéäãåæ"
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:149
msgid "Remove duplicate messages?"
msgstr "æåçééèçéäï"
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:150
msgid "No duplicate messages found."
msgstr "æäåéèçéäã"
#. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:152
msgid "Folder '{0}' doesn't contain any duplicate message."
msgstr "èæåã{0}ãäæååääéèçéäã"
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:153
msgid "Failed to disconnect account "{0}"."
msgstr "çæäæèåè "{0}" çéçã"
-#: ../mail/mail.error.xml.h:152
-msgid "Failed to unsubscribe from folder."
-msgstr "çæåæèéèæåã"
+#: ../mail/mail.error.xml.h:155
+msgid "Failed to unsubscribe from folder "{0}"."
+msgstr "çæåæèéèæå "{0}"ã"
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:156
msgid "Unable to retrieve message."
msgstr "çæææéäã"
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:157
msgid "{0}"
msgstr "{0}"
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:158
msgid "Failed to open folder."
msgstr "çæéåèæåã"
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:159
msgid "Failed to find duplicate messages."
msgstr "æäåéèçéäã"
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:160
msgid "Failed to retrieve messages."
msgstr "çæååéäã"
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:161
msgid "Failed to remove attachments from messages."
msgstr "çæçééääçéäã"
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:162
msgid "Failed to download messages for offline viewing."
msgstr "äèéçäççéäåæã"
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:163
msgid "Failed to save messages to disk."
msgstr "çæåéåçéäååèççã"
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:164
msgid "Hidden file is attached."
msgstr "éåäéèçææã"
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:165
msgid ""
"The attachment named {0} is a hidden file and may contain sensitive data. "
"Please review it before sending."
msgstr "åçç {0} çéäæéèæïåèååææèæãèéææéååååã"
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:166
msgid "Printing failed."
msgstr "åååæã"
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:167
msgid "The printer replied "{0}"."
msgstr "æåæåè "{0}"ã"
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:168
msgid "Could not perform this operation on {0}."
msgstr "çæéè {0} äçæäã"
@@ -13461,23 +13469,23 @@ msgstr "çæéè {0} äçæäã"
msgid "Canceling..."
msgstr "æååæâ"
-#: ../mail/mail-send-recv.c:518
+#: ../mail/mail-send-recv.c:510
msgid "Send & Receive Mail"
msgstr "åéèææéä"
-#: ../mail/mail-send-recv.c:534
+#: ../mail/mail-send-recv.c:526
msgid "Cancel _All"
msgstr "åéåæ(_A)"
-#: ../mail/mail-send-recv.c:626 ../mail/mail-send-recv.c:1003
+#: ../mail/mail-send-recv.c:618 ../mail/mail-send-recv.c:995
msgid "Updating..."
msgstr "ææäâ"
-#: ../mail/mail-send-recv.c:626 ../mail/mail-send-recv.c:708
+#: ../mail/mail-send-recv.c:618 ../mail/mail-send-recv.c:700
msgid "Waiting..."
msgstr "æåçåâ"
-#: ../mail/mail-send-recv.c:983
+#: ../mail/mail-send-recv.c:975
#, c-format
msgid "Checking for new mail"
msgstr "æææéä"
@@ -13490,7 +13498,7 @@ msgstr "æåèæå"
msgid "Edit Search Folder"
msgstr "çèæåèæå"
-#: ../mail/mail-vfolder-ui.c:270
+#: ../mail/mail-vfolder-ui.c:280
msgid "New Search Folder"
msgstr "æåæåèæå"
@@ -13560,25 +13568,25 @@ msgstr "%mæ%dæ %p %l:%M"
msgid "%b %d %Y"
msgstr "%Yå%mæ%dæ"
-#: ../mail/message-list.c:2753
+#: ../mail/message-list.c:2777
msgid "Select all visible messages"
msgstr "éæåéåèçéä"
-#: ../mail/message-list.c:2889 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2913 ../mail/message-list.etspec.h:17
msgid "Messages"
msgstr "éä"
#. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4108
+#: ../mail/message-list.c:4132
msgid "Follow-up"
msgstr "èé"
#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4667 ../mail/message-list.c:5087
+#: ../mail/message-list.c:4691 ../mail/message-list.c:5111
msgid "Generating message list"
msgstr "ççéäæå"
-#: ../mail/message-list.c:4901
+#: ../mail/message-list.c:4925
msgid ""
"No message satisfies your search criteria. Change search criteria by "
"selecting a new Show message filter from the drop down list above or by "
@@ -13586,7 +13594,7 @@ msgid ""
"by changing the query above."
msgstr "ææéäæèäçæåæäãèåäåäæåéåéæéçéäéæåæåèæçæåïåå æå->æé éåéçæéåææèäéçæèã"
-#: ../mail/message-list.c:4906
+#: ../mail/message-list.c:4930
msgid "There are no messages in this folder."
msgstr "éåèæåäææéäã"
@@ -13623,27 +13631,27 @@ msgid "Subject or Addresses contains"
msgstr "äææéåéääååå"
#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
msgid "Recipients contain"
msgstr "æäèåå"
#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
msgid "Message contains"
msgstr "éäåå"
#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1710
msgid "Subject contains"
msgstr "äæåå"
#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
msgid "Sender contains"
msgstr "åäèåå"
#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1716
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
msgid "Body contains"
msgstr "åæåå"
@@ -13791,7 +13799,7 @@ msgstr "éçåéåéèéäææèçäçåå"
#: ../modules/calendar/e-cal-shell-view-actions.c:1447
#: ../modules/calendar/e-memo-shell-view-actions.c:664
#: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
msgid "_Rename..."
msgstr "éæåå(_R)â"
@@ -13872,7 +13880,7 @@ msgstr "åä(_A)"
#: ../modules/addressbook/e-book-shell-view-actions.c:927
#: ../modules/calendar/e-memo-shell-view-actions.c:701
#: ../modules/calendar/e-task-shell-view-actions.c:853
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1473
msgid "_Preview"
msgstr "éè(_P)"
@@ -13884,7 +13892,7 @@ msgid "_Delete"
msgstr "åé(_D)"
#: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
msgid "_Properties"
msgstr "åæ(_P)"
@@ -13911,7 +13919,7 @@ msgstr "åèçäéèèçéçåå"
#: ../modules/addressbook/e-book-shell-view-actions.c:1005
#: ../modules/calendar/e-memo-shell-view-actions.c:771
#: ../modules/calendar/e-task-shell-view-actions.c:935
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1599
msgid "_Classic View"
msgstr "åçæè(_C)"
@@ -13922,7 +13930,7 @@ msgstr "åèçäæåäæéçèçäéè"
#: ../modules/addressbook/e-book-shell-view-actions.c:1012
#: ../modules/calendar/e-memo-shell-view-actions.c:778
#: ../modules/calendar/e-task-shell-view-actions.c:942
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1606
msgid "_Vertical View"
msgstr "åçæè(_V)"
@@ -13948,7 +13956,7 @@ msgstr "ææççèæ"
#: ../modules/calendar/e-cal-shell-view-actions.c:1790
#: ../modules/calendar/e-memo-shell-view-actions.c:805
#: ../modules/calendar/e-task-shell-view-actions.c:1004
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
#: ../shell/e-shell-content.c:664
msgid "Advanced Search"
msgstr "ééæå"
@@ -14355,13 +14363,12 @@ msgid "LDAP over SSL (deprecated)"
msgstr "LDAP éé SSL (ååæ)"
#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
-#, fuzzy
msgid "Microsoft Global Catalog"
-msgstr "åååéçé"
+msgstr "Microsoft éçéåçé"
#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
msgid "Microsoft Global Catalog over SSL"
-msgstr ""
+msgstr "éé SSL ç Microsoft éçéåçé"
#. Page 1
#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
@@ -14407,7 +14414,7 @@ msgid "Using LDAP"
msgstr "äç LDAP"
#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
-#: ../modules/mail/e-mail-shell-view.c:58
+#: ../modules/mail/e-mail-shell-view.c:116
msgid "Searching"
msgstr "æåæå"
@@ -14464,28 +14471,28 @@ msgstr "çå:"
msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
msgstr "éå IfMatch (éäç Apache < 2.2.8)"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:398
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:400
#, c-format
msgid "HTTP Error: %s"
msgstr "HTTP éèï %s"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:428
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:430
msgid "Could not parse response"
msgstr "çæèæåæ"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:437
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:439
msgid "Empty response"
msgstr "çççåæ"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:445
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
msgid "Unexpected reply from server"
msgstr "äèäæåæéæçåæ"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1032
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1034
msgid "Could not locate user's calendars"
msgstr "çæåääçèèäæ"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1256
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1258
msgid "Path"
msgstr "èå"
@@ -14567,18 +14574,6 @@ msgstr "ææï"
msgid "Allow Evolution to update the file"
msgstr "åè Evolution ææææ"
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:224
-msgid "Metric (Celsius, cm, etc)"
-msgstr "åå(ææãåçç)"
-
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:227
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr "èå(èæãååç)"
-
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:229
-msgid "Units:"
-msgstr "åäï"
-
#: ../modules/calendar/e-cal-attachment-handler.c:323
#: ../smime/gui/smime-ui.ui.h:32
msgid "I_mport"
@@ -16455,9 +16450,8 @@ msgstr "éçåäç STARTTLS"
#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
#: ../modules/mail-config/e-mail-config-smtp-backend.c:168
-#, fuzzy
msgid "SSL on a dedicated port"
-msgstr "éæäæåçéæåã"
+msgstr "SSL æåççéæå"
#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
msgid "Ser_ver requires authentication"
@@ -16524,319 +16518,315 @@ msgstr "éäçèåååèå"
msgid "Network Preferences"
msgstr "ççååèå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
-#: ../modules/mail/e-mail-shell-view.c:970
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view.c:972
msgid "_Disable Account"
msgstr "åçåè(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
msgid "Disable this account"
msgstr "åçéååè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1260
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
msgid "Permanently remove all the deleted messages from all folders"
msgstr "æäçéåææèæååçååéçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1267
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
msgid "Edit properties of this account"
msgstr "çèéååèçåæ"
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
msgid "_Download Messages for Offline Usage"
msgstr "äèéçäççéä(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1274
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
msgid "Download messages of accounts and folders marked for offline usage"
msgstr "äèæèçéçäççåèèèæåäéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
msgid "Fl_ush Outbox"
msgstr "æçåäå(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
msgid "_Copy Folder To..."
msgstr "èèèæåå(_C)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
msgid "Copy the selected folder into another folder"
msgstr "èèåéåçèæåååäåèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
msgid "Permanently remove this folder"
msgstr "æäçééåèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
msgid "E_xpunge"
msgstr "åé(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
msgid "Permanently remove all deleted messages from this folder"
msgstr "æäçéåéåèæååååéçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
msgid "Mar_k All Messages as Read"
msgstr "æçææéäçåéè(_K)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
msgid "Mark all messages in the folder as read"
msgstr "åèæåäåéçéäæçæåéè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
msgid "_Move Folder To..."
msgstr "çåèæåå(_M)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1316
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
msgid "Move the selected folder into another folder"
msgstr "åéåçèæåçèåäåèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
msgid "_New..."
msgstr "æå(_N)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
msgid "Create a new folder for storing mail"
msgstr "åçäåæèæåäååéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
msgid "Change the properties of this folder"
msgstr "ææéåèæåçåæ"
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
msgid "Refresh the folder"
msgstr "éæèåèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
msgid "Change the name of this folder"
msgstr "ææéåèæåçåç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
msgid "Select Message _Thread"
msgstr "éæéäæé(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1351
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
msgid "Select all messages in the same thread as the selected message"
msgstr "éæææçéçéäçéåçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
msgid "Select Message S_ubthread"
msgstr "éæéäåçç(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1358
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
msgid "Select all replies to the currently selected message"
msgstr "éæææåèéåéäçä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1370
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
msgid "Empty _Trash"
msgstr "æçåæç(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
msgid "Permanently remove all the deleted messages from all accounts"
msgstr "æäçéåææåèååéååéçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
msgid "_New Label"
msgstr "æåæç(_N)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1386
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
msgid "N_one"
msgstr "ææ(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1400
+#: ../modules/mail/e-mail-shell-view-actions.c:1373
msgid "_Manage Subscriptions"
msgstr "ççèé(_M)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1402
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "èéæåæèéåéçäæåçèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
-#: ../modules/mail/e-mail-shell-view-actions.c:1428
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
msgid "Send / _Receive"
msgstr "åé/ææ(_R)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1409
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
msgid "Send queued items and retrieve new items"
msgstr "åéåéçéçäæææçéç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1414
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
msgid "R_eceive All"
msgstr "åéææ(_E)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1416
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
msgid "Receive new items from all accounts"
msgstr "ææåææåèåçæéç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1421
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
msgid "_Send All"
msgstr "åéåé(_S)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1423
+#: ../modules/mail/e-mail-shell-view-actions.c:1396
msgid "Send queued items in all accounts"
msgstr "åéåææåèååéçéç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
#: ../widgets/misc/e-activity-proxy.c:313
msgid "Cancel"
msgstr "åæ"
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1424
msgid "Cancel the current mail operation"
msgstr "åæçåéäæäçèå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
msgid "Collapse All _Threads"
msgstr "ææææçééä(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1458
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
msgid "Collapse all message threads"
msgstr "ææææççééä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1436
msgid "E_xpand All Threads"
msgstr "åéææçééä(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1465
+#: ../modules/mail/e-mail-shell-view-actions.c:1438
msgid "Expand all message threads"
msgstr "åéææççééä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
msgid "_Message Filters"
msgstr "éäèå(_M)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1472
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
msgid "Create or edit rules for filtering new mail"
msgstr "çæéäåçæçèéæèå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
msgid "_Subscriptions..."
msgstr "èé(_S)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1459
msgid "F_older"
msgstr "èæå(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1466
msgid "_Label"
msgstr "æç(_L)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
msgid "C_reate Search Folder From Search..."
msgstr "åæååçæåèæå(_R)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1517
+#: ../modules/mail/e-mail-shell-view-actions.c:1490
msgid "Search F_olders"
msgstr "æåèæå(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1492
msgid "Create or edit search folder definitions"
msgstr "åçæçèæåèæåçåç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
msgid "_New Folder..."
msgstr "æåèæå(_N)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
msgid "Show Message _Preview"
msgstr "éçéäéè(_P)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
msgid "Show message preview pane"
msgstr "éçéäéèçæ"
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
msgid "Show _Deleted Messages"
msgstr "éçååééä(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
msgid "Show deleted messages with a line through them"
msgstr "éçååéçéä (åäåéç)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1571
msgid "_Group By Threads"
msgstr "ææçééäççç(_G)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
msgid "Threaded message list"
msgstr "çééäæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1606
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
msgid "_Unmatched Folder Enabled"
msgstr "æçåèæåååç(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
msgid "Toggles whether Unmatched search folder is enabled"
msgstr "åææååçæçåæåèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
msgid "Show message preview below the message list"
msgstr "åéäæåäæéçéäéè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
msgid "Show message preview alongside the message list"
msgstr "åéäæåæééçéäéè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1643
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
msgid "All Messages"
msgstr "ææéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1650
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
msgid "Important Messages"
msgstr "éèéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1657
+#: ../modules/mail/e-mail-shell-view-actions.c:1630
msgid "Last 5 Days' Messages"
msgstr "æè 5 åçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1664
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
msgid "Messages Not Junk"
msgstr "éååéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1671
+#: ../modules/mail/e-mail-shell-view-actions.c:1644
msgid "Messages with Attachments"
msgstr "æéäçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1678
+#: ../modules/mail/e-mail-shell-view-actions.c:1651
msgid "No Label"
msgstr "çæç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1685
+#: ../modules/mail/e-mail-shell-view-actions.c:1658
msgid "Read Messages"
msgstr "åèéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1692
-msgid "Recent Messages"
-msgstr "æèçéä"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1699
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
msgid "Unread Messages"
msgstr "æèéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
msgid "Subject or Addresses contain"
msgstr "äææéåéääååå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1727
msgid "All Accounts"
msgstr "ææçåè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1734
msgid "Current Account"
msgstr "çåçåè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/mail/e-mail-shell-view-actions.c:1741
msgid "Current Folder"
msgstr "çåçèæå"
-#: ../modules/mail/e-mail-shell-view.c:562
+#: ../modules/mail/e-mail-shell-view.c:613
msgid "All Account Search"
msgstr "ææçåèæå"
-#: ../modules/mail/e-mail-shell-view.c:723
+#: ../modules/mail/e-mail-shell-view.c:709
msgid "Account Search"
msgstr "åèæå"
-#: ../modules/mail/e-mail-shell-view.c:968
+#: ../modules/mail/e-mail-shell-view.c:970
msgid "Proxy _Logout"
msgstr "çåäçäæå(_L)"
@@ -17183,13 +17173,12 @@ msgid "Loading accounts..."
msgstr "æåèååèâ"
#: ../modules/text-highlight/text-highlight.c:242
-#, fuzzy
msgid "Patch"
msgstr "äè"
#: ../modules/text-highlight/text-highlight.c:248
msgid "Format part as a patch"
-msgstr ""
+msgstr "åéåæååçäè"
#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:118
#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:201
@@ -17221,7 +17210,7 @@ msgstr "éèéèçä"
#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:202
msgid "Display the part as an addressbook contact"
-msgstr ""
+msgstr "åéåéççéèéèçä"
#: ../modules/web-inspector/evolution-web-inspector.c:88
msgid "_Inspect..."
@@ -19512,49 +19501,49 @@ msgid "Attached message"
msgstr "éåçéä"
#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1821 ../widgets/misc/e-attachment.c:2371
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
#: ../widgets/misc/e-attachment-store.c:525
msgid "attachment.dat"
msgstr "attachment.dat"
-#: ../widgets/misc/e-attachment.c:1869 ../widgets/misc/e-attachment.c:2673
+#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
msgid "A load operation is already in progress"
msgstr "èåæäååéèä"
-#: ../widgets/misc/e-attachment.c:1877 ../widgets/misc/e-attachment.c:2681
+#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
msgid "A save operation is already in progress"
msgstr "ååæäååéèä"
-#: ../widgets/misc/e-attachment.c:1976
+#: ../widgets/misc/e-attachment.c:1989
#, c-format
msgid "Could not load '%s'"
msgstr "çæèåã%sã"
-#: ../widgets/misc/e-attachment.c:1979
+#: ../widgets/misc/e-attachment.c:1992
#, c-format
msgid "Could not load the attachment"
msgstr "çæèåéä"
-#: ../widgets/misc/e-attachment.c:2252
+#: ../widgets/misc/e-attachment.c:2265
#, c-format
msgid "Could not open '%s'"
msgstr "çæéåã%sã"
-#: ../widgets/misc/e-attachment.c:2255
+#: ../widgets/misc/e-attachment.c:2268
#, c-format
msgid "Could not open the attachment"
msgstr "çæéåéä"
-#: ../widgets/misc/e-attachment.c:2689
+#: ../widgets/misc/e-attachment.c:2702
msgid "Attachment contents not loaded"
msgstr "çæèåéäåå"
-#: ../widgets/misc/e-attachment.c:2765
+#: ../widgets/misc/e-attachment.c:2778
#, c-format
msgid "Could not save '%s'"
msgstr "çæååã%sã"
-#: ../widgets/misc/e-attachment.c:2768
+#: ../widgets/misc/e-attachment.c:2781
#, c-format
msgid "Could not save the attachment"
msgstr "çæååéä"
@@ -20198,9 +20187,9 @@ msgstr "æåâ"
#. + Add to Dictionary
#: ../widgets/misc/e-spell-entry.c:444
-#, fuzzy, c-format
+#, c-format
msgid "Add \"%s\" to Dictionary"
-msgstr "ååã%sãèèå"
+msgstr "ååã%sãèåå"
#. - Ignore All
#: ../widgets/misc/e-spell-entry.c:487
@@ -20569,6 +20558,27 @@ msgstr "åééå"
msgid "Input Methods"
msgstr "èåæ"
+#~ msgid "Unsubscribing from folder '%s'"
+#~ msgstr "åæèéèæå ã%sã"
+
+#~ msgid "Refreshing folder '%s'"
+#~ msgstr "éææçèæåã%sã"
+
+#~ msgid "Expunging folder '%s'"
+#~ msgstr "æåååèæåã%sã"
+
+#~ msgid "Metric (Celsius, cm, etc)"
+#~ msgstr "åå(ææãååç)"
+
+#~ msgid "Imperial (Fahrenheit, inches, etc)"
+#~ msgstr "èå(èæãååç)"
+
+#~ msgid "Units:"
+#~ msgstr "åäï"
+
+#~ msgid "Recent Messages"
+#~ msgstr "æèçéä"
+
#~ msgid "Couldn't get list of address books: %s"
#~ msgstr "çæååéèéæåï%s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d67ae73..44c6f52 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: evolution 3.3.91\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-09 19:16+0800\n"
-"PO-Revision-Date: 2012-07-08 15:33+0800\n"
+"POT-Creation-Date: 2012-07-18 19:28+0800\n"
+"PO-Revision-Date: 2012-07-18 14:56+0800\n"
"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
"Language-Team: Chinese (traditional)\n"
"Language: zh_TW\n"
@@ -83,7 +83,7 @@ msgid "This address book will be removed permanently."
msgstr "æéèéåèæéçéã"
#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
msgid "Do _Not Delete"
msgstr "äèåé(_N)"
@@ -171,7 +171,7 @@ msgid ""
msgstr "æéçäçéåéäåååçååãæçèåäéèåååæäåçæåçåï"
#: ../addressbook/addressbook.error.xml.h:33
-#: ../mail/em-vfolder-editor-rule.c:364 ../widgets/table/e-table-config.ui.h:6
+#: ../mail/em-vfolder-editor-rule.c:388 ../widgets/table/e-table-config.ui.h:6
msgid "_Add"
msgstr "åå(_A)"
@@ -1539,21 +1539,38 @@ msgid "Appointments"
msgstr "çæ"
#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "åéèé(_A)"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3
msgid "_Snooze"
msgstr "åæ(_S)"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
#: ../libevolution-utils/e-alert-dialog.c:162
msgid "_Dismiss"
msgstr "èé(_D)"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-queue.c:1755
+#: ../calendar/alarm-notify/alarm-queue.c:1765
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
+#: ../modules/itip-formatter/itip-view.c:1413
+#: ../modules/itip-formatter/itip-view.c:1513
+msgid "Location:"
+msgstr "äç:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+msgid "location of appointment"
+msgstr "çæçåé"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
msgid "Snooze _time:"
msgstr "åçæé(_T):"
#. Translators: This is the last part of the sentence:
#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
#: ../modules/calendar/e-cal-shell-view-actions.c:352
#: ../plugins/publish-calendar/publish-calendar.ui.h:6
@@ -1561,7 +1578,7 @@ msgstr "åçæé(_T):"
msgid "days"
msgstr "å"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
#: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
#: ../widgets/misc/e-interval-chooser.c:141
@@ -1569,58 +1586,41 @@ msgid "hours"
msgstr "åæ"
#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
-#: ../mail/e-mail-config-provider-page.c:541
+#: ../mail/e-mail-config-provider-page.c:527
#: ../modules/addressbook/ldap-config.ui.h:29
#: ../widgets/misc/e-interval-chooser.c:139
msgid "minutes"
msgstr "åé"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
-msgid "location of appointment"
-msgstr "çæçåé"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/alarm-notify/alarm-queue.c:1754
-#: ../calendar/alarm-notify/alarm-queue.c:1764
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:216
-#: ../modules/itip-formatter/itip-view.c:1413
-#: ../modules/itip-formatter/itip-view.c:1513
-msgid "Location:"
-msgstr "äç:"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-msgid "Dismiss _All"
-msgstr "åéèé(_A)"
-
-#: ../calendar/alarm-notify/alarm-queue.c:1603
-#: ../calendar/alarm-notify/alarm-queue.c:1735
+#: ../calendar/alarm-notify/alarm-queue.c:1604
+#: ../calendar/alarm-notify/alarm-queue.c:1736
msgid "No summary available."
msgstr "ææåççæèã"
-#: ../calendar/alarm-notify/alarm-queue.c:1612
-#: ../calendar/alarm-notify/alarm-queue.c:1614
+#: ../calendar/alarm-notify/alarm-queue.c:1613
+#: ../calendar/alarm-notify/alarm-queue.c:1615
msgid "No description available."
msgstr "ææääæèã"
-#: ../calendar/alarm-notify/alarm-queue.c:1622
+#: ../calendar/alarm-notify/alarm-queue.c:1623
msgid "No location information available."
msgstr "ææåççåéèèã"
-#: ../calendar/alarm-notify/alarm-queue.c:1668
+#: ../calendar/alarm-notify/alarm-queue.c:1669
#, c-format
msgid "You have %d reminder"
msgid_plural "You have %d reminders"
msgstr[0] "ææ %d åéé"
-#: ../calendar/alarm-notify/alarm-queue.c:1864
-#: ../calendar/alarm-notify/alarm-queue.c:1899
+#: ../calendar/alarm-notify/alarm-queue.c:1865
+#: ../calendar/alarm-notify/alarm-queue.c:1900
msgid "Warning"
msgstr "èå"
-#: ../calendar/alarm-notify/alarm-queue.c:1868
+#: ../calendar/alarm-notify/alarm-queue.c:1869
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -1632,7 +1632,7 @@ msgstr ""
"éåéåéäã Evolution æéç\n"
"æéçæéåèçääæã"
-#: ../calendar/alarm-notify/alarm-queue.c:1905
+#: ../calendar/alarm-notify/alarm-queue.c:1906
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1649,7 +1649,7 @@ msgstr ""
"\n"
"æçåèåèéåçåï"
-#: ../calendar/alarm-notify/alarm-queue.c:1920
+#: ../calendar/alarm-notify/alarm-queue.c:1921
msgid "Do not ask me about this program again."
msgstr "äèåèåæéæéåçåã"
@@ -2075,7 +2075,7 @@ msgstr ""
msgid "Could not perform this operation."
msgstr "çæéèéåæäã"
-#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:166
+#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:169
msgid "You must be working online to complete this operation."
msgstr "æåéæçäåäæèåæææäã"
@@ -2445,11 +2445,11 @@ msgstr "æææè"
msgid "Keep original item?"
msgstr "æåäæååéçï"
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1157
msgid "Close the current window"
msgstr "ééçåçèç"
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:134
+#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
#: ../shell/e-shell-window-actions.c:1446
#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
#: ../widgets/misc/e-web-view.c:327 ../widgets/misc/e-web-view.c:1413
@@ -2458,53 +2458,53 @@ msgstr "ééçåçèç"
msgid "Copy the selection"
msgstr "èèéåçåå"
-#: ../calendar/gui/dialogs/comp-editor.c:1167 ../mail/e-mail-browser.c:141
+#: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
#: ../shell/e-shell-window-actions.c:1453
#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
#: ../widgets/misc/e-web-view.c:1407 ../widgets/misc/e-web-view-gtkhtml.c:1293
msgid "Cut the selection"
msgstr "åäéåçå"
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1178
#: ../shell/e-shell-window-actions.c:1460
#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
msgid "Delete the selection"
msgstr "åééåçå"
-#: ../calendar/gui/dialogs/comp-editor.c:1181
+#: ../calendar/gui/dialogs/comp-editor.c:1185
msgid "View help"
msgstr "æèæå"
-#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:148
+#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
#: ../shell/e-shell-window-actions.c:1481
#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
#: ../widgets/misc/e-web-view.c:1419 ../widgets/misc/e-web-view-gtkhtml.c:1305
msgid "Paste the clipboard"
msgstr "èäåèççåå"
-#: ../calendar/gui/dialogs/comp-editor.c:1209
+#: ../calendar/gui/dialogs/comp-editor.c:1213
msgid "Save current changes"
msgstr "ååçåçèæ"
-#: ../calendar/gui/dialogs/comp-editor.c:1214
+#: ../calendar/gui/dialogs/comp-editor.c:1218
msgid "Save and Close"
msgstr "ååäéé"
-#: ../calendar/gui/dialogs/comp-editor.c:1216
+#: ../calendar/gui/dialogs/comp-editor.c:1220
msgid "Save current changes and close editor"
msgstr "ååçåçèæääééçèå"
-#: ../calendar/gui/dialogs/comp-editor.c:1223 ../mail/e-mail-browser.c:155
+#: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
#: ../shell/e-shell-window-actions.c:1558
#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
msgid "Select all text"
msgstr "éåæææå"
-#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../calendar/gui/dialogs/comp-editor.c:1234
msgid "_Classification"
msgstr "æé(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1237
+#: ../calendar/gui/dialogs/comp-editor.c:1241
#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
#: ../mail/e-mail-browser.c:169
#: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -2513,131 +2513,131 @@ msgstr "æé(_C)"
msgid "_Edit"
msgstr "çè(_E)"
-#: ../calendar/gui/dialogs/comp-editor.c:1244 ../mail/e-mail-browser.c:162
+#: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
#: ../shell/e-shell-window-actions.c:1593
#: ../widgets/misc/e-mail-signature-editor.c:299
msgid "_File"
msgstr "ææ(_F)"
-#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../calendar/gui/dialogs/comp-editor.c:1255
#: ../shell/e-shell-window-actions.c:1600
msgid "_Help"
msgstr "æå(_H)"
-#: ../calendar/gui/dialogs/comp-editor.c:1258
+#: ../calendar/gui/dialogs/comp-editor.c:1262
msgid "_Insert"
msgstr "æå(_I)"
-#: ../calendar/gui/dialogs/comp-editor.c:1265
+#: ../calendar/gui/dialogs/comp-editor.c:1269
#: ../composer/e-composer-actions.c:339
msgid "_Options"
msgstr "éé(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1272 ../mail/e-mail-browser.c:176
+#: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
msgid "_View"
msgstr "æè(_V)"
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1286
#: ../composer/e-composer-actions.c:288
msgid "_Attachment..."
msgstr "éä(_A)â"
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../calendar/gui/dialogs/comp-editor.c:1288
#: ../composer/e-composer-actions.c:290
#: ../widgets/misc/e-attachment-view.c:414
msgid "Attach a file"
msgstr "éåææ"
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1296
msgid "_Categories"
msgstr "åé(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1298
msgid "Toggles whether to display categories"
msgstr "åææåéçãåéã"
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1304
msgid "Time _Zone"
msgstr "æå(_Z)"
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1306
msgid "Toggles whether the time zone is displayed"
msgstr "åææåéçãæåã"
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1315
msgid "Pu_blic"
msgstr "åé(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1317
msgid "Classify as public"
msgstr "åéçåé"
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1322
msgid "_Private"
msgstr "çä(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1320
+#: ../calendar/gui/dialogs/comp-editor.c:1324
msgid "Classify as private"
msgstr "æéççä"
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1329
msgid "_Confidential"
msgstr "æå(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1327
+#: ../calendar/gui/dialogs/comp-editor.c:1331
msgid "Classify as confidential"
msgstr "æéçæå"
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../calendar/gui/dialogs/comp-editor.c:1339
msgid "R_ole Field"
msgstr "èèæä(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1337
+#: ../calendar/gui/dialogs/comp-editor.c:1341
msgid "Toggles whether the Role field is displayed"
msgstr "åææåéçãèèãæä"
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1347
msgid "_RSVP"
msgstr "_RSVP"
-#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../calendar/gui/dialogs/comp-editor.c:1349
msgid "Toggles whether the RSVP field is displayed"
msgstr "åææåéçãRSVPãæä"
-#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../calendar/gui/dialogs/comp-editor.c:1355
msgid "_Status Field"
msgstr "çææä(_S)"
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1357
msgid "Toggles whether the Status field is displayed"
msgstr "åææåéçãçæãæä"
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1363
msgid "_Type Field"
msgstr "éåæä(_T)"
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1365
msgid "Toggles whether the Attendee Type is displayed"
msgstr "åææåéçãåæèéåãæä"
-#: ../calendar/gui/dialogs/comp-editor.c:2110
+#: ../calendar/gui/dialogs/comp-editor.c:2114
#: ../composer/e-composer-actions.c:507
msgid "Attach"
msgstr "éå"
-#: ../calendar/gui/dialogs/comp-editor.c:2459
-#: ../calendar/gui/dialogs/comp-editor.c:2643
-#: ../calendar/gui/dialogs/comp-editor.c:3647
+#: ../calendar/gui/dialogs/comp-editor.c:2463
+#: ../calendar/gui/dialogs/comp-editor.c:2647
+#: ../calendar/gui/dialogs/comp-editor.c:3651
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "åæææçææïåæææåæéçæåçèæ"
-#: ../calendar/gui/dialogs/comp-editor.c:3611
+#: ../calendar/gui/dialogs/comp-editor.c:3615
#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
msgid "attachment"
msgstr "éä"
-#: ../calendar/gui/dialogs/comp-editor.c:3679
+#: ../calendar/gui/dialogs/comp-editor.c:3683
msgid "Unable to use current version!"
msgstr "çæäççåççæï"
@@ -3066,12 +3066,12 @@ msgstr "çæåã%sãéåååéï%s"
#: ../calendar/gui/dialogs/memo-page.c:983
#: ../em-format/e-mail-parser-application-mbox.c:111
-#: ../em-format/e-mail-parser-application-smime.c:105
+#: ../em-format/e-mail-parser-application-smime.c:107
#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:94
#: ../em-format/e-mail-parser-inlinepgp-signed.c:96
#: ../em-format/e-mail-parser-multipart-encrypted.c:122
#: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:715 ../mail/e-mail-reader.c:1748
+#: ../libemail-engine/mail-ops.c:716 ../mail/e-mail-reader.c:1748
#: ../mail/em-folder-tree.c:678 ../modules/itip-formatter/itip-view.c:4459
#: ../modules/itip-formatter/itip-view.c:4857 ../plugins/face/face.c:174
#: ../smime/gui/certificate-manager.c:317
@@ -3841,7 +3841,7 @@ msgid "Priority:"
msgstr "ååççï"
#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../mail/e-mail-config-service-page.c:720
+#: ../mail/e-mail-config-service-page.c:672
msgid "Description:"
msgstr "æèï"
@@ -3861,7 +3861,7 @@ msgstr "éåææ"
#: ../calendar/gui/e-meeting-list-view.c:644
#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../mail/e-mail-account-tree-view.c:139
+#: ../mail/e-mail-account-tree-view.c:157
#: ../widgets/misc/e-attachment-tree-view.c:586
msgid "Type"
msgstr "éå"
@@ -7175,7 +7175,7 @@ msgstr "ååçéèç "{0}"ãéäååèææååã"
msgid "An error occurred while sending. How do you want to proceed?"
msgstr "ååäæççéèãæèåäççï"
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:151
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:154
msgid "The reported error was "{0}"."
msgstr "ååçéèç "{0}"ã"
@@ -9434,9 +9434,11 @@ msgstr "åæ"
msgid "Bcc"
msgstr "åäåæ"
-#: ../em-format/e-mail-formatter.c:1367 ../mail/e-mail-tag-editor.c:332
-#: ../mail/em-filter-i18n.h:76 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:72 ../smime/lib/e-cert.c:1125
+#: ../em-format/e-mail-formatter.c:1367
+#: ../em-format/e-mail-formatter-quote-headers.c:166
+#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
+#: ../smime/lib/e-cert.c:1125
msgid "Subject"
msgstr "äæ"
@@ -9491,7 +9493,7 @@ msgstr "åéåæåå RFC822 éä"
#: ../em-format/e-mail-formatter-print.c:53
#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1236
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1238
#: ../modules/cal-config-google/e-google-chooser.c:209
#: ../modules/plugin-manager/evolution-plugin-manager.c:68
#: ../widgets/menus/gal-define-views-dialog.c:352
@@ -9528,6 +9530,13 @@ msgstr "S/MIME çç"
msgid "S/MIME encrpyted"
msgstr "S/MIME åå"
+#. pseudo-header
+#: ../em-format/e-mail-formatter-quote-headers.c:177
+#: ../em-format/e-mail-formatter-utils.c:316
+#: ../modules/mail/em-mailer-prefs.c:1048
+msgid "Mailer"
+msgstr "åäè"
+
#: ../em-format/e-mail-formatter-quote-text-enriched.c:102
#: ../em-format/e-mail-formatter-text-enriched.c:115
msgid "Richtext"
@@ -9671,18 +9680,12 @@ msgstr "äæ"
msgid "Display source of a MIME part"
msgstr "éç MIME éåçäæ"
-#. pseudo-header
-#: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1048
-msgid "Mailer"
-msgstr "åäè"
-
#: ../em-format/e-mail-parser-application-mbox.c:108
#, c-format
msgid "Error parsing MBOX part: %s"
msgstr "èæ MBOX éåæåçéèï%s"
-#: ../em-format/e-mail-parser-application-smime.c:102
+#: ../em-format/e-mail-parser-application-smime.c:104
#, c-format
msgid "Could not parse S/MIME message: %s"
msgstr "çæèæ S/MIME éäï%s"
@@ -10215,7 +10218,7 @@ msgstr "éèçæèèçåã{0}ãã"
msgid "Could not compile regular expression "{1}"."
msgstr "çæçèæèèçåã{1}ãã"
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:97
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
msgid "Missing name."
msgstr "çååçã"
@@ -10309,56 +10312,56 @@ msgstr ""
msgid "Invalid authentication result code (%d)"
msgstr "çæçéèçæäç (%d)"
-#: ../libemail-engine/e-mail-folder-utils.c:109
+#: ../libemail-engine/e-mail-folder-utils.c:112
#, c-format
msgid "Saving message to folder '%s'"
msgstr "ååéäåèæåã%sã"
-#: ../libemail-engine/e-mail-folder-utils.c:272
+#: ../libemail-engine/e-mail-folder-utils.c:557
msgid "Forwarded messages"
msgstr "åèåçéä"
-#: ../libemail-engine/e-mail-folder-utils.c:382
-#: ../libemail-engine/e-mail-folder-utils.c:633
+#: ../libemail-engine/e-mail-folder-utils.c:667
+#: ../libemail-engine/e-mail-folder-utils.c:918
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "åå %d åéä"
-#: ../libemail-engine/e-mail-folder-utils.c:476
+#: ../libemail-engine/e-mail-folder-utils.c:761
msgid "Scanning messages for duplicates"
msgstr "ææéäæåæéè"
-#: ../libemail-engine/e-mail-folder-utils.c:883
+#: ../libemail-engine/e-mail-folder-utils.c:1169
#, c-format
msgid "Removing folder '%s'"
msgstr "çéèæåã%sã"
-#: ../libemail-engine/e-mail-folder-utils.c:1019
+#: ../libemail-engine/e-mail-folder-utils.c:1306
#, c-format
msgid "File \"%s\" has been removed."
msgstr "ææã%sãåçèçéã"
-#: ../libemail-engine/e-mail-folder-utils.c:1023
+#: ../libemail-engine/e-mail-folder-utils.c:1310
msgid "File has been removed."
msgstr "ææåçèçéã"
-#: ../libemail-engine/e-mail-folder-utils.c:1082
+#: ../libemail-engine/e-mail-folder-utils.c:1369
msgid "Removing attachments"
msgstr "æåçééä"
-#: ../libemail-engine/e-mail-folder-utils.c:1246
+#: ../libemail-engine/e-mail-folder-utils.c:1533
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messages"
msgstr[0] "åå %d åéä"
-#: ../libemail-engine/e-mail-folder-utils.c:1602 ../mail/em-folder-utils.c:609
+#: ../libemail-engine/e-mail-folder-utils.c:1889 ../mail/em-folder-utils.c:609
#, c-format
msgid "Invalid folder URI '%s'"
msgstr "çæçèæå URIã%sã"
-#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-properties.c:333
+#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-properties.c:333
#: ../mail/em-folder-tree-model.c:765
#: ../modules/mail/e-mail-shell-view-private.c:1033
#: ../modules/mail/e-mail-shell-view-private.c:1044
@@ -10366,25 +10369,25 @@ msgid "Inbox"
msgstr "æäå"
#. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:758
+#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:758
#: ../modules/mail/e-mail-shell-view-private.c:1031
msgid "Drafts"
msgstr "èç"
#. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-tree-model.c:769
+#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:769
#: ../modules/mail/e-mail-shell-view-private.c:1035
msgid "Outbox"
msgstr "åäå"
#. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:773
+#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-tree-model.c:773
#: ../modules/mail/e-mail-shell-view-private.c:1037
msgid "Sent"
msgstr "ååé"
#. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:761
+#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:761
#: ../modules/mail/e-mail-shell-view-private.c:1039
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
#: ../plugins/templates/templates.c:1049 ../plugins/templates/templates.c:1349
@@ -10392,29 +10395,29 @@ msgstr "ååé"
msgid "Templates"
msgstr "çæ"
-#: ../libemail-engine/e-mail-session.c:1246
+#: ../libemail-engine/e-mail-session.c:1326
#, c-format
msgid "User cancelled operation"
msgstr "äçèåæçæä"
-#: ../libemail-engine/e-mail-session.c:1371
+#: ../libemail-engine/e-mail-session.c:1451
#, c-format
msgid ""
"No destination address provided, forwarding of the message has been "
"cancelled."
msgstr "æææäççåäåïéäçèååçåæã"
-#: ../libemail-engine/e-mail-session.c:1384
+#: ../libemail-engine/e-mail-session.c:1464
#, c-format
msgid "No identity found to use, forwarding of the message has been cancelled."
msgstr "æäååäççèåçïéäçèååçåæã"
-#: ../libemail-engine/e-mail-session.c:1546
+#: ../libemail-engine/e-mail-session.c:1626
#, c-format
msgid "%s authentication failed"
msgstr "%s éèåæ"
-#: ../libemail-engine/e-mail-session.c:1591
+#: ../libemail-engine/e-mail-session.c:1671
#, c-format
msgid "No data source found for UID '%s'"
msgstr "ææ UIDã%sãçèæäæ"
@@ -10425,14 +10428,14 @@ msgid "Cannot get transport for account '%s'"
msgstr "äèåååèã%sãçåè"
#: ../libemail-engine/e-mail-session-utils.c:508
-#: ../libemail-engine/mail-ops.c:693
+#: ../libemail-engine/mail-ops.c:694
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "çæåçååéæåï%s"
#: ../libemail-engine/e-mail-session-utils.c:537
#: ../libemail-engine/e-mail-session-utils.c:571
-#: ../libemail-engine/mail-ops.c:710 ../libemail-engine/mail-ops.c:746
+#: ../libemail-engine/mail-ops.c:711 ../libemail-engine/mail-ops.c:747
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -10442,21 +10445,16 @@ msgstr ""
"æéåèæåãåäåãèæåã"
#: ../libemail-engine/e-mail-session-utils.c:591
-#: ../libemail-engine/mail-ops.c:768
+#: ../libemail-engine/mail-ops.c:769
#, c-format
msgid "Failed to append to local 'Sent' folder: %s"
msgstr "çæéåèæåãåäåãèæåï%s"
#: ../libemail-engine/e-mail-session-utils.c:821
-#: ../libemail-engine/mail-ops.c:896 ../libemail-engine/mail-ops.c:997
+#: ../libemail-engine/mail-ops.c:897 ../libemail-engine/mail-ops.c:998
msgid "Sending message"
msgstr "æååééä"
-#: ../libemail-engine/e-mail-session-utils.c:897
-#, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "åæèéèæå ã%sã"
-
#: ../libemail-engine/e-mail-store-utils.c:171
#, c-format
msgid "Disconnecting from '%s'"
@@ -10472,20 +10470,20 @@ msgstr "éæéçåã%sã"
msgid "Preparing account '%s' for offline"
msgstr "æååèã%sãéçåä"
-#: ../libemail-engine/mail-folder-cache.c:887
+#: ../libemail-engine/mail-folder-cache.c:884
#, c-format
msgid "Pinging %s"
msgstr "Pinging %s"
-#: ../libemail-engine/mail-ops.c:93
+#: ../libemail-engine/mail-ops.c:94
msgid "Filtering Selected Messages"
msgstr "éæéæçéä"
-#: ../libemail-engine/mail-ops.c:215
+#: ../libemail-engine/mail-ops.c:216
msgid "Fetching Mail"
msgstr "ææéä"
-#: ../libemail-engine/mail-ops.c:907
+#: ../libemail-engine/mail-ops.c:908
#, c-format
msgid "Sending message %d of %d"
msgstr "æååééä %d / %d"
@@ -10493,61 +10491,51 @@ msgstr "æååééä %d / %d"
#. Translators: The string is distinguished by total
#. * count of messages to be sent. Failed messages is
#. * always more than zero.
-#: ../libemail-engine/mail-ops.c:958
+#: ../libemail-engine/mail-ops.c:959
#, c-format
msgid "Failed to send a message"
msgid_plural "Failed to send %d of %d messages"
msgstr[0] "çæåé %d / %d åéä"
-#: ../libemail-engine/mail-ops.c:964 ../mail/mail-send-recv.c:854
+#: ../libemail-engine/mail-ops.c:965 ../mail/mail-send-recv.c:846
msgid "Canceled."
msgstr "ååæã"
-#: ../libemail-engine/mail-ops.c:966 ../mail/mail-send-recv.c:856
+#: ../libemail-engine/mail-ops.c:967 ../mail/mail-send-recv.c:848
msgid "Complete."
msgstr "åæã"
-#: ../libemail-engine/mail-ops.c:1078
+#: ../libemail-engine/mail-ops.c:1079
#, c-format
msgid "Moving messages to '%s'"
msgstr "åéäçåã%sã"
-#: ../libemail-engine/mail-ops.c:1079
+#: ../libemail-engine/mail-ops.c:1080
#, c-format
msgid "Copying messages to '%s'"
msgstr "åéäèèåã%sã"
-#: ../libemail-engine/mail-ops.c:1196
+#: ../libemail-engine/mail-ops.c:1197
#, c-format
msgid "Storing folder '%s'"
msgstr "æåèèèæåã%sã"
-#: ../libemail-engine/mail-ops.c:1269
+#: ../libemail-engine/mail-ops.c:1270
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "æçååååè '%s'"
-#: ../libemail-engine/mail-ops.c:1270
+#: ../libemail-engine/mail-ops.c:1271
#, c-format
msgid "Storing account '%s'"
msgstr "åååè '%s'"
-#: ../libemail-engine/mail-ops.c:1332
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "éææçèæåã%sã"
-
-#: ../libemail-engine/mail-ops.c:1562
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr "æåååèæåã%sã"
-
-#: ../libemail-engine/mail-ops.c:1655
+#: ../libemail-engine/mail-ops.c:1345
#, c-format
msgid "Emptying trash in '%s'"
msgstr "æçã%sãçåæç"
-#: ../libemail-engine/mail-ops.c:1751
+#: ../libemail-engine/mail-ops.c:1431
#, c-format
msgid "Disconnecting %s"
msgstr "æåäæ %s"
@@ -10571,12 +10559,12 @@ msgstr "èåçéä - %s"
msgid "Forwarded message"
msgstr "èåçéä"
-#: ../libemail-engine/mail-vfolder.c:77
+#: ../libemail-engine/mail-vfolder.c:129
#, c-format
msgid "Setting up Search Folder: %s"
msgstr "èåæåèæåï %s"
-#: ../libemail-engine/mail-vfolder.c:218
+#: ../libemail-engine/mail-vfolder.c:282
#, c-format
msgid "Updating Search Folders for '%s' - %s"
msgstr "ææã%sãçæåèæå- %s"
@@ -10586,7 +10574,7 @@ msgstr "ææã%sãçæåèæå- %s"
#. * removed folder. For more than one search folder is
#. * each of them on a separate line, with four spaces
#. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:560
+#: ../libemail-engine/mail-vfolder.c:647
#, c-format
msgid ""
"The Search Folder \"%s\" has been modified to account for the deleted "
@@ -10619,11 +10607,11 @@ msgstr "éèå(_F)"
msgid "Enabled"
msgstr "ååç"
-#: ../mail/e-mail-account-tree-view.c:105
+#: ../mail/e-mail-account-tree-view.c:109
msgid "Account Name"
msgstr "åèåç"
-#: ../mail/e-mail-account-tree-view.c:116
+#: ../mail/e-mail-account-tree-view.c:134
#: ../mail/e-mail-config-security-page.c:333
#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3661
#: ../mail/mail-config.ui.h:44
@@ -10676,7 +10664,7 @@ msgstr "(ææäæ)"
msgid "Evolution Account Assistant"
msgstr "Evolution åèåç"
-#: ../mail/e-mail-config-auth-check.c:346
+#: ../mail/e-mail-config-auth-check.c:347
msgid "Check for Supported Types"
msgstr "ææææçéå"
@@ -10830,15 +10818,15 @@ msgstr "ååæççåæ(_W)â"
msgid "Looking up account details..."
msgstr "åæåèèçèæâ"
-#: ../mail/e-mail-config-provider-page.c:499
+#: ../mail/e-mail-config-provider-page.c:485
msgid "Checking for New Mail"
msgstr "æææéä"
-#: ../mail/e-mail-config-provider-page.c:515
+#: ../mail/e-mail-config-provider-page.c:501
msgid "Check for _new messages every"
msgstr "èåæææéäæ(_N)"
-#: ../mail/e-mail-config-provider-page.c:787
+#: ../mail/e-mail-config-provider-page.c:700
msgid "Receiving Options"
msgstr "ææéé"
@@ -10940,7 +10928,7 @@ msgstr "çåéååéäææéèæåå"
msgid "Sending Email"
msgstr "åééåéä"
-#: ../mail/e-mail-config-service-page.c:688
+#: ../mail/e-mail-config-service-page.c:640
msgid "Server _Type:"
msgstr "äæåéå(_T):"
@@ -11073,7 +11061,7 @@ msgid "_Later"
msgstr "çå(_L)"
#: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:745
+#: ../modules/mail/e-mail-shell-view-actions.c:718
msgid "Add Label"
msgstr "ååæç"
@@ -11737,7 +11725,7 @@ msgstr "ääå"
msgid "Previous"
msgstr "ääå"
-#: ../mail/e-mail-reader.c:3981 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3981 ../mail/mail-dialogs.ui.h:15
msgid "Reply"
msgstr "åè"
@@ -11746,17 +11734,17 @@ msgstr "åè"
msgid "Folder '%s'"
msgstr "èæåã%sã"
-#: ../mail/e-mail-reader-utils.c:152
+#: ../mail/e-mail-reader-utils.c:154
msgid "Do not warn me again"
msgstr "äèåèåæ"
-#: ../mail/e-mail-reader-utils.c:551
+#: ../mail/e-mail-reader-utils.c:948
msgid "Printing"
msgstr "åå"
#. Translators: %s is replaced with a folder
#. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:730
+#: ../mail/e-mail-reader-utils.c:1127
#, c-format
msgid ""
"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11766,7 +11754,7 @@ msgid_plural ""
"them?"
msgstr[0] "èæåã%sãåå %u åéèçéäãæçåèåéåï"
-#: ../mail/e-mail-reader-utils.c:1134
+#: ../mail/e-mail-reader-utils.c:1531
msgid "Save Message"
msgid_plural "Save Messages"
msgstr[0] "ååéä"
@@ -11776,12 +11764,12 @@ msgstr[0] "ååéä"
#. * mbox format, when the first message doesn't have a
#. * subject. The extension ".mbox" is appended to the
#. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1155
+#: ../mail/e-mail-reader-utils.c:1552
msgid "Message"
msgid_plural "Messages"
msgstr[0] "éä"
-#: ../mail/e-mail-reader-utils.c:1609
+#: ../mail/e-mail-reader-utils.c:2006
msgid "Parsing message"
msgstr "èæéä"
@@ -12000,7 +11988,7 @@ msgid "Play Sound"
msgstr "ææéæ"
#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:19
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
msgid "Read"
msgstr "åè"
@@ -12206,7 +12194,7 @@ msgid "Subscribe To _All"
msgstr "åéèé(_A)"
#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1844
-#: ../modules/mail/e-mail-shell-view-actions.c:1363
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
msgid "_Unsubscribe"
msgstr "åæèé(_U)"
@@ -12243,7 +12231,7 @@ msgid "Su_bscribe"
msgstr "èé(_B)"
#: ../mail/em-subscription-editor.c:1843
-#: ../modules/mail/e-mail-shell-view-actions.c:1365
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
msgid "Unsubscribe from the selected folder"
msgstr "åæèééåçèæå"
@@ -12290,7 +12278,7 @@ msgstr "äèåéçéåèæ(_D)"
msgid "Message Filters"
msgstr "éäèå"
-#: ../mail/em-utils.c:1000
+#: ../mail/em-utils.c:1064
#, c-format
msgid "Messages from %s"
msgstr "äè %s çéä"
@@ -12299,16 +12287,44 @@ msgstr "äè %s çéä"
msgid "Search _Folders"
msgstr "æåèæå(_F)"
-#: ../mail/em-vfolder-editor-rule.c:364
+#: ../mail/em-vfolder-editor-rule.c:388
msgid "Add Folder"
msgstr "ååèæå"
+#: ../mail/em-vfolder-editor-rule.c:514
+msgid "Search Folder Sources"
+msgstr "æåèæåäæ"
+
+#: ../mail/em-vfolder-editor-rule.c:544
+msgid "Automatically update on any _source folder change"
+msgstr "äæèæåäæääèææèåææ(_S)"
+
+#: ../mail/em-vfolder-editor-rule.c:556
+msgid "All local folders"
+msgstr "æææåçèæå"
+
+#: ../mail/em-vfolder-editor-rule.c:557
+msgid "All active remote folders"
+msgstr "ææåççéçèæå"
+
+#: ../mail/em-vfolder-editor-rule.c:558
+msgid "All local and active remote folders"
+msgstr "æææåçååççéçèæå"
+
+#: ../mail/em-vfolder-editor-rule.c:559
+msgid "Specific folders"
+msgstr "æåçèæå"
+
+#: ../mail/em-vfolder-editor-rule.c:594
+msgid "include subfolders"
+msgstr "åæåçé"
+
#: ../mail/importers/elm-importer.c:179
msgid "Importing Elm data"
msgstr "èå Elm èæ"
#: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1069
+#: ../modules/mail/e-mail-shell-view.c:1071
#: ../widgets/misc/e-send-options.c:538
msgid "Mail"
msgstr "éä"
@@ -12835,26 +12851,6 @@ msgid "SSL encryption"
msgstr "SSL åå"
#: ../mail/mail-dialogs.ui.h:1
-msgid "Search Folder Sources"
-msgstr "æåèæåäæ"
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local folders"
-msgstr "æææåçèæå"
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All active remote folders"
-msgstr "ææåççéçèæå"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "All local and active remote folders"
-msgstr "æææåçååççéçèæå"
-
-#: ../mail/mail-dialogs.ui.h:5
-msgid "Specific folders"
-msgstr "æåçèæå"
-
-#: ../mail/mail-dialogs.ui.h:6
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
@@ -12862,72 +12858,72 @@ msgstr ""
"æéæèèéçéäååäéååã\n"
"èåãæåãéåäéæèéçåäã"
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:3
msgid "_Flag:"
msgstr "æå(_F):"
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:4
msgid "_Due By:"
msgstr "åææ(_D):"
#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:6
msgid "Co_mpleted"
msgstr "ååæ(_M)"
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:7
msgid "Call"
msgstr "ååäç"
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:8
msgid "Do Not Forward"
msgstr "äèèå"
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:9
msgid "Follow-Up"
msgstr "èé"
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:10
msgid "For Your Information"
msgstr "çæçèè"
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:11
msgid "Forward"
msgstr "ääé"
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:12
msgid "No Response Necessary"
msgstr "äéèåæ"
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:16
msgid "Reply to All"
msgstr "åèåé"
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:17
msgid "Review"
msgstr "æé"
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:18
msgid "License Agreement"
msgstr "ææåç"
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
msgid "_Tick this to accept the license agreement"
msgstr "éåæéäæåææåç(_T)"
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
msgid "_Accept License"
msgstr "æåææ(_A)"
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
msgid "Security Information"
msgstr "äåæèè"
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
msgid "Digital Signature"
msgstr "æäçç"
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:23
msgid "Encryption"
msgstr "åå"
@@ -13113,7 +13109,7 @@ msgid ""
msgstr "èæäçéææèæåäææåéçéäï"
#: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
msgid "_Empty Trash"
msgstr "æçåæç(_E)"
@@ -13195,33 +13191,45 @@ msgstr ""
"éã"
#: ../mail/mail.error.xml.h:60
+msgid "Failed to expunge folder "{0}"."
+msgstr "çææéèæå "{0}"ã"
+
+#: ../mail/mail.error.xml.h:61
+msgid "The reported error was "{1}"."
+msgstr "ååçéèç "{1}"ã"
+
+#: ../mail/mail.error.xml.h:62
+msgid "Failed to refresh folder "{0}"."
+msgstr "çæéææçèæå "{0}"ã"
+
+#: ../mail/mail.error.xml.h:63
msgid "Cannot rename or move system folder \"{0}\"."
msgstr "äèéæååæçåççèæåã{0}ãã"
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
msgid "Really delete folder \"{0}\" and all of its subfolders?"
msgstr "çåèåéèæåã{0}ãäååææçåèæå?"
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
msgid ""
"If you delete the folder, all of its contents and its subfolders' contents "
"will be deleted permanently."
msgstr "åææåéèæåïåçææååååèæåååææéåéã"
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
msgid "Really delete folder \"{0}\"?"
msgstr "çåèåéèæåã{0}ãï"
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
msgid ""
"If you delete the folder, all of its contents will be deleted permanently."
msgstr "åææéæåéèæåïåçææååææéæåã"
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
msgid "These messages are not copies."
msgstr "éäéääæèæã"
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
msgid ""
"Messages shown in Search Folders are not copies. Deleting them from a Search "
"Folder will delete the actual messages from the folder or folders in which "
@@ -13230,63 +13238,63 @@ msgstr ""
"åæåèæåäéççéäääæèæãåæåèæåäåééäåæèæçæåæé"
"çèæååéåéçéäãæåçåèåééäéäï"
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr "äèåã{0}ãéæååæã{1}ãã"
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr "åçæåççã{1}ãçèæåååãèäçäåçåçã"
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "äèåèæåã{0}ãçèã{1}ãã"
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
msgid "Cannot open source \"{2}\"."
msgstr "äèéåäæã{2}ãã"
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
msgid "Cannot open target \"{2}\"."
msgstr "äèéåçæã{2}ãã"
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
msgstr "çæåã{0}ãèæåèèèã{1}ãã"
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
msgid "Cannot create folder \"{0}\"."
msgstr "äèåçèæåã{0}ãã"
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
msgid "Cannot open source \"{1}\"."
msgstr "äèéåäæã{1}ãã"
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
msgid "Cannot save changes to account."
msgstr "çæåååèèæã"
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
msgid "You have not filled in all of the required information."
msgstr "æææååææåéçèèã"
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
msgid "You may not create two accounts with the same name."
msgstr "æäèççåçåçåçåååèã"
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
msgid "Are you sure you want to delete this account?"
msgstr "çåèåééååèï"
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
msgid "If you proceed, the account information will be deleted permanently."
msgstr "åæççïåèèèææäåéã"
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
msgid "Are you sure you want to delete this account and all its proxies?"
msgstr "çåèåééååèäååææçäçäæåï"
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
@@ -13294,29 +13302,29 @@ msgstr ""
"åæççïèåèçèèäå\n"
"åææçäçäæåææéåéã"
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
msgid ""
"Are you sure you want to disable this account and delete all its proxies?"
msgstr "çåèåééååèäååææçäçäæåï"
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
msgid "If you proceed, all proxy accounts will be deleted permanently."
msgstr "åæççïææçäçäæååèææäåéã"
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
msgid "Do _Not Disable"
msgstr "äèåç(_N)"
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
#: ../plugins/publish-calendar/publish-calendar.c:628
msgid "_Disable"
msgstr "åç(_D)"
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
msgstr "äèçèæåèæåã{0}ãïåçåäååã"
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
@@ -13324,39 +13332,39 @@ msgstr ""
"æèæååèåçèåæåã\n"
"éèæïèçèæåèæåçèåïäæåæåæååã"
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
msgid "Cannot add Search Folder \"{0}\"."
msgstr "äèååæåèæåã{0}ãã"
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
msgid "A folder named \"{0}\" already exists. Please use a different name."
msgstr "åçæåççã{0}ãçèæåååãèäçäåçåçã"
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:96
msgid "Search Folders automatically updated."
msgstr "æåèæåèåææã"
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
msgid "Mail filters automatically updated."
msgstr "éäéæåèåææã"
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
msgid "Missing folder."
msgstr "éæèæåã"
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
msgid "You must specify a folder."
msgstr "æåéæåäåèæåã"
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:101
msgid "You must name this Search Folder."
msgstr "æåéååææåèæåã"
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:102
msgid "No sources selected."
msgstr "æéåäæã"
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:103
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -13365,11 +13373,11 @@ msgstr ""
"æåéèåæåäåèæåçæäæã\n"
"ååéåèæåïçå/æéåæææåèæåãææéçèæåæäèçéã"
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
msgid "Problem migrating old mail folder \"{0}\"."
msgstr "èçèéäèæåã{0}ãççåéã"
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:106
msgid ""
"A non-empty folder at \"{1}\" already exists.\n"
"\n"
@@ -13380,23 +13388,23 @@ msgstr ""
"\n"
"æåäéæåçæèæåãèåæéååçååæèçæã"
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
msgid "Ignore"
msgstr "åç"
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:110
msgid "_Overwrite"
msgstr "èå(_O)"
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:111
msgid "_Append"
msgstr "æå(_A)"
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:112
msgid "Evolution's local mail format has changed."
msgstr "Evolution çæåçéäæååçæèäã"
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
msgid ""
"Evolution's local mail format has changed from mbox to Maildir. Your local "
"mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -13412,19 +13420,19 @@ msgstr ""
"çåæåçäå mbox åèääçèç mbox èæåãæåäåçèèæéååèæå"
"ååååéãåææéæèæïèçåæèåççéã"
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
msgid "_Exit Evolution"
msgstr "çæ _Evolution "
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:117
msgid "_Migrate Now"
msgstr "çåèç(_M)"
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
msgid "Unable to read license file."
msgstr "çæèåææææã"
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
msgid ""
"Cannot read the license file \"{0}\", due to an installation problem. You "
"will not be able to use this provider until you can accept its license."
@@ -13432,201 +13440,201 @@ msgstr ""
"äèèåææææææã{0}ãïæèæåèåééæçãåæåæééææäååçæ"
"äçåã"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
msgid "Please wait."
msgstr "èçåã"
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "åäæåæèææçéèæçææåã"
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
msgid ""
"Failed to query server for a list of supported authentication mechanisms."
msgstr "çæåäæåæèææçéèæçææåã"
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
msgid "Unable to connect to the GroupWise server."
msgstr "çæéçè GroupWise äæåã"
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
msgid "Please check your account settings and try again."
msgstr "èææåèèåäåèäæã"
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:125
msgid "Synchronize folders locally for offline usage?"
msgstr "æååæèæåääéçäçï"
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
msgid ""
"Do you want to locally synchronize the folders that are marked for offline "
"usage?"
msgstr "æåèåæåçåæéäæèçéçäççèæåï"
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
msgid "Do _Not Synchronize"
msgstr "äèåæ(_N)"
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
msgid "_Synchronize"
msgstr "åæå(_S)"
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
msgid "Do you want to mark all messages as read?"
msgstr "æåèååéçéäæçæåéèï"
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
msgid "This will mark all messages as read in the selected folder."
msgstr "éæåæçéåçèæåäææéäçåéèã"
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
msgid ""
"This will mark all messages as read in the selected folder and its "
"subfolders."
msgstr "éæåæçéåçèæååååèæåäææéäçåéèã"
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
msgid "Close message window."
msgstr "éééäèçã"
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:133
msgid "Would you like to close the message window?"
msgstr "ææèéééäèçåï"
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
msgid "_Yes"
msgstr "æ(_Y)"
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
msgid "_No"
msgstr "å(_N)"
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
msgid "_Always"
msgstr "çæ(_A)"
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
msgid "N_ever"
msgstr "æä(_E)"
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:138
msgid "Copy folder in folder tree."
msgstr "æèæåæçåèèã"
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
msgstr "æåçåèåèæåã{0}ãèèåèæåã{1}ãï"
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
msgid "Move folder in folder tree."
msgstr "æèæåæçåçåã"
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:141
msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
msgstr "æåçåèåèæåã{0}ãçååèæåã{1}ãï"
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:142
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
msgstr "åçæææåçéæçäåéçåèïæäçæåéæéäã"
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:143
msgid "Please enable the account or send using another account."
msgstr "èåçèåèæäçåäåèåéã"
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:144
msgid "Mail Deletion Failed"
msgstr "åééäåæ"
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:145
msgid "You do not have sufficient permissions to delete this mail."
msgstr "æææèåçæéåéæåéäã"
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:146
msgid "\"Check Junk\" Failed"
msgstr "ãææååéäãåæ"
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:147
msgid "\"Report Junk\" Failed"
msgstr "ãååååéäãåæ"
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:148
msgid "\"Report Not Junk\" Failed"
msgstr "ãååçéååéäãåæ"
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:149
msgid "Remove duplicate messages?"
msgstr "æåçééèçéäï"
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:150
msgid "No duplicate messages found."
msgstr "æäåéèçéäã"
#. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:152
msgid "Folder '{0}' doesn't contain any duplicate message."
msgstr "èæåã{0}ãäæååääéèçéäã"
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:153
msgid "Failed to disconnect account "{0}"."
msgstr "çæäæèåè "{0}" çéçã"
-#: ../mail/mail.error.xml.h:152
-msgid "Failed to unsubscribe from folder."
-msgstr "çæåæèéèæåã"
+#: ../mail/mail.error.xml.h:155
+msgid "Failed to unsubscribe from folder "{0}"."
+msgstr "çæåæèéèæå "{0}"ã"
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:156
msgid "Unable to retrieve message."
msgstr "çæææéäã"
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:157
msgid "{0}"
msgstr "{0}"
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:158
msgid "Failed to open folder."
msgstr "çæéåèæåã"
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:159
msgid "Failed to find duplicate messages."
msgstr "æäåéèçéäã"
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:160
msgid "Failed to retrieve messages."
msgstr "çæååéäã"
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:161
msgid "Failed to remove attachments from messages."
msgstr "çæçééääçéäã"
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:162
msgid "Failed to download messages for offline viewing."
msgstr "äèéçäççéäåæã"
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:163
msgid "Failed to save messages to disk."
msgstr "çæåéåçéäååèççã"
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:164
msgid "Hidden file is attached."
msgstr "éåäéèçææã"
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:165
msgid ""
"The attachment named {0} is a hidden file and may contain sensitive data. "
"Please review it before sending."
msgstr "åçç {0} çéäæéèæïåèååææèæãèéææéååååã"
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:166
msgid "Printing failed."
msgstr "åååæã"
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:167
msgid "The printer replied "{0}"."
msgstr "åèæåè "{0}"ã"
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:168
msgid "Could not perform this operation on {0}."
msgstr "çæéè {0} äçæäã"
@@ -13634,23 +13642,23 @@ msgstr "çæéè {0} äçæäã"
msgid "Canceling..."
msgstr "æååæâ"
-#: ../mail/mail-send-recv.c:518
+#: ../mail/mail-send-recv.c:510
msgid "Send & Receive Mail"
msgstr "åéèææéä"
-#: ../mail/mail-send-recv.c:534
+#: ../mail/mail-send-recv.c:526
msgid "Cancel _All"
msgstr "åéåæ(_A)"
-#: ../mail/mail-send-recv.c:626 ../mail/mail-send-recv.c:1003
+#: ../mail/mail-send-recv.c:618 ../mail/mail-send-recv.c:995
msgid "Updating..."
msgstr "ææäâ"
-#: ../mail/mail-send-recv.c:626 ../mail/mail-send-recv.c:708
+#: ../mail/mail-send-recv.c:618 ../mail/mail-send-recv.c:700
msgid "Waiting..."
msgstr "æåçåâ"
-#: ../mail/mail-send-recv.c:983
+#: ../mail/mail-send-recv.c:975
#, c-format
msgid "Checking for new mail"
msgstr "æææéä"
@@ -13663,7 +13671,7 @@ msgstr "æåèæå"
msgid "Edit Search Folder"
msgstr "çèæåèæå"
-#: ../mail/mail-vfolder-ui.c:270
+#: ../mail/mail-vfolder-ui.c:280
msgid "New Search Folder"
msgstr "æåæåèæå"
@@ -13733,25 +13741,25 @@ msgstr "%mæ%dæ %p %l:%M"
msgid "%b %d %Y"
msgstr "%Yå%mæ%dæ"
-#: ../mail/message-list.c:2753
+#: ../mail/message-list.c:2777
msgid "Select all visible messages"
msgstr "éæåéåèçéä"
-#: ../mail/message-list.c:2889 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2913 ../mail/message-list.etspec.h:17
msgid "Messages"
msgstr "éä"
#. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4108
+#: ../mail/message-list.c:4132
msgid "Follow-up"
msgstr "èé"
#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4667 ../mail/message-list.c:5087
+#: ../mail/message-list.c:4691 ../mail/message-list.c:5111
msgid "Generating message list"
msgstr "ççéäæå"
-#: ../mail/message-list.c:4901
+#: ../mail/message-list.c:4925
msgid ""
"No message satisfies your search criteria. Change search criteria by "
"selecting a new Show message filter from the drop down list above or by "
@@ -13761,7 +13769,7 @@ msgstr ""
"ææéäæèæçæåæäãèåäåäæåéåéæéçéäéæåæåèæçæ"
"åïåå æå->æé éåéçæéåææèäéçæèã"
-#: ../mail/message-list.c:4906
+#: ../mail/message-list.c:4930
msgid "There are no messages in this folder."
msgstr "éåèæåäææéäã"
@@ -13798,27 +13806,27 @@ msgid "Subject or Addresses contains"
msgstr "äææéåéääååå"
#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
msgid "Recipients contain"
msgstr "æäèåå"
#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
msgid "Message contains"
msgstr "éäåå"
#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1710
msgid "Subject contains"
msgstr "äæåå"
#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
msgid "Sender contains"
msgstr "åäèåå"
#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1716
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
msgid "Body contains"
msgstr "åæåå"
@@ -13966,7 +13974,7 @@ msgstr "éçåéåéèéäææéçäçåå"
#: ../modules/calendar/e-cal-shell-view-actions.c:1447
#: ../modules/calendar/e-memo-shell-view-actions.c:664
#: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
msgid "_Rename..."
msgstr "éæåå(_R)â"
@@ -14047,7 +14055,7 @@ msgstr "åä(_A)"
#: ../modules/addressbook/e-book-shell-view-actions.c:927
#: ../modules/calendar/e-memo-shell-view-actions.c:701
#: ../modules/calendar/e-task-shell-view-actions.c:853
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1473
msgid "_Preview"
msgstr "éè(_P)"
@@ -14059,7 +14067,7 @@ msgid "_Delete"
msgstr "åé(_D)"
#: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
msgid "_Properties"
msgstr "åæ(_P)"
@@ -14086,7 +14094,7 @@ msgstr "åéçäéèèçéçåå"
#: ../modules/addressbook/e-book-shell-view-actions.c:1005
#: ../modules/calendar/e-memo-shell-view-actions.c:771
#: ../modules/calendar/e-task-shell-view-actions.c:935
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1599
msgid "_Classic View"
msgstr "åçæè(_C)"
@@ -14097,7 +14105,7 @@ msgstr "åéçäæåäæéçéçäéè"
#: ../modules/addressbook/e-book-shell-view-actions.c:1012
#: ../modules/calendar/e-memo-shell-view-actions.c:778
#: ../modules/calendar/e-task-shell-view-actions.c:942
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1606
msgid "_Vertical View"
msgstr "åçæè(_V)"
@@ -14123,7 +14131,7 @@ msgstr "ææççèæ"
#: ../modules/calendar/e-cal-shell-view-actions.c:1790
#: ../modules/calendar/e-memo-shell-view-actions.c:805
#: ../modules/calendar/e-task-shell-view-actions.c:1004
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
#: ../shell/e-shell-content.c:664
msgid "Advanced Search"
msgstr "ééæå"
@@ -14537,13 +14545,12 @@ msgid "LDAP over SSL (deprecated)"
msgstr "LDAP éé SSL (ååæ)"
#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
-#, fuzzy
msgid "Microsoft Global Catalog"
-msgstr "åååéçé"
+msgstr "Microsoft éçéåçé"
#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
msgid "Microsoft Global Catalog over SSL"
-msgstr ""
+msgstr "éé SSL ç Microsoft éçéåçé"
#. Page 1
#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
@@ -14591,7 +14598,7 @@ msgid "Using LDAP"
msgstr "äç LDAP"
#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
-#: ../modules/mail/e-mail-shell-view.c:58
+#: ../modules/mail/e-mail-shell-view.c:116
msgid "Searching"
msgstr "æåæå"
@@ -14651,28 +14658,28 @@ msgstr "çå:"
msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
msgstr "éå IfMatch (éäç Apache < 2.2.8)"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:398
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:400
#, c-format
msgid "HTTP Error: %s"
msgstr "HTTP éèï %s"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:428
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:430
msgid "Could not parse response"
msgstr "çæèæåæ"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:437
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:439
msgid "Empty response"
msgstr "çççåæ"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:445
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
msgid "Unexpected reply from server"
msgstr "äèäæåæéæçåæ"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1032
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1034
msgid "Could not locate user's calendars"
msgstr "çæåääçèèäæ"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1256
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1258
msgid "Path"
msgstr "èå"
@@ -14754,18 +14761,6 @@ msgstr "ææï"
msgid "Allow Evolution to update the file"
msgstr "åè Evolution ææææ"
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:224
-msgid "Metric (Celsius, cm, etc)"
-msgstr "åå(ææãååç)"
-
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:227
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr "èå(èæãååç)"
-
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:229
-msgid "Units:"
-msgstr "åäï"
-
#: ../modules/calendar/e-cal-attachment-handler.c:323
#: ../smime/gui/smime-ui.ui.h:32
msgid "I_mport"
@@ -16645,9 +16640,8 @@ msgstr "éçåäç STARTTLS"
#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
#: ../modules/mail-config/e-mail-config-smtp-backend.c:168
-#, fuzzy
msgid "SSL on a dedicated port"
-msgstr "éæäæåçéæåã"
+msgstr "SSL æåççéæå"
#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
msgid "Ser_ver requires authentication"
@@ -16714,319 +16708,315 @@ msgstr "éäçèåååèå"
msgid "Network Preferences"
msgstr "çèååèå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
-#: ../modules/mail/e-mail-shell-view.c:970
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view.c:972
msgid "_Disable Account"
msgstr "åçåè(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
msgid "Disable this account"
msgstr "åçéååè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1260
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
msgid "Permanently remove all the deleted messages from all folders"
msgstr "æäçéåææèæååçååéçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1267
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
msgid "Edit properties of this account"
msgstr "çèéååèçåæ"
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
msgid "_Download Messages for Offline Usage"
msgstr "äèéçäççéä(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1274
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
msgid "Download messages of accounts and folders marked for offline usage"
msgstr "äèæèçéçäççåèèèæåäéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
msgid "Fl_ush Outbox"
msgstr "æçåäå(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
msgid "_Copy Folder To..."
msgstr "èèèæåå(_C)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
msgid "Copy the selected folder into another folder"
msgstr "èèåéåçèæåååäåèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
msgid "Permanently remove this folder"
msgstr "æäçééåèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
msgid "E_xpunge"
msgstr "åé(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
msgid "Permanently remove all deleted messages from this folder"
msgstr "æäçéåéåèæååååéçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
msgid "Mar_k All Messages as Read"
msgstr "æçææéäçåéè(_K)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
msgid "Mark all messages in the folder as read"
msgstr "åèæåäåéçéäæçæåéè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
msgid "_Move Folder To..."
msgstr "çåèæåå(_M)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1316
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
msgid "Move the selected folder into another folder"
msgstr "åéåçèæåçèåäåèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
msgid "_New..."
msgstr "æå(_N)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
msgid "Create a new folder for storing mail"
msgstr "åçäåæèæåäååéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
msgid "Change the properties of this folder"
msgstr "èæéåèæåçåæ"
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
msgid "Refresh the folder"
msgstr "éæèåèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
msgid "Change the name of this folder"
msgstr "èæéåèæåçåç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
msgid "Select Message _Thread"
msgstr "éæéäæé(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1351
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
msgid "Select all messages in the same thread as the selected message"
msgstr "éæææçéçéäçéåçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
msgid "Select Message S_ubthread"
msgstr "éæéäåçç(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1358
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
msgid "Select all replies to the currently selected message"
msgstr "éæææåèéåéäçä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1370
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
msgid "Empty _Trash"
msgstr "æçåæç(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
msgid "Permanently remove all the deleted messages from all accounts"
msgstr "æäçéåææåèååéååéçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
msgid "_New Label"
msgstr "æåæç(_N)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1386
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
msgid "N_one"
msgstr "ææ(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1400
+#: ../modules/mail/e-mail-shell-view-actions.c:1373
msgid "_Manage Subscriptions"
msgstr "ççèé(_M)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1402
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "èéæåæèéåéçäæåçèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
-#: ../modules/mail/e-mail-shell-view-actions.c:1428
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
msgid "Send / _Receive"
msgstr "åé/ææ(_R)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1409
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
msgid "Send queued items and retrieve new items"
msgstr "åéåéçéçäæææçéç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1414
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
msgid "R_eceive All"
msgstr "åéææ(_E)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1416
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
msgid "Receive new items from all accounts"
msgstr "ææåææåèåçæéç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1421
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
msgid "_Send All"
msgstr "åéåé(_S)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1423
+#: ../modules/mail/e-mail-shell-view-actions.c:1396
msgid "Send queued items in all accounts"
msgstr "åéåææåèååéçéç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
#: ../widgets/misc/e-activity-proxy.c:313
msgid "Cancel"
msgstr "åæ"
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1424
msgid "Cancel the current mail operation"
msgstr "åæçåéäæäçèå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
msgid "Collapse All _Threads"
msgstr "ææææçééä(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1458
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
msgid "Collapse all message threads"
msgstr "ææææççééä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1436
msgid "E_xpand All Threads"
msgstr "åéææçééä(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1465
+#: ../modules/mail/e-mail-shell-view-actions.c:1438
msgid "Expand all message threads"
msgstr "åéææççééä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
msgid "_Message Filters"
msgstr "éäèå(_M)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1472
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
msgid "Create or edit rules for filtering new mail"
msgstr "çæéäåçæçèéæèå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
msgid "_Subscriptions..."
msgstr "èé(_S)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1459
msgid "F_older"
msgstr "èæå(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1466
msgid "_Label"
msgstr "æç(_L)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
msgid "C_reate Search Folder From Search..."
msgstr "åæååçæåèæå(_R)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1517
+#: ../modules/mail/e-mail-shell-view-actions.c:1490
msgid "Search F_olders"
msgstr "æåèæå(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1492
msgid "Create or edit search folder definitions"
msgstr "åçæçèæåèæåçåç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
msgid "_New Folder..."
msgstr "æåèæå(_N)â"
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
msgid "Show Message _Preview"
msgstr "éçéäéè(_P)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
msgid "Show message preview pane"
msgstr "éçéäéèçæ"
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
msgid "Show _Deleted Messages"
msgstr "éçååééä(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
msgid "Show deleted messages with a line through them"
msgstr "éçååéçéä (åäåéç)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1571
msgid "_Group By Threads"
msgstr "äçééäççç(_G)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
msgid "Threaded message list"
msgstr "çééäæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1606
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
msgid "_Unmatched Folder Enabled"
msgstr "æçåèæåååç(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
msgid "Toggles whether Unmatched search folder is enabled"
msgstr "åææååçæçåæåèæå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
msgid "Show message preview below the message list"
msgstr "åéäæåäæéçéäéè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
msgid "Show message preview alongside the message list"
msgstr "åéäæåæééçéäéè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1643
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
msgid "All Messages"
msgstr "ææéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1650
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
msgid "Important Messages"
msgstr "éèéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1657
+#: ../modules/mail/e-mail-shell-view-actions.c:1630
msgid "Last 5 Days' Messages"
msgstr "æè 5 åçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1664
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
msgid "Messages Not Junk"
msgstr "éååéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1671
+#: ../modules/mail/e-mail-shell-view-actions.c:1644
msgid "Messages with Attachments"
msgstr "æéäçéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1678
+#: ../modules/mail/e-mail-shell-view-actions.c:1651
msgid "No Label"
msgstr "çæç"
-#: ../modules/mail/e-mail-shell-view-actions.c:1685
+#: ../modules/mail/e-mail-shell-view-actions.c:1658
msgid "Read Messages"
msgstr "åèéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1692
-msgid "Recent Messages"
-msgstr "æèçéä"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1699
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
msgid "Unread Messages"
msgstr "æèéä"
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
msgid "Subject or Addresses contain"
msgstr "äææéåéääååå"
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1727
msgid "All Accounts"
msgstr "ææçåè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1734
msgid "Current Account"
msgstr "çåçåè"
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/mail/e-mail-shell-view-actions.c:1741
msgid "Current Folder"
msgstr "çåçèæå"
-#: ../modules/mail/e-mail-shell-view.c:562
+#: ../modules/mail/e-mail-shell-view.c:613
msgid "All Account Search"
msgstr "ææçåèæå"
-#: ../modules/mail/e-mail-shell-view.c:723
+#: ../modules/mail/e-mail-shell-view.c:709
msgid "Account Search"
msgstr "åèæå"
-#: ../modules/mail/e-mail-shell-view.c:968
+#: ../modules/mail/e-mail-shell-view.c:970
msgid "Proxy _Logout"
msgstr "çåäçäæå(_L)"
@@ -17374,13 +17364,12 @@ msgid "Loading accounts..."
msgstr "æåèååèâ"
#: ../modules/text-highlight/text-highlight.c:242
-#, fuzzy
msgid "Patch"
msgstr "äè"
#: ../modules/text-highlight/text-highlight.c:248
msgid "Format part as a patch"
-msgstr ""
+msgstr "åéåæååçäè"
#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:118
#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:201
@@ -17412,7 +17401,7 @@ msgstr "éèééçä"
#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:202
msgid "Display the part as an addressbook contact"
-msgstr ""
+msgstr "åéåéççéèééçä"
#: ../modules/web-inspector/evolution-web-inspector.c:88
msgid "_Inspect..."
@@ -19722,49 +19711,49 @@ msgid "Attached message"
msgstr "éåçéä"
#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1821 ../widgets/misc/e-attachment.c:2371
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
#: ../widgets/misc/e-attachment-store.c:525
msgid "attachment.dat"
msgstr "attachment.dat"
-#: ../widgets/misc/e-attachment.c:1869 ../widgets/misc/e-attachment.c:2673
+#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
msgid "A load operation is already in progress"
msgstr "èåæäååéèä"
-#: ../widgets/misc/e-attachment.c:1877 ../widgets/misc/e-attachment.c:2681
+#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
msgid "A save operation is already in progress"
msgstr "ååæäååéèä"
-#: ../widgets/misc/e-attachment.c:1976
+#: ../widgets/misc/e-attachment.c:1989
#, c-format
msgid "Could not load '%s'"
msgstr "çæèåã%sã"
-#: ../widgets/misc/e-attachment.c:1979
+#: ../widgets/misc/e-attachment.c:1992
#, c-format
msgid "Could not load the attachment"
msgstr "çæèåéä"
-#: ../widgets/misc/e-attachment.c:2252
+#: ../widgets/misc/e-attachment.c:2265
#, c-format
msgid "Could not open '%s'"
msgstr "çæéåã%sã"
-#: ../widgets/misc/e-attachment.c:2255
+#: ../widgets/misc/e-attachment.c:2268
#, c-format
msgid "Could not open the attachment"
msgstr "çæéåéä"
-#: ../widgets/misc/e-attachment.c:2689
+#: ../widgets/misc/e-attachment.c:2702
msgid "Attachment contents not loaded"
msgstr "çæèåéäåå"
-#: ../widgets/misc/e-attachment.c:2765
+#: ../widgets/misc/e-attachment.c:2778
#, c-format
msgid "Could not save '%s'"
msgstr "çæååã%sã"
-#: ../widgets/misc/e-attachment.c:2768
+#: ../widgets/misc/e-attachment.c:2781
#, c-format
msgid "Could not save the attachment"
msgstr "çæååéä"
@@ -20412,9 +20401,9 @@ msgstr "æåâ"
#. + Add to Dictionary
#: ../widgets/misc/e-spell-entry.c:444
-#, fuzzy, c-format
+#, c-format
msgid "Add \"%s\" to Dictionary"
-msgstr "ååã%sãèèå"
+msgstr "ååã%sãèåå"
#. - Ignore All
#: ../widgets/misc/e-spell-entry.c:487
@@ -20783,6 +20772,27 @@ msgstr "åééå"
msgid "Input Methods"
msgstr "èåæ"
+#~ msgid "Unsubscribing from folder '%s'"
+#~ msgstr "åæèéèæå ã%sã"
+
+#~ msgid "Refreshing folder '%s'"
+#~ msgstr "éææçèæåã%sã"
+
+#~ msgid "Expunging folder '%s'"
+#~ msgstr "æåååèæåã%sã"
+
+#~ msgid "Metric (Celsius, cm, etc)"
+#~ msgstr "åå(ææãååç)"
+
+#~ msgid "Imperial (Fahrenheit, inches, etc)"
+#~ msgstr "èå(èæãååç)"
+
+#~ msgid "Units:"
+#~ msgstr "åäï"
+
+#~ msgid "Recent Messages"
+#~ msgstr "æèçéä"
+
#~ msgid "Couldn't get list of address books: %s"
#~ msgstr "çæååéèéæåï%s"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
