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



commit c8c087a6d00294445fe6d0983702d0c2490ccd86
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Fri Jul 29 16:03:52 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |10541 +++++++++++++++++++++++++++------------------------------
 po/zh_TW.po |10921 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 10310 insertions(+), 11152 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 3965c85..57a6ffe 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,192 +7,240 @@
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
 #
+#: ../shell/main.c:569
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 3.0.0\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N\n";
-"POT-Creation-Date: 2011-04-03 22:48+0000\n"
-"PO-Revision-Date: 2011-04-04 20:34+0800\n"
+"Project-Id-Version: evolution 3.1.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-29 16:02+0800\n"
+"PO-Revision-Date: 2011-07-29 16:02+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr "ã{0}ãæäååèçéèéïäèèäæãèåèçäæèçåéæäéæäåçéèéã"
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
 msgstr "æèçäçéåéäåååçååãäçèåäéèåååæäåçæåçåï"
 
 #: ../addressbook/addressbook.error.xml.h:4
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr "äã{0}ãçåçèçäæååçååéåèçäæåäãèååååååï"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "ååéèéç"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "éèéã{0}ãååå"
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "äèååæçèçä"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "çæçåèçäã"
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "åéçèåçæäçã"
 
-#: ../addressbook/addressbook.error.xml.h:8
-msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+#: ../addressbook/addressbook.error.xml.h:10
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
 msgstr "èææäçåäçåçæææçïèäääççæææççåææãèèåèååçæåååååïäåèååäååéåéã"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "çæåå LDAP äæåççèèèã"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "çæçééèéã"
 
-#: ../addressbook/addressbook.error.xml.h:11
-msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+#: ../addressbook/addressbook.error.xml.h:13
+msgid ""
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr "çåäåèåå Evolution äç GroupWise ççéèéãèäçäæåäç GroupWise éäåæçïäååäç GroupWise åçèçäå Groupwise åäèçäèæåã"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "åééèéã{0}ãï"
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34
-#: ../mail/mail.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "äèåé(_N)"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "å {0} ååè {1} ççéèï {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "çæéè LDAP äæåã"
 
-#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
 msgid "Failed to delete contact"
 msgstr "åéèçäåæ"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise éèéçåç"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP äæåæåæææççèèèã"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr "æåã{0}ãåçåéåèçäæåäã"
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "çééèéç"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "æääåååéåèçäæåäã"
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
 msgstr "æäåèåèçæåäçåçäæåçæäæåéä"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution éèéåçæåçæã"
 
-#: ../addressbook/addressbook.error.xml.h:21
-msgid "The image you have selected is large. Do you want to resize and store it?"
+#: ../addressbook/addressbook.error.xml.h:26
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr "äæéæçåçååãäæåèæèåååæåååï"
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
+#: ../addressbook/addressbook.error.xml.h:27
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
 msgstr "æ LDAP äæååèäçèç LDAP çæïåäæææåèïæåèèåéèãèæèççåïçèææçæååçã"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "çæéåæéèéã"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr "æéèéäæåææääåèçæååçã"
 
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
+#: ../addressbook/addressbook.error.xml.h:30
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr "æéèéäæåçæéçïæäæååçåèæéïæäçççéçåçåæã"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "æéèéåèæéçéã"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "æäæåäææ LDAPv3 çèèèã"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "çæéåéèé"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "çæåèæåã"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "çæåå {0}ã"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "èååæåçææï"
 
-#: ../addressbook/addressbook.error.xml.h:32
-msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
+#: ../addressbook/addressbook.error.xml.h:37
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
 msgstr "äæååèåæäåéèéïåèçäçèåäåéèéïäæåçæåäæçéãäæèååäååæääæåï"
 
-#: ../addressbook/addressbook.error.xml.h:33
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
+#: ../addressbook/addressbook.error.xml.h:38
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
 msgstr "äæéçåäææç GroupWise äæåèäåèéåäç Evolution çåéãæåçèææææåèäæååçèææççå"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:39
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr "äåèååçäååçæéåæåçäéåãèåååååååï"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "äææèåçæéåééåéèéäçèçäã"
 
-#: ../addressbook/addressbook.error.xml.h:35
-msgid "You have made modifications to this contact. Do you want to save these changes?"
+#: ../addressbook/addressbook.error.xml.h:41
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr "äåçäææèçäãèååéäææï"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:43
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "éæåå Evolution äåïçæäç {0} çèçäã"
 
-#: ../addressbook/addressbook.error.xml.h:38
-#: ../mail/em-vfolder-rule.c:610
-#: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:604
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "åå(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "ææ(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "äèåå(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "èæåå(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "ååèç(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:706
 #: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "éåçåæ"
@@ -203,10 +251,9 @@ msgstr "éåçåæ"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/e-calendar-view.c:2077
-#: ../capplet/anjal-settings-main.c:116
-#: ../shell/main.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:705
+#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
+#: ../shell/main.c:140
 msgid "Birthday"
 msgstr "çæ"
 
@@ -226,24 +273,23 @@ msgid "Calendar:"
 msgstr "èäæï"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:950
+#: ../addressbook/importers/evolution-vcard-importer.c:979
 msgid "Contact"
 msgstr "èçä"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:623
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:646
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2865
 msgid "Contact Editor"
 msgstr "èçäçèå"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:358
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:502
-#: ../addressbook/gui/widgets/eab-contact-display.c:844
-#: ../plugins/groupwise-features/junk-settings.c:409
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:1000
 #: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "éåéä"
@@ -257,8 +303,10 @@ msgid "Full _Name..."
 msgstr "åå(_N)â"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1302
+#: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "äå"
 
@@ -292,17 +340,14 @@ msgid "Nic_kname:"
 msgstr "çå(_K):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:429
-#: ../plugins/groupwise-features/camel-gw-listener.c:454
-#: ../plugins/groupwise-features/camel-gw-listener.c:570
+#: ../modules/calendar/e-memo-shell-migrate.c:265
 msgid "Notes"
 msgstr "åè"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:403
 #: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "åä"
@@ -328,9 +373,11 @@ msgid "Web addresses"
 msgstr "çå"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:67
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
+#: ../addressbook/gui/widgets/eab-contact-display.c:1299
+#: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "åä"
 
@@ -355,9 +402,9 @@ msgid "_Blog:"
 msgstr "éèæ(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:708
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1922
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "èäæ(_C):"
 
@@ -413,7 +460,6 @@ msgstr "éå(_S):"
 msgid "_State/Province:"
 msgstr "å/ç(_S):"
 
-# (Abel) èçåèåéçäæç Title (Dr., Ms.) æèç
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
@@ -436,74 +482,74 @@ msgstr "éèé(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "ééåè(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:523
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:381
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:447
 msgid "Error adding contact"
 msgstr "æåèçäæççéè"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "äæèçäæççéè"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "çéèçäæççéè"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:638
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2649
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2859
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "èçäçèå - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
 msgid "Please select an image for this contact"
 msgstr "èéåäèæèçäçåç"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3302
 msgid "_No image"
 msgstr "ææåç(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3615
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -511,43 +557,43 @@ msgstr ""
 "èçäèæçæï\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3356
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3619
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "ã%sãåæçæçæå"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3363
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3626
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sã%sãåæçæçæå"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3378
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3389
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3638
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3649
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sã%sãæçç"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3404
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3664
 msgid "Invalid contact."
 msgstr "çæçèçäã"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:392
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "Contact Quick-Add"
 msgstr "åéæåèçä"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:395
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:414
 msgid "_Edit Full"
 msgstr "çèåé(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:443
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:462
 msgid "_Full name"
 msgstr "åå(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:473
 msgid "E_mail"
 msgstr "éåéä(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:465
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:484
 msgid "_Select Address Book"
 msgstr "éæéèé(_S)"
 
@@ -617,7 +663,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:652
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:729
 msgid "Contact List Editor"
 msgstr "èçäæåçèå"
 
@@ -634,7 +680,7 @@ msgid "_List name:"
 msgstr "åååç(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "éå(_S)â"
 
@@ -642,27 +688,26 @@ msgstr "éå(_S)â"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "èåéåéäååæææèçäåääæå(_T):"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:852
 msgid "Contact List Members"
 msgstr "èçäæåæå"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1316
-msgid "_Members"
-msgstr "æå(_M)"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1153
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1422
 msgid "Error adding list"
 msgstr "æåæåæççéè"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1437
 msgid "Error modifying list"
 msgstr "çèæåæççéè"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1452
 msgid "Error removing list"
 msgstr "çéæåæççéè"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1583
+msgid "_Members"
+msgstr "æå(_M)"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "ææåçèçä:"
@@ -678,8 +723,10 @@ msgid "Duplicate Contact Detected"
 msgstr "åæåéèçèçä"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
-msgstr "æèçäçåçæéåéäåååçååææèæåãçèåäéèæåååï"
+msgid ""
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
+msgstr "æèçäçåçæéåéäåååçååææèæåãèååååææåï"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -698,61 +745,53 @@ msgstr ""
 "ææèæåãäçèåäéèæåååï"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:304
 msgid "_Merge"
 msgstr "åä(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
-#: ../calendar/gui/tasktypes.xml.h:7
-#, c-format
-msgid "Cancelled"
-msgstr "ååæ"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:287
 msgid "Merge Contact"
 msgstr "åäèçä"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1693
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Any field contains"
 msgstr "ääæäåå"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Email begins with"
 msgstr "éåéäéåæ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Name contains"
 msgstr "åçåå"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:145
+#: ../addressbook/gui/widgets/e-addressbook-model.c:155
 msgid "No contacts"
 msgstr "ææèçä"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:159
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d åèçä"
-msgstr[1] "%d åèçä"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:342
+#: ../addressbook/gui/widgets/e-addressbook-model.c:340
 msgid "Error getting book view"
 msgstr "ååæææèæççéè"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:756
+#: ../addressbook/gui/widgets/e-addressbook-model.c:751
 msgid "Search Interrupted"
 msgstr "æåèäæ"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
 msgid "Error modifying card"
 msgstr "çèåçæççéè"
 
@@ -769,7 +808,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "ååèçèäèçä"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
 msgstr "åééåçèçä"
 
@@ -777,34 +816,34 @@ msgstr "åééåçèçä"
 msgid "Select all visible contacts"
 msgstr "éæåéåèçèçä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "äçåèåééäèçäæåï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 msgid "Are you sure you want to delete this contact list?"
 msgstr "äçåèåééåèçäæåï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "äçåèåééåèçäæå (%s)ï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
 msgid "Are you sure you want to delete these contacts?"
 msgstr "äçåèåééäèçäï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
 msgid "Are you sure you want to delete this contact?"
 msgstr "äçåèåééåèçäï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "äçåèåééåèçä (%s)ï"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -815,20 +854,17 @@ msgid_plural ""
 msgstr[0] ""
 "éå %d åèçäæåæéå %d åæèçã\n"
 "çåèéçéèææçèçäï"
-msgstr[1] ""
-"éå %d åèçäæåæéå %d åæèçã\n"
-"çåèéçéèææçèçäï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1496
 msgid "_Don't Display"
 msgstr "äèéç(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1497
 msgid "Display _All Contacts"
 msgstr "éçææçèçä(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:677
 msgid "Assistant"
 msgstr "åç"
 
@@ -865,7 +901,7 @@ msgid "Categories"
 msgstr "åé"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:672
 msgid "Company"
 msgstr "åå"
 
@@ -914,22 +950,22 @@ msgid "Journal"
 msgstr "æè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Manager"
 msgstr "äç"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
 msgid "Mobile Phone"
 msgstr "æåéè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:509
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Nickname"
 msgstr "çå"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:729
 msgid "Note"
 msgstr "åè"
 
@@ -958,13 +994,13 @@ msgid "Radio"
 msgstr "ççééè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:571
+#: ../calendar/gui/e-meeting-list-view.c:585
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "èè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:707
 msgid "Spouse"
 msgstr "éå"
 
@@ -994,7 +1030,7 @@ msgstr "åä"
 msgid "Web Site"
 msgstr "çå"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1004,7 +1040,7 @@ msgstr ""
 "\n"
 "æåèçä..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1018,7 +1054,7 @@ msgstr ""
 "\n"
 "éæåäéèäåçæçèçäã"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1032,7 +1068,7 @@ msgstr ""
 "\n"
 "éæåäéèäåçæçèçäã"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1042,7 +1078,7 @@ msgstr ""
 "\n"
 "åæèçäã"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
 msgid ""
 "\n"
 "\n"
@@ -1052,110 +1088,111 @@ msgstr ""
 "\n"
 "ææéçåäéçæèæåéçã"
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "åäéåéä"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "äåéåéä"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:805
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "ååéåéä"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:184
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
 msgid "evolution address book"
 msgstr "evolution éèé"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact"
 msgstr "æåèçä"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
 msgid "New Contact List"
 msgstr "æåèçäæå"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:167
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "çåçéèéèæå %s æ %d ååç"
-msgstr[1] "çåçéèéèæå %s æ %d ååç"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:31
+#: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "éå"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:153
+#: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
 msgstr "èçäæå: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:154
+#: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
 msgstr "èçä: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:180
+#: ../addressbook/gui/widgets/ea-minicard.c:183
 msgid "evolution minicard"
 msgstr "Evolution èäåç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "èèéåéääå(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../widgets/misc/e-web-view.c:397
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:430
 msgid "Copy the email address to the clipboard"
 msgstr "èèéåéääåååèç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:179
-#: ../widgets/misc/e-web-view.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:435
 msgid "_Send New Message To..."
 msgstr "åéæéäè(_S)â"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:404
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:437
 msgid "Send a mail message to this address"
 msgstr "åééäåéåäå"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:424
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
-msgid "List Members"
-msgstr "æåæå"
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
+msgid "Open map"
+msgstr "éååå"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
+msgid "List Members:"
+msgstr "æåæåï"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:673
 msgid "Department"
 msgstr "éé"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:674
 msgid "Profession"
 msgstr "èæ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/widgets/eab-contact-display.c:675
 msgid "Position"
 msgstr "äç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/widgets/eab-contact-display.c:678
 msgid "Video Chat"
 msgstr "èåäè"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:427
-#: ../plugins/groupwise-features/camel-gw-listener.c:452
-#: ../plugins/groupwise-features/camel-gw-listener.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:679
+#: ../calendar/gui/dialogs/calendar-setup.c:396
+#: ../modules/calendar/e-cal-shell-view-actions.c:222
+#: ../modules/calendar/e-cal-shell-view-actions.c:251
+#: ../modules/calendar/e-cal-shell-view.c:507
+#: ../modules/online-accounts/e-online-accounts-google.c:292
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "èäæ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
@@ -1163,25 +1200,25 @@ msgstr "èäæ"
 msgid "Free/Busy"
 msgstr "çé/åç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
+#: ../addressbook/gui/widgets/eab-contact-display.c:702
 msgid "Phone"
 msgstr "éè"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Fax"
 msgstr "åç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
 msgid "Address"
 msgstr "åå"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:699
 msgid "Home Page"
 msgstr "éé"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:700
 msgid "Web Log"
 msgstr "çè"
 
@@ -1189,59 +1226,72 @@ msgstr "çè"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../capplet/settings/mail-capplet-shell.c:361
-#: ../modules/addressbook/e-book-shell-backend.c:112
-#: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:161
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:128
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
+#: ../capplet/settings/mail-capplet-shell.c:376
+#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/calendar/e-cal-shell-backend.c:134
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:118
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:118
+#: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "åä"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:829
+#: ../addressbook/gui/widgets/eab-contact-display.c:967
+msgid "List Members"
+msgstr "æåæå"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:985
 msgid "Job Title"
 msgstr "èç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:866
+#: ../addressbook/gui/widgets/eab-contact-display.c:1022
 msgid "Home page"
 msgstr "éé"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:875
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
 msgid "Blog"
 msgstr "éèæ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
-#: ../widgets/misc/e-web-view.c:858
+#: ../addressbook/gui/widgets/eab-contact-display.c:1229
+#: ../widgets/misc/e-web-view.c:954
 #, c-format
 msgid "Click to mail %s"
 msgstr "æäääåééä %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
 msgstr "æåçæéåéåçéæåãéåèèçæçéæåææèçéççéæèåæäèääéçäçãèæäçæååæèåçéæåääèåçååã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, c-format
-msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr "æåçæéåéåçéæåãèææèå %s æåååèäæéåèååäåååã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
-msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr "æ Evolution çææå LDAP ææçèéåãåæäæå Evolution äç LDAPïåéåèåç LDAP ç Evolution åäã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:126
-msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr "æåçæéåéåçéæåãéèçäèåéèçURIïæäæåçæéçã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Detailed error message:"
 msgstr "èççéèèæï"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1253,7 +1303,7 @@ msgstr ""
 "èäçæåæççæèæææéæçéæåççé\n"
 "äæåååèåäççæéåã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:207
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1266,194 +1316,220 @@ msgstr ""
 "æéäéã"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "æçéæåçåççåçæèæéæçæèã%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:220
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "æçéæåçåççåæçåèéæçæèã%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#: ../addressbook/gui/widgets/eab-gui-util.c:232
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "éæçæèäæååæåã%s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:214
+#: ../addressbook/gui/widgets/eab-gui-util.c:254
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:254
+#: ../addressbook/gui/widgets/eab-gui-util.c:294
 msgid "Select Address Book"
 msgstr "éæéèé"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:357
 msgid "list"
 msgstr "æå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:455
+#: ../addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Move contact to"
 msgstr "åèçäçå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:457
+#: ../addressbook/gui/widgets/eab-gui-util.c:527
 msgid "Copy contact to"
 msgstr "èèèçäå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:530
 msgid "Move contacts to"
 msgstr "åèçäçå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:532
 msgid "Copy contacts to"
 msgstr "èèèçäå"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "åçæèæå"
 
-#: ../addressbook/importers/evolution-csv-importer.c:721
-#: ../addressbook/importers/evolution-ldif-importer.c:519
-#: ../addressbook/importers/evolution-vcard-importer.c:278
-#: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764
-#: ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:740
+#: ../addressbook/importers/evolution-ldif-importer.c:539
+#: ../addressbook/importers/evolution-vcard-importer.c:282
+#: ../calendar/importers/icalendar-importer.c:384
+#: ../calendar/importers/icalendar-importer.c:851
+#: ../calendar/importers/icalendar-importer.c:881 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ååâ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1016
+#: ../addressbook/importers/evolution-csv-importer.c:1041
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1042
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV è Tab ååçå"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1025
+#: ../addressbook/importers/evolution-csv-importer.c:1050
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1051
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV è Tab ååçå"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1034
+#: ../addressbook/importers/evolution-csv-importer.c:1059
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1035
+#: ../addressbook/importers/evolution-csv-importer.c:1060
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV è Tab ååçå"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:753
+#: ../addressbook/importers/evolution-ldif-importer.c:779
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP èæäææå (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:780
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF èåå"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:639
+#: ../addressbook/importers/evolution-vcard-importer.c:648
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcfã.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:640
+#: ../addressbook/importers/evolution-vcard-importer.c:649
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard ååçå"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:741
+#: ../addressbook/printing/e-contact-print.c:714
 #, c-format
 msgid "Page %d"
 msgstr "ç %d é"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:645
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:680
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "çæéåææ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
-msgid "Couldn't get list of address books"
-msgstr "çæååéèéæå"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "çæååéèéæåï%s"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
-msgid "failed to open book"
-msgstr "çæéåéèé"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/event-page.c:2893
+#: ../calendar/gui/dialogs/memo-page.c:926
+#: ../calendar/gui/dialogs/task-page.c:1810 ../em-format/em-format.c:2314
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:657
+#: ../plugins/caldav/caldav-browse-server.c:209
+#: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:313
+msgid "Unknown error"
+msgstr "äæçéè"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "çæéååæçã%sãï%s"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "æåèåææèäæææèå"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "OUTPUTFILE"
 msgstr "èåææ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
 msgstr "ååæåéèéèæå"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
 msgstr "ååçéçæ vcard æ csv ææ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:70
+#: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
 msgstr "åéåææååå"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:73
-msgid "The number of cards in one output file in asynchronous mode, default size 100."
+#: ../addressbook/tools/evolution-addressbook-export.c:74
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
 msgstr "éåææåäïäåèåææäçåçæçïéèååæ 100ã"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:75
+#: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
 msgstr "æé"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:137
-msgid "Command line arguments error, please use --help option to see the usage."
+#: ../addressbook/tools/evolution-addressbook-export.c:138
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "æäååæéèïèäç --help ééäæççæã"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:151
+#: ../addressbook/tools/evolution-addressbook-export.c:152
 msgid "Only support csv or vcard format."
 msgstr "åææ csv æ vcard æåã"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:160
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "In async mode, output must be file."
 msgstr "åéåææåäïèååéæææã"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:168
+#: ../addressbook/tools/evolution-addressbook-export.c:169
 msgid "In normal mode, there is no need for the size option."
 msgstr "åäèæåäïäéèååééã"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:199
+#: ../addressbook/tools/evolution-addressbook-export.c:200
 msgid "Unhandled error"
 msgstr "æèççéè"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr "ã{0}ãæäååèçèäæäääèèäæãèåèäææèçåéæäéæäåçèäæã"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr "ã{0}ãæäååèçèäæäæãèéåäåèååçæçèäæã"
 
 #: ../calendar/calendar.error.xml.h:5
-msgid "Adding a meaningful summary to your appointment will give you an idea of what your appointment is about."
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr "æåææççæèåäççæåäèäçééåçæåäéäæéã"
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "Adding a meaningful summary to your task will give you an idea of what your task is about."
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr "æåææççæèåäçåäåäèäçééååäåäéäæéã"
 
 #: ../calendar/calendar.error.xml.h:7
@@ -1465,7 +1541,9 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "æåéæååéäçææèèèäçæååã"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on these appointments will be deleted and can not be restored."
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr "æåééäçæçææèèèäçæååã"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -1473,11 +1551,13 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "æåééäåäçææèèèäçæååã"
 
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr "æåéæçæçææèèèäçæååã"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr "æåéææèçææèèèäçæååã"
 
 #: ../calendar/calendar.error.xml.h:13
@@ -1587,11 +1667,14 @@ msgid "Editor could not be loaded."
 msgstr "çæèåçèåã"
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr "éåéäéèæåéçææåèèäèäåæåæåäã"
 
 #: ../calendar/calendar.error.xml.h:40
-msgid "Email invitations will be sent to all participants and allow them to reply."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr "éåéäéèåæåéçææåèèäèäååèã"
 
 #: ../calendar/calendar.error.xml.h:41
@@ -1613,31 +1696,45 @@ msgid "Error on {0}: {1}"
 msgstr "{0} ççéèï{1}"
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr "åæäåéåæéçïåäåèèåèäçéæèåçåæã"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
 msgstr "åææåéåæéçïåäåèèåèäçéèååéåçåéã"
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr "åææåéåæéçïåäåèèåèäçéåäåçåéã"
 
 #: ../calendar/calendar.error.xml.h:50
-msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
 msgstr "åéææçèèåèåäåèèäæææçèäæã"
 
 #: ../calendar/calendar.error.xml.h:51
-msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
 msgstr "åéææçèèèåäåèèäæææçåäæåã"
 
 #: ../calendar/calendar.error.xml.h:52
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr "éèæääéèäèçéäãååæçæåæååéäéäã"
 
 #: ../calendar/calendar.error.xml.h:53
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr "éèæääéèäèçéäãååæåäåæååéäéäã"
 
 #: ../calendar/calendar.error.xml.h:54
@@ -1725,7 +1822,10 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "èåéææçåäèèçåèèï"
 
 #: ../calendar/calendar.error.xml.h:75
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
 msgstr "äæéçåäææç GroupWise äæåèäåèéåäç Evolution çåéãæåçèææææåèäæååçèææççæã"
 
 #: ../calendar/calendar.error.xml.h:76
@@ -1761,8 +1861,7 @@ msgstr "éæåå Evolution äåïçæäçäçåäã"
 msgid "_Discard Changes"
 msgstr "ææææ(_D)"
 
-#: ../calendar/calendar.error.xml.h:84
-#: ../composer/e-composer-actions.c:313
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "åå(_S)"
 
@@ -1771,8 +1870,7 @@ msgid "_Save Changes"
 msgstr "ååææ(_S)"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34
-#: ../mail/mail.error.xml.h:158
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "åé(_S)"
@@ -1781,48 +1879,30 @@ msgstr "åé(_S)"
 msgid "_Send Notice"
 msgstr "åééç(_S)"
 
-#: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1776
-#: ../plugins/caldav/caldav-browse-server.c:921
-#: ../plugins/google-account-setup/google-source.c:439
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "èååç"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "åé"
-msgstr[1] "åé"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:114
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "åæ"
-msgstr[1] "åæ"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:126
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-#: ../e-util/e-plugin-util.c:425
-#: ../filter/filter.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+msgid "day"
 msgid_plural "days"
 msgstr[0] "å"
-msgstr[1] "å"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
 msgid "Start time"
 msgstr "éåæå"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "çæ"
 
@@ -1832,9 +1912,9 @@ msgstr "åéèé(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1632
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1642
-#: ../plugins/itip-formatter/itip-view.c:1044
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Location:"
 msgstr "äç:"
 
@@ -1842,8 +1922,7 @@ msgstr "äç:"
 msgid "Snooze _time:"
 msgstr "åçæé(_T):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
-#: ../e-util/e-alert.c:896
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:916
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "èé(_D)"
@@ -1852,12 +1931,21 @@ msgstr "èé(_D)"
 msgid "_Snooze"
 msgstr "åæ(_S)"
 
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../plugins/google-account-setup/google-contacts-source.c:379
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "å"
+
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26
-#: ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../plugins/google-account-setup/google-contacts-source.c:378
 msgid "hours"
 msgstr "åæ"
 
@@ -1868,41 +1956,38 @@ msgstr "çæçåé"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../e-util/e-plugin-util.c:423
-#: ../filter/filter.ui.h:17
-#: ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:377
 msgid "minutes"
 msgstr "åé"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1613
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
 msgid "No summary available."
 msgstr "ææåççæèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1495
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
 msgid "No description available."
 msgstr "ææääæèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1545
 msgid "No location information available."
 msgstr "ææåççåéèèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1549
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
 #, c-format
 msgid "You have %d alarm"
 msgid_plural "You have %d alarms"
 msgstr[0] "äæ %d åéé"
-msgstr[1] "äæ %d åéé"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1774
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1813
 msgid "Warning"
 msgstr "èå"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1745
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1784
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1914,10 +1999,11 @@ msgstr ""
 "éåéåéäã  Evolution æéç\n"
 "æéçæéåèçääæã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1819
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -1930,7 +2016,7 @@ msgstr ""
 "\n"
 "äçåèåèéåçåï"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1795
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1834
 msgid "Do not ask me about this program again."
 msgstr "äèåèåæéæéåçåã"
 
@@ -1939,67 +2025,54 @@ msgid "invalid time"
 msgstr "åææé"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69
-#: ../calendar/gui/e-alarm-list.c:393
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:396
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d æ"
-msgstr[1] "%d æ"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75
-#: ../calendar/gui/e-alarm-list.c:399
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:402
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d å"
-msgstr[1] "%d å"
 
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:408
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d ç"
-msgstr[1] "%d ç"
 
-#: ../calendar/gui/cal-editor-utils.c:105
-msgid "Invalid object"
-msgstr "çæççä"
-
-#: ../calendar/gui/calendar-view-factory.c:117
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "ææè"
 
-#: ../calendar/gui/calendar-view-factory.c:120
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Work Week View"
 msgstr "åäéæè"
 
-#: ../calendar/gui/calendar-view-factory.c:123
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Week View"
 msgstr "éæè"
 
-#: ../calendar/gui/calendar-view-factory.c:126
+#: ../calendar/gui/calendar-view-factory.c:125
 msgid "Month View"
 msgstr "ææè"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "ääæä"
 
-#: ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "éä"
 
@@ -2009,85 +2082,66 @@ msgstr "éä"
 msgid "Attendee"
 msgstr "åæè"
 
-#: ../calendar/gui/caltypes.xml.h:5
-#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "åé"
 
-#: ../calendar/gui/caltypes.xml.h:6
-#: ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "æé"
 
-#: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:772
-#: ../calendar/gui/e-task-table.c:494
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "æå"
 
-#: ../calendar/gui/caltypes.xml.h:8
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:522
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
+#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æè:"
 
-#: ../calendar/gui/caltypes.xml.h:9
-#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "æèåå"
 
-#: ../calendar/gui/caltypes.xml.h:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-#: ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "äåå"
 
-#: ../calendar/gui/caltypes.xml.h:11
-#: ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "åå"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Location"
 msgstr "äç"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "æèåéä"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:770
-#: ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
+#: ../calendar/gui/e-cal-model.c:767 ../calendar/gui/e-task-table.c:491
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "çä"
 
-#: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:761
-#: ../calendar/gui/e-cal-model.c:768
-#: ../calendar/gui/e-task-table.c:492
-#: ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
+#: ../calendar/gui/e-cal-model.c:758 ../calendar/gui/e-cal-model.c:765
+#: ../calendar/gui/e-task-table.c:490 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "åé"
 
@@ -2101,44 +2155,34 @@ msgstr "éææ"
 #: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Summary"
 msgstr "æè"
 
-#: ../calendar/gui/caltypes.xml.h:18
-#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "æèåå"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25
-#: ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "åå"
 
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26
-#: ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "äåå"
 
-#: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27
-#: ../mail/em-filter-i18n.h:31
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "æ"
 
-#: ../calendar/gui/caltypes.xml.h:22
-#: ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "äæ"
 
@@ -2147,22 +2191,22 @@ msgid "Edit Alarm"
 msgstr "çèéé"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:435
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Pop up an alert"
 msgstr "éçæç"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:431
+#: ../calendar/gui/e-alarm-list.c:434
 msgid "Play a sound"
 msgstr "ææéæ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:443
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Run a program"
 msgstr "åèåéçå"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:439
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Send an email"
 msgstr "åééåéä"
 
@@ -2187,8 +2231,7 @@ msgstr "èéééèé"
 msgid "Mes_sage:"
 msgstr "èæ(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "éé"
 
@@ -2253,7 +2296,7 @@ msgstr "åé"
 msgid "start of appointment"
 msgstr "çæéå"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "åä/èç"
 
@@ -2267,83 +2310,80 @@ msgstr "åå(_A)"
 msgid "Alarms"
 msgstr "éé"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
 msgstr "éå:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:509
+#: ../calendar/gui/dialogs/calendar-setup.c:180
+#: ../modules/addressbook/addressbook-config.c:516
 msgid "_Type:"
 msgstr "éå(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232
-#: ../mail/mail-config.ui.h:152
+#: ../calendar/gui/dialogs/calendar-setup.c:242 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:280
+#: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "åç(_N):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "èèèäæååèæåääéçäæ(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "èèåäæåååèæåääéçäæ(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:295
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "èèååéæåååèæåääéçäæ(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:352
+#: ../calendar/gui/dialogs/calendar-setup.c:372
 msgid "Colo_r:"
 msgstr "éè(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:200
-#: ../mail/mail-config.ui.h:51
-#: ../modules/addressbook/addressbook-config.c:1010
+#: ../calendar/gui/dialogs/calendar-setup.c:395
+#: ../calendar/gui/dialogs/calendar-setup.c:406
+#: ../calendar/gui/dialogs/calendar-setup.c:417
+#: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
+#: ../modules/addressbook/addressbook-config.c:1052
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../plugins/itip-formatter/itip-formatter.c:2960
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "äè"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../calendar/gui/dialogs/calendar-setup.c:407
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "åäæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:418
 msgid "Memo List"
 msgstr "ååéæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:503
 msgid "Calendar Properties"
 msgstr "iCalendar éè"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:503
 msgid "New Calendar"
 msgstr "æèäæ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:559
 msgid "Task List Properties"
 msgstr "åäæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:559
 msgid "New Task List"
 msgstr "æååäæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:615
 msgid "Memo List Properties"
 msgstr "ååéæååæ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:615
 msgid "New Memo List"
 msgstr "æåååéæå"
 
@@ -2391,271 +2431,263 @@ msgstr "%s  äåçåääææãææéäææääææéåç
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  äææåääææïææéåçèåï"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:445
+#: ../calendar/gui/dialogs/comp-editor-page.c:458
 #, c-format
 msgid "Validation error: %s"
 msgstr "çèäçéèï %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:260
+#: ../calendar/gui/dialogs/comp-editor.c:267
 msgid "Could not save attachments"
 msgstr "çæååéä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:535
+#: ../calendar/gui/dialogs/comp-editor.c:589
 msgid "Could not update object"
 msgstr "çæææçä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:650
+#: ../calendar/gui/dialogs/comp-editor.c:715
 msgid "Edit Appointment"
 msgstr "çèçæ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:657
+#: ../calendar/gui/dialogs/comp-editor.c:722
 #, c-format
 msgid "Meeting - %s"
 msgstr "æè - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:724
 #, c-format
 msgid "Appointment - %s"
 msgstr "çæ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:730
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ææçåä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:667
+#: ../calendar/gui/dialogs/comp-editor.c:732
 #, c-format
 msgid "Task - %s"
 msgstr "åä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:672
+#: ../calendar/gui/dialogs/comp-editor.c:737
 #, c-format
 msgid "Memo - %s"
 msgstr "ååé - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:688
+#: ../calendar/gui/dialogs/comp-editor.c:753
 msgid "No Summary"
 msgstr "æææè"
 
-#: ../calendar/gui/dialogs/comp-editor.c:809
+#: ../calendar/gui/dialogs/comp-editor.c:874
 msgid "Keep original item?"
 msgstr "æåäæååéçï"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
-msgid "Click here to close the current window"
-msgstr "æéèäééçåèç"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1012
-#: ../mail/e-mail-browser.c:132
-#: ../shell/e-shell-window-actions.c:1433
-#: ../widgets/misc/e-focus-tracker.c:114
-#: ../widgets/misc/e-focus-tracker.c:552
-#: ../widgets/misc/e-web-view.c:414
-#: ../widgets/misc/e-web-view.c:1068
+#: ../calendar/gui/dialogs/comp-editor.c:1071
+msgid "Close the current window"
+msgstr "ééçåçèç"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1078 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1474
+#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:457 ../widgets/misc/e-web-view.c:1280
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1019
-#: ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1440
-#: ../widgets/misc/e-focus-tracker.c:107
-#: ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1062
+#: ../calendar/gui/dialogs/comp-editor.c:1085 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1481
+#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:1274
 msgid "Cut the selection"
 msgstr "åäéåçå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1026
-#: ../shell/e-shell-window-actions.c:1447
-#: ../widgets/misc/e-focus-tracker.c:128
-#: ../widgets/misc/e-focus-tracker.c:562
+#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../shell/e-shell-window-actions.c:1488
+#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "åééåçå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1033
-msgid "Click here to view help available"
-msgstr "æéèäæèåççèæ"
+#: ../calendar/gui/dialogs/comp-editor.c:1099
+msgid "View help"
+msgstr "æèæå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1040
-#: ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1482
-#: ../widgets/misc/e-focus-tracker.c:121
-#: ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1523
+#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-web-view.c:1286
 msgid "Paste the clipboard"
 msgstr "èäåèççåå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-msgid "Click here to save the current window"
-msgstr "æéèäååçåèç"
+#: ../calendar/gui/dialogs/comp-editor.c:1127
+msgid "Save current changes"
+msgstr "ååçåçææ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068
-#: ../mail/e-mail-browser.c:153
-#: ../shell/e-shell-window-actions.c:1552
-#: ../widgets/misc/e-focus-tracker.c:135
-#: ../widgets/misc/e-focus-tracker.c:567
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1600
+#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "éåæææå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1075
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Classification"
 msgstr "æé(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
-#: ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:167
+#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1580
+#: ../shell/e-shell-window-actions.c:1628
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089
-#: ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1587
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1635
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "ææ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
-#: ../shell/e-shell-window-actions.c:1594
+#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Help"
 msgstr "æå(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_Insert"
 msgstr "æå(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1110
-#: ../composer/e-composer-actions.c:336
+#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "éé(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
-#: ../mail/e-mail-browser.c:174
-#: ../shell/e-shell-window-actions.c:1629
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1677 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../composer/e-composer-actions.c:285
+#: ../calendar/gui/dialogs/comp-editor.c:1193
+#: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "éä(_A)â"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-msgid "Click here to attach a file"
-msgstr "æéèäéä"
+#: ../calendar/gui/dialogs/comp-editor.c:1195
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "éåææ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1203
 msgid "_Categories"
 msgstr "åé(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1205
 msgid "Toggles whether to display categories"
 msgstr "åææåéçãåéã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1211
 msgid "Time _Zone"
 msgstr "æå(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Toggles whether the time zone is displayed"
 msgstr "åææåéçãæåã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1156
+#: ../calendar/gui/dialogs/comp-editor.c:1222
 msgid "Pu_blic"
 msgstr "åé(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1224
 msgid "Classify as public"
 msgstr "åéçåé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1229
 msgid "_Private"
 msgstr "çä(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165
+#: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "Classify as private"
 msgstr "æéççä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1236
 msgid "_Confidential"
 msgstr "æå(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172
+#: ../calendar/gui/dialogs/comp-editor.c:1238
 msgid "Classify as confidential"
 msgstr "æéçæå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180
+#: ../calendar/gui/dialogs/comp-editor.c:1246
 msgid "R_ole Field"
 msgstr "èèæä(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1248
 msgid "Toggles whether the Role field is displayed"
 msgstr "åææåéçãèèãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1256
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "åææåéçãRSVPãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1196
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "_Status Field"
 msgstr "çææä(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1264
 msgid "Toggles whether the Status field is displayed"
 msgstr "åææåéçãçæãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1270
 msgid "_Type Field"
 msgstr "éåæä(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1272
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "åææåéçãåæèéåãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
-#: ../composer/e-composer-private.c:73
+#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "æèäçæä(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1936
-#: ../composer/e-composer-actions.c:504
+#: ../calendar/gui/dialogs/comp-editor.c:2018
+#: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "éå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2269
-#: ../calendar/gui/dialogs/comp-editor.c:2432
-#: ../calendar/gui/dialogs/comp-editor.c:3407
+#: ../calendar/gui/dialogs/comp-editor.c:2354
+#: ../calendar/gui/dialogs/comp-editor.c:2517
+#: ../calendar/gui/dialogs/comp-editor.c:3495
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "åæææçææïåæææåæéçæåçææ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3371
+#: ../calendar/gui/dialogs/comp-editor.c:3459
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "éä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3439
+#: ../calendar/gui/dialogs/comp-editor.c:3527
 msgid "Unable to use current version!"
 msgstr "çæäççåççæï"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:92
-msgid "Could not open source"
-msgstr "çæéåäæ"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:100
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Could not open destination"
 msgstr "çæéåççå"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:109
+#: ../calendar/gui/dialogs/copy-source-dialog.c:123
 msgid "Destination is read only"
 msgstr "ççåæåè"
 
+#: ../calendar/gui/dialogs/copy-source-dialog.c:157
+msgid "Cannot create object"
+msgstr "äèåççä"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:183
+msgid "Could not open source"
+msgstr "çæéåäæ"
+
 #: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "æååéåäæææäèäçäçéåéç(_D)ï"
@@ -2745,8 +2777,8 @@ msgid "_Alarms"
 msgstr "éé(_A)"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
-msgstr "æéèäèåæåæéåääçéé"
+msgid "Set or unset alarms for this event"
+msgstr "èåæåæéåääçéé"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2765,14 +2797,12 @@ msgid "Make this a recurring event"
 msgstr "åæéèçéææää"
 
 #: ../calendar/gui/dialogs/event-editor.c:240
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "åééé"
 
 #: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "æåééåééé"
 
@@ -2792,14 +2822,13 @@ msgstr "çé/åç(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "æèæåæèççé/åçèè"
 
-#: ../calendar/gui/dialogs/event-editor.c:314
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3185
 msgid "Appointment"
 msgstr "çæ"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
 #: ../calendar/gui/dialogs/event-page.ui.h:3
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "åæè"
 
@@ -2807,84 +2836,78 @@ msgstr "åæè"
 msgid "Print this event"
 msgstr "æåéåää"
 
-#: ../calendar/gui/dialogs/event-page.c:765
+#: ../calendar/gui/dialogs/event-page.c:556
 msgid "Event's start time is in the past"
 msgstr "ääçéåæååéå"
 
-#: ../calendar/gui/dialogs/event-page.c:806
+#: ../calendar/gui/dialogs/event-page.c:633
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "äèçèääïåçéåçèäææåèç"
 
-#: ../calendar/gui/dialogs/event-page.c:810
+#: ../calendar/gui/dialogs/event-page.c:637
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "äèåæççèääïåçääæåéä"
 
-#: ../calendar/gui/dialogs/event-page.c:822
-#: ../calendar/gui/dialogs/event-page.c:2780
+#: ../calendar/gui/dialogs/event-page.c:649
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgid "This event has alarms"
 msgstr "éåääåæéé"
 
-#: ../calendar/gui/dialogs/event-page.c:889
+#: ../calendar/gui/dialogs/event-page.c:716
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æèåéä(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:936
-msgid "_Delegatees"
-msgstr "äçè(_D)"
-
-#: ../calendar/gui/dialogs/event-page.c:938
-msgid "Atte_ndees"
-msgstr "åæè(_N)"
-
-#: ../calendar/gui/dialogs/event-page.c:1155
+#: ../calendar/gui/dialogs/event-page.c:1254
 msgid "Event with no start date"
 msgstr "çéåææçää"
 
-#: ../calendar/gui/dialogs/event-page.c:1158
+#: ../calendar/gui/dialogs/event-page.c:1257
 msgid "Event with no end date"
 msgstr "ççæææçää"
 
-#: ../calendar/gui/dialogs/event-page.c:1329
-#: ../calendar/gui/dialogs/memo-page.c:671
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1430
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:843
 msgid "Start date is wrong"
 msgstr "éåææéè"
 
-#: ../calendar/gui/dialogs/event-page.c:1339
+#: ../calendar/gui/dialogs/event-page.c:1440
 msgid "End date is wrong"
 msgstr "çæææéè"
 
-#: ../calendar/gui/dialogs/event-page.c:1362
+#: ../calendar/gui/dialogs/event-page.c:1463
 msgid "Start time is wrong"
 msgstr "éåæééè"
 
-#: ../calendar/gui/dialogs/event-page.c:1369
+#: ../calendar/gui/dialogs/event-page.c:1470
 msgid "End time is wrong"
 msgstr "çææééè"
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/memo-page.c:712
-#: ../calendar/gui/dialogs/task-page.c:967
-msgid "The organizer selected no longer has an account."
-msgstr "éåçåéäåçææåèã"
-
-#: ../calendar/gui/dialogs/event-page.c:1539
-#: ../calendar/gui/dialogs/memo-page.c:718
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1635
+#: ../calendar/gui/dialogs/memo-page.c:736
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "An organizer is required."
 msgstr "éèäååéäã"
 
-#: ../calendar/gui/dialogs/event-page.c:1564
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1669
+#: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "æåéèäååæèã"
 
-#: ../calendar/gui/dialogs/event-page.c:2654
+#: ../calendar/gui/dialogs/event-page.c:1869
+msgid "_Delegatees"
+msgstr "äçè(_D)"
+
+#: ../calendar/gui/dialogs/event-page.c:1871
+msgid "Atte_ndees"
+msgstr "åæè(_N)"
+
+#: ../calendar/gui/dialogs/event-page.c:2891
 #, c-format
-msgid "Unable to open the calendar '%s'."
-msgstr "çæéåèäæ '%s'ã"
+msgid "Unable to open the calendar '%s': %s"
+msgstr "çæéåèäæã%sãï%s"
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -2892,40 +2915,37 @@ msgstr "çæéåèäæ '%s'ã"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2698
-#: ../calendar/gui/dialogs/memo-page.c:931
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/memo-page.c:967
+#: ../calendar/gui/dialogs/task-page.c:1855
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "äææä %s çäçä"
 
-#: ../calendar/gui/dialogs/event-page.c:3009
+#: ../calendar/gui/dialogs/event-page.c:3250
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "åæåçæå %d å"
-msgstr[1] "åæåçæå %d å"
 
-#: ../calendar/gui/dialogs/event-page.c:3015
+#: ../calendar/gui/dialogs/event-page.c:3256
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "çæå %d åæ"
-msgstr[1] "çæå %d åæ"
 
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3262
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "çæå %d åé"
-msgstr[1] "çæå %d åé"
 
-#: ../calendar/gui/dialogs/event-page.c:3040
+#: ../calendar/gui/dialogs/event-page.c:3281
 msgid "Customize"
 msgstr "èé"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3046
+#: ../calendar/gui/dialogs/event-page.c:3287
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "ææ"
@@ -2956,12 +2976,12 @@ msgstr "éé(_A)"
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:343
+#: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "æè(_D):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:362
+#: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "äç(_L):"
 
@@ -3003,47 +3023,99 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "çå"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105
-#: ../calendar/gui/print.c:3176
-msgid "Memo"
-msgstr "ååé"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "åæ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
-msgid "Print this memo"
-msgstr "æåéåååé"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "åæ"
 
-#: ../calendar/gui/dialogs/memo-page.c:337
-msgid "Memo's start date is in the past"
-msgstr "ååéçéåæååéå"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "åäæ"
 
-#: ../calendar/gui/dialogs/memo-page.c:375
-msgid "Memo cannot be edited, because the selected memo list is read only"
-msgstr "äèçèååéïåçéåçååéæåæåèç"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr "äæ"
 
-#: ../calendar/gui/dialogs/memo-page.c:379
-msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr "äèåæççèååéïåçääæåéä"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr "äæ"
 
-#: ../calendar/gui/dialogs/memo-page.c:892
-#, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "çæåã%sãéåååéã"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "äæ"
 
-#: ../calendar/gui/dialogs/memo-page.c:1063
-#: ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1052
-#: ../mail/em-format-html.c:2396
-#: ../mail/em-format-html.c:2461
-#: ../mail/em-format-html.c:2485
-#: ../mail/message-list.etspec.h:20
-#: ../modules/mail/em-mailer-prefs.c:72
-msgid "To"
-msgstr "æäè"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "åæ"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.ui.h:5
-msgid "Sta_rt date:"
-msgstr "éåæ(_R):"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "äæ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "äæ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "åäæ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "åæ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "éæææ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+msgid "Select _Today"
+msgstr "éæäå(_T)"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "äæ"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3189
+msgid "Memo"
+msgstr "ååé"
+
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "æåéåååé"
+
+#: ../calendar/gui/dialogs/memo-page.c:393
+msgid "Memo's start date is in the past"
+msgstr "ååéçéåæååéå"
+
+#: ../calendar/gui/dialogs/memo-page.c:430
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "äèçèååéïåçéåçååéæåæåèç"
+
+#: ../calendar/gui/dialogs/memo-page.c:434
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "äèåæççèååéïåçääæåéä"
+
+#: ../calendar/gui/dialogs/memo-page.c:924
+#, c-format
+msgid "Unable to open memos in '%s': %s"
+msgstr "çæåã%sãéåååéï%s"
+
+#: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2563
+#: ../mail/em-format-html.c:2628 ../mail/em-format-html.c:2652
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
+msgid "To"
+msgstr "æäè"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
+msgid "Sta_rt date:"
+msgstr "éåæ(_R):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
 #: ../calendar/gui/dialogs/task-page.ui.h:6
@@ -3055,7 +3127,7 @@ msgid "T_o:"
 msgstr "æäè(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:422
+#: ../calendar/gui/dialogs/task-page.c:331
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "çç(_G):"
@@ -3100,17 +3172,17 @@ msgstr "ææäé"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution çæçèéåéææçæã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:895
+#: ../calendar/gui/dialogs/recurrence-page.c:894
 msgid "Recurrence date is invalid"
 msgstr "éææææçæ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:935
+#: ../calendar/gui/dialogs/recurrence-page.c:934
 msgid "End time of the recurrence was before event's start"
 msgstr "éææääççææåææéåæå"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:965
+#: ../calendar/gui/dialogs/recurrence-page.c:964
 msgid "on"
 msgstr "ç"
 
@@ -3118,7 +3190,7 @@ msgstr "ç"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1023
+#: ../calendar/gui/dialogs/recurrence-page.c:1022
 msgid "first"
 msgstr "ä"
 
@@ -3127,7 +3199,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1028
 msgid "second"
 msgstr "ä"
 
@@ -3135,7 +3207,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1033
 msgid "third"
 msgstr "ä"
 
@@ -3143,7 +3215,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "fourth"
 msgstr "å"
 
@@ -3151,7 +3223,7 @@ msgstr "å"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "fifth"
 msgstr "çä"
 
@@ -3159,13 +3231,13 @@ msgstr "çä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 msgid "last"
 msgstr "æå"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "åäææ"
 
@@ -3173,7 +3245,7 @@ msgstr "åäææ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1078
 msgid "1st to 10th"
 msgstr "1æè10æ"
 
@@ -3181,7 +3253,7 @@ msgstr "1æè10æ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 msgid "11th to 20th"
 msgstr "11æè20æ"
 
@@ -3189,48 +3261,41 @@ msgstr "11æè20æ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 msgid "21st to 31st"
 msgstr "21æè31æ"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/gui/dialogs/recurrence-page.c:1116
-msgid "day"
-msgstr "å"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Tuesday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Wednesday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Thursday"
 msgstr "ææå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "ææå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "æææ"
@@ -3238,31 +3303,31 @@ msgstr "æææ"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1245
+#: ../calendar/gui/dialogs/recurrence-page.c:1244
 msgid "on the"
 msgstr "åç"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1418
 msgid "occurrences"
 msgstr "æ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2123
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Add exception"
 msgstr "ååäå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2169
 msgid "Could not get a selection to modify."
 msgstr "çæååèçèçéååã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2170
+#: ../calendar/gui/dialogs/recurrence-page.c:2175
 msgid "Modify exception"
 msgstr "çèäå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2219
 msgid "Could not get a selection to delete."
 msgstr "çæååèåéçéååã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2348
+#: ../calendar/gui/dialogs/recurrence-page.c:2353
 msgid "Date/Time"
 msgstr "ææ/æé"
 
@@ -3274,8 +3339,7 @@ msgstr "æ"
 msgid "Exceptions"
 msgstr "äå"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3
-#: ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
 msgstr "éè"
 
@@ -3333,101 +3397,82 @@ msgstr "åæçééèéåäääèéå"
 msgid "Notify new attendees _only"
 msgstr "åéçæçåæè(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:374
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
 msgid "Completed date is wrong"
 msgstr "åæææéè "
 
-#: ../calendar/gui/dialogs/task-details-page.c:486
+#: ../calendar/gui/dialogs/task-details-page.c:488
 msgid "Web Page"
 msgstr "çé"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-component-preview.c:298
 #: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713
-#: ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225
-#: ../calendar/gui/e-task-table.c:596
-#: ../calendar/gui/print.c:3262
-#: ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180
-#: ../mail/em-sync-stream.c:202
+#: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:3275 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "ååæ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711
-#: ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:595
-#: ../calendar/gui/print.c:3259
-#: ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
+#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3272
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:374
 msgid "Completed"
 msgstr "ååæ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:313
-#: ../calendar/gui/e-task-table.c:516
-#: ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1228
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "é"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:435
 #: ../calendar/gui/e-cal-model-tasks.c:709
-#: ../calendar/gui/e-cal-model-tasks.c:786
-#: ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221
-#: ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3256
+#: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
+#: ../calendar/gui/print.c:3269
 msgid "In Progress"
 msgstr "éèä"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:518
-#: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1226
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1222 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "ä"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model.c:1521
-#: ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/message-list.c:1227
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-cal-model.c:1528 ../calendar/gui/e-task-table.c:515
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "äè"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-component-preview.c:302
 #: ../calendar/gui/e-cal-model-tasks.c:433
-#: ../calendar/gui/e-cal-model-tasks.c:707
-#: ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3253
-#: ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
+#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:591
+#: ../calendar/gui/print.c:3266 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æéå"
 
@@ -3444,18 +3489,16 @@ msgstr "çæ(_U):"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-calendar-view.c:1831
-#: ../calendar/gui/e-meeting-list-view.c:596
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/em-filter-i18n.h:72
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "çæ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:519
-#: ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "ææå"
@@ -3473,62 +3516,60 @@ msgstr "ååéå(_P):"
 msgid "_Web Page:"
 msgstr "çé(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "çæèçèæ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "æéèæè/æèèåäççæèçèæ"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../calendar/gui/dialogs/task-editor.c:126
 msgid "_Send Options"
 msgstr "åééé(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:328
-#: ../calendar/gui/print.c:3174
+#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3187
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "åä"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "Task Details"
 msgstr "åäèçèæ"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:364
 msgid "Print this task"
 msgstr "æåééåä"
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:249
 msgid "Task's start date is in the past"
 msgstr "åäçéåæååéå"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's due date is in the past"
 msgstr "åäççææååéå"
 
-#: ../calendar/gui/dialogs/task-page.c:375
+#: ../calendar/gui/dialogs/task-page.c:284
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "äèçèåäïåçéåçåäæåæåèç"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:288
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "äèåæççèåäïåçääæåéä"
 
-#: ../calendar/gui/dialogs/task-page.c:430
+#: ../calendar/gui/dialogs/task-page.c:339
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "æèåéä(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:816
 msgid "Due date is wrong"
 msgstr "åææéè"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1808
 #, c-format
-msgid "Unable to open tasks in '%s'."
-msgstr "çæå '%s' éååäã"
+msgid "Unable to open tasks in '%s': %s"
+msgstr "çæåã%sãéååäï%s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -3543,126 +3584,122 @@ msgid "Time zone:"
 msgstr "æåï"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/gui/e-alarm-list.c:384
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d æ"
-msgstr[1] "%d æ"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:387
+#: ../calendar/gui/e-alarm-list.c:390
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d é"
-msgstr[1] "%d é"
 
-#: ../calendar/gui/e-alarm-list.c:449
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Unknown action to be performed"
 msgstr "èåèçæçåä"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:463
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "æçæéåå %2$s%1$s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:468
+#: ../calendar/gui/e-alarm-list.c:471
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "æçæéåå %2$s%1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s æçæéåæ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:489
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "æçæçæå %2$s%1$s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "æçæçæå %2$s%1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:501
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s æçæçææ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:522
+#: ../calendar/gui/e-alarm-list.c:525
 #, c-format
 msgid "%s at %s"
 msgstr "%s å %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:530
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s çæççèçéå"
 
-#: ../calendar/gui/e-cal-component-preview.c:188
-#: ../filter/e-filter-rule.c:667
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:669
 msgid "Untitled"
 msgstr "çæé"
 
-#: ../calendar/gui/e-cal-component-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:198
 msgid "Categories:"
 msgstr "åéï"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:237
 msgid "Summary:"
 msgstr "æèï"
 
-#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-component-preview.c:261
 msgid "Start Date:"
 msgstr "éåææï"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "ææææï"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:284
-#: ../plugins/itip-formatter/itip-view.c:1075
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../plugins/itip-formatter/itip-view.c:1076
 msgid "Status:"
 msgstr "çæï"
 
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Priority:"
 msgstr "ååççï"
 
-#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "æèï"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:371
 msgid "Web Page:"
 msgstr "çéï"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Created"
 msgstr "ååç"
 
@@ -3682,13 +3719,12 @@ msgid "Start Date"
 msgstr "éåææ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:570
+#: ../calendar/gui/e-task-table.c:568
 msgid "Free"
 msgstr "çé"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546
-#: ../calendar/gui/e-task-table.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "åç"
 
@@ -3708,46 +3744,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "ææ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061
-#: ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1027
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "æ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061
-#: ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "å"
 
-#: ../calendar/gui/e-cal-model.c:774
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233
-#: ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:1109
-#: ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2485
+#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
+#: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../plugins/itip-formatter/itip-formatter.c:462
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../calendar/gui/e-cal-model.c:1523
+#: ../calendar/gui/e-cal-model.c:1530
 msgid "Recurring"
 msgstr "éæææå"
 
-#: ../calendar/gui/e-cal-model.c:1525
+#: ../calendar/gui/e-cal-model.c:1532
 msgid "Assigned"
 msgstr "åæå"
 
-#: ../calendar/gui/e-cal-model.c:2643
+#: ../calendar/gui/e-cal-model.c:2714
 #, c-format
 msgid "Opening %s"
 msgstr "æåéå %s"
@@ -3775,7 +3804,7 @@ msgstr "åææ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Priority"
 msgstr "ååçç"
 
@@ -3784,70 +3813,64 @@ msgid "Start date"
 msgstr "éåææ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:559
+#: ../calendar/gui/e-meeting-list-view.c:573
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:580
+#: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "éå"
 
-#: ../calendar/gui/e-calendar-view.c:422
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Cut selected events to the clipboard"
 msgstr "åäéåçääèåèç"
 
-#: ../calendar/gui/e-calendar-view.c:428
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Copy selected events to the clipboard"
 msgstr "èèéåçääèåèç"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Paste events from the clipboard"
 msgstr "ååèçèäää"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Delete selected events"
 msgstr "åééåçää"
 
-#: ../calendar/gui/e-calendar-view.c:459
-#: ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:261
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:260
 msgid "Deleting selected objects"
 msgstr "åééåççä"
 
-#: ../calendar/gui/e-calendar-view.c:653
-#: ../calendar/gui/e-memo-table.c:855
-#: ../calendar/gui/e-task-table.c:1084
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-task-table.c:1082
 msgid "Updating objects"
 msgstr "ææçä"
 
 #: ../calendar/gui/e-calendar-view.c:1778
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220
-#: ../plugins/itip-formatter/itip-formatter.c:2473
+#: ../calendar/gui/e-meeting-list-view.c:213
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2605
 msgid "Accepted"
 msgstr "æå"
 
 #: ../calendar/gui/e-calendar-view.c:1779
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-store.c:222
-#: ../plugins/itip-formatter/itip-formatter.c:2479
+#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2611
 msgid "Declined"
 msgstr "åæ"
 
 #: ../calendar/gui/e-calendar-view.c:1780
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
 #: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Tentative"
 msgstr "æè"
 
 #: ../calendar/gui/e-calendar-view.c:1781
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:226
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2614
 msgid "Delegated"
 msgstr "ååæ"
 
@@ -3856,26 +3879,25 @@ msgid "Needs action"
 msgstr "éèåä"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1926
-#: ../calendar/gui/e-memo-table.c:538
-#: ../calendar/gui/e-task-table.c:759
+#. To Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:537
+#: ../calendar/gui/e-task-table.c:758
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "åéä: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1930
-#: ../calendar/gui/e-memo-table.c:543
+#. With SunOne accounts, there may be no ':' in
+#. * organizer.value.
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:542
 #: ../calendar/gui/e-task-table.c:762
 #, c-format
 msgid "Organizer: %s"
 msgstr "æèåéä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946
-#: ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3221
 #, c-format
 msgid "Location: %s"
 msgstr "äçï%s"
@@ -3909,27 +3931,27 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:745
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "éé %02i åé"
 
-#: ../calendar/gui/e-day-view-time-item.c:766
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 msgstr "éççäæå"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:783
+#: ../calendar/gui/e-day-view-time-item.c:844
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:175
-#: ../modules/calendar/e-calendar-preferences.c:224
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "ææ"
 
-#: ../calendar/gui/e-day-view-time-item.c:810
-#: ../calendar/gui/e-timezone-entry.c:316
-#: ../modules/calendar/e-calendar-preferences.c:251
+#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:255
 msgid "Select..."
 msgstr "éæâ"
 
@@ -3939,10 +3961,8 @@ msgstr "éæâ"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:841
-#: ../calendar/gui/e-day-view.c:1793
-#: ../calendar/gui/e-week-view-main-item.c:208
-#: ../calendar/gui/print.c:1866
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1875
 msgid "%A %d %B"
 msgstr "%mæ%dæ%A"
 
@@ -3952,11 +3972,10 @@ msgstr "%mæ%dæ%A"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:845
-#: ../calendar/gui/e-day-view.c:1810
-#: ../calendar/gui/e-week-view-main-item.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:1005
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-week-view-main-item.c:224
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1015
 msgid "%a %d %b"
 msgstr "%mæ%dæ (%a)"
 
@@ -3965,31 +3984,24 @@ msgstr "%mæ%dæ (%a)"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:849
-#: ../calendar/gui/e-day-view.c:1826
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1041
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-week-view-main-item.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../modules/calendar/e-cal-shell-view-private.c:1051
 msgid "%d %b"
 msgstr "%mæ%dæ"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002
-#: ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:920
-#: ../calendar/gui/print.c:939
-#: ../calendar/gui/print.c:2363
-#: ../calendar/gui/print.c:2383
+#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:756
+#: ../calendar/gui/print.c:926 ../calendar/gui/print.c:945
+#: ../calendar/gui/print.c:2372 ../calendar/gui/print.c:2392
 msgid "am"
 msgstr "äå"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005
-#: ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:925
-#: ../calendar/gui/print.c:941
-#: ../calendar/gui/print.c:2368
-#: ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:759
+#: ../calendar/gui/print.c:931 ../calendar/gui/print.c:947
+#: ../calendar/gui/print.c:2377 ../calendar/gui/print.c:2394
 msgid "pm"
 msgstr "äå"
 
@@ -4015,98 +4027,93 @@ msgstr "ååè"
 msgid "Resources"
 msgstr "èæ"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1021
-#: ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:1022 ../calendar/gui/print.c:1094
 msgid "Individual"
 msgstr "åå"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1089
-#: ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1095 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "çç"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1090
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1096
 msgid "Resource"
 msgstr "èæ"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1091
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1097
 msgid "Room"
 msgstr "æèå"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1105
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/print.c:1111
 msgid "Chair"
 msgstr "äå"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1024
-#: ../calendar/gui/print.c:1106
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:1025 ../calendar/gui/print.c:1112
 msgid "Required Participant"
 msgstr "ååè"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1107
+#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1113
 msgid "Optional Participant"
 msgstr "ååè"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1108
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1114
 msgid "Non-Participant"
 msgstr "çåè"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1034
+#: ../calendar/gui/e-meeting-list-view.c:212
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1035
 msgid "Needs Action"
 msgstr "éèåä"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:539
+#: ../calendar/gui/e-meeting-list-view.c:553
 msgid "Attendee                          "
 msgstr "åæè"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "éèä"
 
-#: ../calendar/gui/e-meeting-store.c:1763
+#: ../calendar/gui/e-meeting-store.c:1834
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "èåäçè %2$s åäæå %1$s äååçé/åçèèçåç "
 
-#: ../calendar/gui/e-meeting-store.c:1772
+#: ../calendar/gui/e-meeting-store.c:1844
 #, c-format
 msgid "Failure reason: %s"
 msgstr "åæååï%s"
 
+#: ../calendar/gui/e-meeting-store.c:1849
+#: ../plugins/caldav/caldav-browse-server.c:920
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:332
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "èååç"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:431
@@ -4213,50 +4220,47 @@ msgstr "èè"
 msgid "Member"
 msgstr "æå"
 
-#: ../calendar/gui/e-memo-table.c:419
-#: ../modules/calendar/e-cal-shell-content.c:469
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:438
+#: ../calendar/gui/e-memo-table.c:418
+#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-memo-shell-view-actions.c:222
+#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../modules/calendar/e-memo-shell-view.c:293
+#: ../plugins/caldav/caldav-browse-server.c:437
 msgid "Memos"
 msgstr "ååé"
 
-#: ../calendar/gui/e-memo-table.c:500
-#: ../calendar/gui/e-task-table.c:723
+#: ../calendar/gui/e-memo-table.c:499 ../calendar/gui/e-task-table.c:721
 msgid "* No Summary *"
 msgstr "* æææè *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:585
-#: ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:584 ../calendar/gui/e-task-table.c:803
 msgid "Start: "
 msgstr "éå:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:604
-#: ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:821
 msgid "Due: "
 msgstr "åæ:"
 
-#: ../calendar/gui/e-memo-table.c:720
+#: ../calendar/gui/e-memo-table.c:717
 msgid "Cut selected memos to the clipboard"
 msgstr "åäéåçååéèåèç"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:723
 msgid "Copy selected memos to the clipboard"
 msgstr "èèéåçååéèåèç"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:729
 msgid "Paste memos from the clipboard"
 msgstr "ååèçèäååé"
 
-#: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../calendar/gui/e-memo-table.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Delete selected memos"
 msgstr "åééåçååé"
 
-#: ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-memo-table.c:741
 msgid "Select all visible memos"
 msgstr "éæåéåèçååé"
 
@@ -4268,132 +4272,124 @@ msgstr "èæéèååæçååé"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:545
+#: ../calendar/gui/e-task-table.c:543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:642
-#: ../calendar/gui/print.c:2159
-#: ../calendar/importers/icalendar-importer.c:81
-#: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:430
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:444
-#: ../plugins/caldav/caldav-browse-server.c:436
-#: ../plugins/groupwise-features/camel-gw-listener.c:428
-#: ../plugins/groupwise-features/camel-gw-listener.c:569
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+#: ../calendar/gui/e-task-table.c:640 ../calendar/gui/print.c:2168
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:975
+#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-task-shell-view-actions.c:245
+#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Tasks"
 msgstr "åä"
 
-#: ../calendar/gui/e-task-table.c:949
+#: ../calendar/gui/e-task-table.c:947
 msgid "Cut selected tasks to the clipboard"
 msgstr "åäéåçåäèåèç"
 
-#: ../calendar/gui/e-task-table.c:955
+#: ../calendar/gui/e-task-table.c:953
 msgid "Copy selected tasks to the clipboard"
 msgstr "èèéåçåäèåèç"
 
-#: ../calendar/gui/e-task-table.c:961
+#: ../calendar/gui/e-task-table.c:959
 msgid "Paste tasks from the clipboard"
 msgstr "ååèçèäåä"
 
-#: ../calendar/gui/e-task-table.c:967
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../calendar/gui/e-task-table.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Delete selected tasks"
 msgstr "åééåçåä"
 
-#: ../calendar/gui/e-task-table.c:973
+#: ../calendar/gui/e-task-table.c:971
 msgid "Select all visible tasks"
 msgstr "éæåéåèçåä"
 
-#: ../calendar/gui/e-timezone-entry.c:327
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "éæäåæå"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:225
-#: ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1856
 msgid "%d %B"
 msgstr "%mæ%dæ"
 
-#: ../calendar/gui/ea-cal-view-event.c:286
+#: ../calendar/gui/ea-cal-view-event.c:290
 msgid "It has alarms."
 msgstr "ååæééã"
 
-#: ../calendar/gui/ea-cal-view-event.c:289
+#: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
 msgstr "åæéææçæã"
 
-#: ../calendar/gui/ea-cal-view-event.c:292
+#: ../calendar/gui/ea-cal-view-event.c:296
 msgid "It is a meeting."
 msgstr "éæäéæèã"
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:303
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "èäæääïæèç %sã"
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:306
 msgid "Calendar Event: It has no summary."
 msgstr "èäæääïæææèã"
 
-#: ../calendar/gui/ea-cal-view-event.c:322
+#: ../calendar/gui/ea-cal-view-event.c:328
 msgid "calendar view event"
 msgstr "èäææèää"
 
-#: ../calendar/gui/ea-cal-view-event.c:551
+#: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
 msgstr "ååçé"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:303
 msgid "New Appointment"
 msgstr "æåçæ"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New All Day Event"
 msgstr "æåååää"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Meeting"
 msgstr "æåæè"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "Go to Today"
 msgstr "çèäæ"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Date"
 msgstr "çèææ"
 
-#: ../calendar/gui/ea-day-view-main-item.c:308
-#: ../calendar/gui/ea-week-view-main-item.c:340
+#: ../calendar/gui/ea-day-view-main-item.c:312
+#: ../calendar/gui/ea-week-view-main-item.c:344
 msgid "a table to view and select the current time range"
 msgstr "çäæèèéææåçåçèæ"
 
-#: ../calendar/gui/ea-day-view.c:148
-#: ../calendar/gui/ea-week-view.c:147
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "åæ %d åääã"
-msgstr[1] "åæ %d åääã"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153
-#: ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
 msgid "It has no events."
 msgstr "åææääã"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "åäéæèï%sã%s"
@@ -4401,168 +4397,106 @@ msgstr "åäéæèï%sã%s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ææèï%sã%s"
 
-#: ../calendar/gui/ea-day-view.c:200
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "åäéçèäææè"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "çæäæåæçèäææè"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:860
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1007
 msgid "Gnome Calendar"
 msgstr "Gnome èäæ"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:1001
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1011
 msgid "%A %d %b %Y"
 msgstr "%Yå%mæ%dæ (%A)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:1008
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1018
+#: ../modules/calendar/e-cal-shell-view-private.c:1024
+#: ../modules/calendar/e-cal-shell-view-private.c:1027
 msgid "%a %d %b %Y"
 msgstr "%Yå%mæ%dæ (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1034
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../modules/calendar/e-cal-shell-view-private.c:1044
 #: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../modules/calendar/e-cal-shell-view-private.c:1062
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
 msgid "%d %b %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../calendar/gui/ea-jump-button.c:147
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "èèæé"
 
-#: ../calendar/gui/ea-jump-button.c:156
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "æéèïäåäæåæåääã"
 
-#: ../calendar/gui/ea-week-view.c:155
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "ææèï%sã%s"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "éæèï%sã%s"
 
-#: ../calendar/gui/ea-week-view.c:193
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for a month"
 msgstr "çææçèäææè"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:199
 msgid "calendar view for one or more weeks"
 msgstr "çæäæåéçèäææè"
 
-#: ../calendar/gui/gnome-cal.c:2198
+#: ../calendar/gui/gnome-cal.c:2209
 msgid "Purging"
 msgstr "æé"
 
-#: ../calendar/gui/goto-dialog.ui.h:1
-msgid "April"
-msgstr "åæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:2
-msgid "August"
-msgstr "åæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:3
-msgid "December"
-msgstr "åäæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:4
-msgid "February"
-msgstr "äæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:5
-msgid "January"
-msgstr "äæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:6
-msgid "July"
-msgstr "äæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:7
-msgid "June"
-msgstr "åæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:8
-msgid "March"
-msgstr "äæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:9
-msgid "May"
-msgstr "äæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:10
-msgid "November"
-msgstr "åäæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:11
-msgid "October"
-msgstr "åæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:12
-msgid "Select Date"
-msgstr "éæææ"
-
-#: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
-msgid "Select _Today"
-msgstr "éæäå(_T)"
-
-#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "September"
-msgstr "äæ"
-
-#: ../calendar/gui/itip-utils.c:422
-#: ../calendar/gui/itip-utils.c:477
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:503 ../calendar/gui/itip-utils.c:558
+#: ../calendar/gui/itip-utils.c:661
 msgid "An organizer must be set."
 msgstr "åéæåäååéäã"
 
-#: ../calendar/gui/itip-utils.c:469
+#: ../calendar/gui/itip-utils.c:550
 msgid "At least one attendee is necessary"
 msgstr "èåéèäååæè"
 
-#: ../calendar/gui/itip-utils.c:657
-#: ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:747 ../calendar/gui/itip-utils.c:908
 msgid "Event information"
 msgstr "ääèè"
 
-#: ../calendar/gui/itip-utils.c:660
-#: ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:750 ../calendar/gui/itip-utils.c:911
 msgid "Task information"
 msgstr "åäèè"
 
-#: ../calendar/gui/itip-utils.c:663
-#: ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:753 ../calendar/gui/itip-utils.c:914
 msgid "Memo information"
 msgstr "ååéèè"
 
-#: ../calendar/gui/itip-utils.c:666
-#: ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:756 ../calendar/gui/itip-utils.c:932
 msgid "Free/Busy information"
 msgstr "çé/åçèè"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:759
 msgid "Calendar information"
 msgstr "èäæèè"
 
@@ -4570,7 +4504,7 @@ msgstr "èäæèè"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:796
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "åæå"
@@ -4579,7 +4513,7 @@ msgstr "åæå"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:803
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æææå"
@@ -4591,8 +4525,7 @@ msgstr "æææå"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
-#: ../calendar/gui/itip-utils.c:768
+#: ../calendar/gui/itip-utils.c:810 ../calendar/gui/itip-utils.c:858
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "åæç"
@@ -4601,7 +4534,7 @@ msgstr "åæç"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:817
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ååæ"
@@ -4609,7 +4542,7 @@ msgstr "ååæ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:830
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "åææ"
@@ -4617,7 +4550,7 @@ msgstr "åææ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "åæ"
@@ -4625,7 +4558,7 @@ msgstr "åæ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "éææç"
@@ -4633,239 +4566,252 @@ msgstr "éææç"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æçèå"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:929
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "çé/åçèè (%s å %s)"
 
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:937
 msgid "iCalendar information"
 msgstr "iCalendar èè"
 
-#: ../calendar/gui/itip-utils.c:865
+#: ../calendar/gui/itip-utils.c:962
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "çæååèæïæçääèåäääææéçã"
 
-#: ../calendar/gui/itip-utils.c:869
+#: ../calendar/gui/itip-utils.c:966
 msgid "Unable to book a resource, error: "
 msgstr "çæååèæïéèçï"
 
-#: ../calendar/gui/itip-utils.c:1032
+#: ../calendar/gui/itip-utils.c:1127
 msgid "You must be an attendee of the event."
 msgstr "äåéææääçåæèã"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "1st"
 msgstr "1æ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "2nd"
 msgstr "2æ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "3rd"
 msgstr "3æ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "4th"
 msgstr "4æ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "5th"
 msgstr "5æ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "6th"
 msgstr "6æ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "7th"
 msgstr "7æ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "8th"
 msgstr "8æ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "9th"
 msgstr "9æ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "10th"
 msgstr "10æ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "11th"
 msgstr "11æ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "12th"
 msgstr "12æ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "13th"
 msgstr "13æ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "14th"
 msgstr "14æ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "15th"
 msgstr "15æ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "16th"
 msgstr "16æ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "17th"
 msgstr "17æ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "18th"
 msgstr "18æ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "19th"
 msgstr "19æ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "20th"
 msgstr "20æ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "21st"
 msgstr "21æ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "22nd"
 msgstr "22æ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "23rd"
 msgstr "23æ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "24th"
 msgstr "24æ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "25th"
 msgstr "25æ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "26th"
 msgstr "26æ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "27th"
 msgstr "27æ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "28th"
 msgstr "28æ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "29th"
 msgstr "29æ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "30th"
 msgstr "30æ"
 
-#: ../calendar/gui/print.c:555
+#: ../calendar/gui/print.c:554
 msgid "31st"
 msgstr "31æ"
 
-#: ../calendar/gui/print.c:612
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:611
 msgid "Su"
 msgstr "æ"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "Mo"
 msgstr "ä"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "Tu"
 msgstr "ä"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "We"
 msgstr "ä"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Th"
 msgstr "å"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Fr"
 msgstr "ä"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Sa"
 msgstr "å"
 
-#: ../calendar/gui/print.c:3001
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:3014
 msgid " to "
 msgstr " å "
 
-#: ../calendar/gui/print.c:3011
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:3024
 msgid " (Completed "
 msgstr " (ååæ) "
 
-#: ../calendar/gui/print.c:3017
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3030
 msgid "Completed "
 msgstr "ååæ "
 
-#: ../calendar/gui/print.c:3027
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3040
 msgid " (Due "
 msgstr "(æé)"
 
-#: ../calendar/gui/print.c:3034
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:3047
 msgid "Due "
 msgstr "æé "
 
-#: ../calendar/gui/print.c:3199
+#: ../calendar/gui/print.c:3212
 #, c-format
 msgid "Summary: %s"
 msgstr "æèï%s"
 
-#: ../calendar/gui/print.c:3226
+#: ../calendar/gui/print.c:3239
 msgid "Attendees: "
 msgstr "åæè:"
 
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/print.c:3282
 #, c-format
 msgid "Status: %s"
 msgstr "çæ(_S): %s"
 
-#: ../calendar/gui/print.c:3284
+#: ../calendar/gui/print.c:3297
 #, c-format
 msgid "Priority: %s"
 msgstr "ååéå(_P): %s"
 
-#: ../calendar/gui/print.c:3302
+#: ../calendar/gui/print.c:3315
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "åæçåæ: %i"
 
-#: ../calendar/gui/print.c:3313
+#: ../calendar/gui/print.c:3326
 #, c-format
 msgid "URL: %s"
 msgstr "çå: %s"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3339
 #, c-format
 msgid "Categories: %s"
 msgstr "åé: %s"
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3350
 msgid "Contacts: "
 msgstr "èçä: "
 
@@ -4874,199 +4820,201 @@ msgstr "èçä: "
 msgid "% Completed"
 msgstr "% ååæ"
 
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "ååæ"
+
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "æåéè"
 
-#: ../calendar/gui/tasktypes.xml.h:28
-#: ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "åæ"
 
-#: ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "åæ"
 
-#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "çæåæè"
 
-#: ../calendar/importers/icalendar-importer.c:350
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1958
+#: ../calendar/importers/icalendar-importer.c:411
+#: ../calendar/importers/icalendar-importer.c:821
+#: ../plugins/itip-formatter/itip-formatter.c:2094
 msgid "Opening calendar"
 msgstr "éåèäæ"
 
-#: ../calendar/importers/icalendar-importer.c:493
+#: ../calendar/importers/icalendar-importer.c:551
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ææ (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:552
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar èåå"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:640
 msgid "Reminder!"
 msgstr "æéï"
 
-#: ../calendar/importers/icalendar-importer.c:662
+#: ../calendar/importers/icalendar-importer.c:720
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar ææ (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:663
+#: ../calendar/importers/icalendar-importer.c:721
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar èåå"
 
-#: ../calendar/importers/icalendar-importer.c:823
+#: ../calendar/importers/icalendar-importer.c:970
 msgid "Calendar Events"
 msgstr "èäæää"
 
-#: ../calendar/importers/icalendar-importer.c:861
+#: ../calendar/importers/icalendar-importer.c:1008
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution èäæææèåå"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1073
+#: ../calendar/importers/icalendar-importer.c:1390
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "æè"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1073
+#: ../calendar/importers/icalendar-importer.c:1390
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "ää"
 
-#: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1076
+#: ../calendar/importers/icalendar-importer.c:1391
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "åä"
 
-#: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1079
+#: ../calendar/importers/icalendar-importer.c:1392
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "ååé"
 
-#: ../calendar/importers/icalendar-importer.c:941
+#: ../calendar/importers/icalendar-importer.c:1088
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "åæéææ"
 
-#: ../calendar/importers/icalendar-importer.c:946
+#: ../calendar/importers/icalendar-importer.c:1093
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "æäååé"
 
-#: ../calendar/importers/icalendar-importer.c:951
+#: ../calendar/importers/icalendar-importer.c:1098
 msgctxt "iCalImp"
 msgid "has alarms"
 msgstr "åæéé"
 
-#: ../calendar/importers/icalendar-importer.c:956
+#: ../calendar/importers/icalendar-importer.c:1103
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "åæéä"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:969
+#: ../calendar/importers/icalendar-importer.c:1116
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "åé"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:972
+#: ../calendar/importers/icalendar-importer.c:1119
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "çä"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:975
+#: ../calendar/importers/icalendar-importer.c:1122
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "æå"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:979
+#: ../calendar/importers/icalendar-importer.c:1126
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "æé"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:984
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1131
+#: ../calendar/importers/icalendar-importer.c:1431
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "æè"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:990
+#: ../calendar/importers/icalendar-importer.c:1137
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "äç"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:998
-#: ../calendar/importers/icalendar-importer.c:1280
+#: ../calendar/importers/icalendar-importer.c:1145
+#: ../calendar/importers/icalendar-importer.c:1427
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "éå"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1009
+#: ../calendar/importers/icalendar-importer.c:1156
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "åæ"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1021
+#: ../calendar/importers/icalendar-importer.c:1168
 msgctxt "iCalImp"
 msgid "End"
 msgstr "çæ"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1031
+#: ../calendar/importers/icalendar-importer.c:1178
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "åé"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../calendar/importers/icalendar-importer.c:1202
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ååæ"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1063
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1074
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1221
+#: ../calendar/importers/icalendar-importer.c:1224
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "æèåéä"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1097
-#: ../calendar/importers/icalendar-importer.c:1100
+#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1247
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "åæè"
 
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/importers/icalendar-importer.c:1261
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "æè"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1276
+#: ../calendar/importers/icalendar-importer.c:1423
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "éå"
@@ -6620,259 +6568,258 @@ msgstr "ååæ/çåæ"
 msgid "Pacific/Yap"
 msgstr "ååæ/éæå"
 
-#: ../composer/e-composer-actions.c:204
+#: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "ååææâ"
 
-#: ../composer/e-composer-actions.c:287
-#: ../widgets/misc/e-attachment-view.c:377
-msgid "Attach a file"
-msgstr "éåææ"
-
-#: ../composer/e-composer-actions.c:292
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "éé(_C)"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
 msgstr "ééçåçææ"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:303
 msgid "New _Message"
 msgstr "æåæéä(_M)"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:305
 msgid "Open New Message window"
 msgstr "éåæçéäèç"
 
-#: ../composer/e-composer-actions.c:308
-#: ../shell/e-shell-window-actions.c:1489
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1537
 msgid "Configure Evolution"
 msgstr "èå Evolution"
 
-#: ../composer/e-composer-actions.c:315
+#: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
 msgstr "ååçåçææ"
 
-#: ../composer/e-composer-actions.c:320
+#: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
 msgstr "ååææ(_A)â"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:326
 msgid "Save the current file with a different name"
 msgstr "äåäååçååçåçææ"
 
-#: ../composer/e-composer-actions.c:329
+#: ../composer/e-composer-actions.c:333
 msgid "Character _Encoding"
 msgstr "åççç(_E)"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:350
 msgid "_Print..."
 msgstr "æå(_P)â"
 
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:357
 msgid "Print Pre_view"
 msgstr "éèæå(_V)"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:364
 msgid "Save as _Draft"
 msgstr "ååçèç(_D)"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
 msgstr "ååçèç"
 
-#: ../composer/e-composer-actions.c:367
-#: ../composer/e-composer-private.c:347
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
 msgstr "åé(_E)"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:373
 msgid "Send this message"
 msgstr "åééåéä"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
 msgstr "PG_P åå"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
 msgstr "äç PGP åéåéäåå"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
 msgstr "P_GP åç"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
 msgstr "çäç PGP åçåçéäåäæççç"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:397
 msgid "_Picture Gallery"
 msgstr "åçé(_P)"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:399
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "çäåäææåéääçåçé"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
 msgstr "éäååæ(_P)"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:407
 msgid "Set the message priority to high"
 msgstr "åéäååæèçãéã"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:413
 msgid "Re_quest Read Receipt"
 msgstr "èæèäåæ(_Q)"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:415
 msgid "Get delivery notification when your message is read"
 msgstr "åäçéäèéèæååéäéç"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:421
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME åå"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:423
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "äçäç S/MIME ååèæåéåéäåå"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME åç"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "çäç S/MIME ççèæçéäåäæççç"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
 msgstr "åäåææä(_B)"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
 msgstr "åæåäåææäçéççæ"
 
-#: ../composer/e-composer-actions.c:441
+#: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
 msgstr "åææä(_C)"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:447
 msgid "Toggles whether the CC field is displayed"
 msgstr "åæåææäçéççæ"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
 msgstr "åèæä(_R)"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "åæåèæäçéççæ"
 
-#: ../composer/e-composer-actions.c:510
+#: ../composer/e-composer-actions.c:514
 msgid "Save Draft"
 msgstr "ååèç"
 
-#: ../composer/e-composer-header-table.c:36
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "èåéäçæäè"
 
-#: ../composer/e-composer-header-table.c:38
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "èåéäåæçæäè"
 
-#: ../composer/e-composer-header-table.c:41
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
+#: ../composer/e-composer-header-table.c:45
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
 msgstr "èåéäåäåæçæäèïäåææåéåéäääæåçåéäçæäèæå"
 
-#: ../composer/e-composer-header-table.c:1004
+#: ../composer/e-composer-header-table.c:1020
 msgid "Fr_om:"
 msgstr "åäè(_O):"
 
-#: ../composer/e-composer-header-table.c:1013
+#: ../composer/e-composer-header-table.c:1029
 msgid "_Reply-To:"
 msgstr "åè(_R):"
 
-#: ../composer/e-composer-header-table.c:1017
+#: ../composer/e-composer-header-table.c:1033
 msgid "_To:"
 msgstr "æäè(_T):"
 
-#: ../composer/e-composer-header-table.c:1022
+#: ../composer/e-composer-header-table.c:1038
 msgid "_Cc:"
 msgstr "åæ(_C):"
 
-#: ../composer/e-composer-header-table.c:1027
+#: ../composer/e-composer-header-table.c:1043
 msgid "_Bcc:"
 msgstr "åäåæ(_B):"
 
-#: ../composer/e-composer-header-table.c:1032
+#: ../composer/e-composer-header-table.c:1048
 msgid "_Post To:"
 msgstr "åèå(_P):"
 
-#: ../composer/e-composer-header-table.c:1036
+#: ../composer/e-composer-header-table.c:1052
 msgid "S_ubject:"
 msgstr "äæ(_U):"
 
-#: ../composer/e-composer-header-table.c:1045
+#: ../composer/e-composer-header-table.c:1061
 msgid "Si_gnature:"
 msgstr "çåæ(_G):"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "æéèæåçéæå"
 
-#: ../composer/e-composer-post-header.c:127
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "æääéèïéåèåèçèæå"
 
-#: ../composer/e-composer-private.c:245
+#: ../composer/e-composer-private.c:249
 msgid "Undo the last action"
 msgstr "ååääæçåä"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:253
 msgid "Redo the last undone action"
 msgstr "åæääæååçåä"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:257
 msgid "Search for text"
 msgstr "æåæå"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:261
 msgid "Search for and replace text"
 msgstr "æåååäæå"
 
-#: ../composer/e-composer-private.c:367
+#: ../composer/e-composer-private.c:372
 msgid "Save draft"
 msgstr "ååèç"
 
-#: ../composer/e-msg-composer.c:784
+#: ../composer/e-msg-composer.c:808
 #, c-format
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "çæççéåçéäïæåèææèåççèæ"
 
-#: ../composer/e-msg-composer.c:793
+#: ../composer/e-msg-composer.c:817
 #, c-format
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
 msgstr "çæååéåçéäïææèåååèæ(æåè)"
 
-#: ../composer/e-msg-composer.c:1675
-#: ../composer/e-msg-composer.c:2058
+#: ../composer/e-msg-composer.c:1691 ../composer/e-msg-composer.c:2075
 msgid "Compose Message"
 msgstr "çèéä"
 
-#: ../composer/e-msg-composer.c:4116
+#: ../composer/e-msg-composer.c:4155
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "éäçèåååäèçèçéæåçéäåæã"
 
-#: ../composer/e-msg-composer.c:4821
+#: ../composer/e-msg-composer.c:4860
 msgid "Untitled Message"
 msgstr "æååçéä"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 msgstr "éèæääéäèäèãåéæéäåçæääååæääçéä"
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -6892,7 +6839,9 @@ msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "ååäæççéèãäèåäççï"
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr "çåèæææåæåïæéç â{0}â çéäï"
 
 #: ../composer/mail-composer.error.xml.h:7
@@ -6904,11 +6853,17 @@ msgid "Because &quot;{1}&quot;."
 msgstr "åçã{1}ãã"
 
 #: ../composer/mail-composer.error.xml.h:9
-msgid "Because you are working offline, the message will be saved to your local Outbox folder. When you are back online you can send the message by clicking the Send/Receive button in Evolution's toolbar."
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
 msgstr "åçäåéçåäïéåéäæåååäæåççåäèæåèãçäååçäåäïäåäéé Evolution åååçåé/æææéäååéäã"
 
 #: ../composer/mail-composer.error.xml.h:10
-msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
 msgstr "ééäéæååéäèãèçãèæåïååééææåèçææäææéäãååèçåäèääååççæåéäã"
 
 #: ../composer/mail-composer.error.xml.h:11
@@ -6940,7 +6895,9 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "ååèèåååæççéèïåçã{1}ãã"
 
 #: ../composer/mail-composer.error.xml.h:18
-msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr "çäæåæéäæïEvolution æåçæãååéäåäèäååääæçåæççã"
 
 #: ../composer/mail-composer.error.xml.h:19
@@ -6951,13 +6908,14 @@ msgstr "ååéäååäåã"
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "ææã{0}ãäæäèææèäçæåéääåéã"
 
-#: ../composer/mail-composer.error.xml.h:21
-#: ../mail/mail.error.xml.h:117
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "ååçéèç &quot;{0}&quot;ã"
 
 #: ../composer/mail-composer.error.xml.h:22
-msgid "The reported error was &quot;{0}&quot;. The message has most likely not been saved."
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
 msgstr "ååçéèç &quot;{0}&quot;ãéäååèææååã"
 
 #: ../composer/mail-composer.error.xml.h:23
@@ -7001,27 +6959,15 @@ msgstr "ååååäå(_S)"
 msgid "_Try Again"
 msgstr "åèäæ(_T)"
 
-#: ../capplet/anjal-settings-main.c:216
-msgid "Run Anjal in a window"
-msgstr "äååèçåè Anjal"
-
-#: ../capplet/anjal-settings-main.c:217
-msgid "Make Anjal the default email client"
-msgstr "ä Anjal åçéèéäåæç"
-
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:153
 msgid "ID of the socket to embed in"
 msgstr "socket ç IDïååæ"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:154
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:238
-msgid "Anjal email client"
-msgstr "Anjal éåéäåæç"
-
 #: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "èèåäçååã"
@@ -7039,229 +6985,238 @@ msgid "Please enter your password."
 msgstr "èèåäçåçã"
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../modules/online-accounts/e-online-accounts-google.c:285
+#: ../modules/online-accounts/e-online-accounts-google.c:357
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:83
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:463
+#: ../capplet/settings/mail-account-view.c:483
 msgid "Personal details:"
 msgstr "åäèçèæï"
 
-#: ../capplet/settings/mail-account-view.c:470
+#: ../capplet/settings/mail-account-view.c:490
 msgid "Name:"
 msgstr "ååçï"
 
-#: ../capplet/settings/mail-account-view.c:479
+#: ../capplet/settings/mail-account-view.c:499
 msgid "Email address:"
 msgstr "Email äåï"
 
-#: ../capplet/settings/mail-account-view.c:489
+#: ../capplet/settings/mail-account-view.c:509
 msgid "Details:"
 msgstr "èçèæï"
 
-#: ../capplet/settings/mail-account-view.c:497
+#: ../capplet/settings/mail-account-view.c:517
 msgid "Receiving"
 msgstr "ææä"
 
-#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:524
 msgid "Server type:"
 msgstr "äæåéåï"
 
-#: ../capplet/settings/mail-account-view.c:513
+#: ../capplet/settings/mail-account-view.c:533
 msgid "Server address:"
 msgstr "äæåäåï"
 
-#: ../capplet/settings/mail-account-view.c:522
+#: ../capplet/settings/mail-account-view.c:542
 msgid "Username:"
 msgstr "äçèåçï"
 
-#: ../capplet/settings/mail-account-view.c:531
+#: ../capplet/settings/mail-account-view.c:551
 msgid "Use encryption:"
 msgstr "äçååï"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
+#: ../capplet/settings/mail-account-view.c:556
+#: ../capplet/settings/mail-account-view.c:591
 msgid "never"
 msgstr "æä"
 
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:568
 msgid "Sending"
 msgstr "åéä"
 
-#: ../capplet/settings/mail-account-view.c:590
-msgid "To use the email application you'll need to setup an account. Put your email address and password in below and we'll try and work out all the settings. If we can't do it automatically you'll need your server details as well."
+#: ../capplet/settings/mail-account-view.c:610
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
 msgstr "èäçéåéåéäçåäéèåèåäååèãèåäéæääçéåéääåååçïæåæåèäæåææçèååãåææåçæèååæéåæéïäåéèäçèååèçäæåèçèæã"
 
-#: ../capplet/settings/mail-account-view.c:592
-msgid "Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried to make a start with the details you just entered but you may need to change them."
+#: ../capplet/settings/mail-account-view.c:612
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
 msgstr "ææïæåçæèåæåäçéäèååãèåäéèåååãæåæääååèåçèçèæåèéåïäæääæåèéèæèååã"
 
-#: ../capplet/settings/mail-account-view.c:594
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify more options to configure the account."
 msgstr "äåäæåæåçäèåéååèçééã"
 
-#: ../capplet/settings/mail-account-view.c:596
-msgid "Now we need your settings for sending mail. We've tried to make some guesses but you should check them over to make sure."
+#: ../capplet/settings/mail-account-view.c:616
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
 msgstr "çåæåéèäçèååæèåééäãæååçåèçæéåèåïäæäæèææååäéèçèã"
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:617
 msgid "You can specify your default settings for your account."
 msgstr "äåäæåèååèçéèèååã"
 
-#: ../capplet/settings/mail-account-view.c:598
-msgid "Time to check things over before we try and connect to the server and fetch your mail."
+#: ../capplet/settings/mail-account-view.c:618
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
 msgstr "åæååèäéçåäæåååéäåææäéçæéã"
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2091
-#: ../mail/em-account-editor.c:2212
+#: ../capplet/settings/mail-account-view.c:633
+#: ../mail/em-account-editor.c:2182 ../mail/em-account-editor.c:2315
 msgid "Identity"
 msgstr "èå"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:633
 msgid "Next - Receiving mail"
 msgstr "ääæ - ææéä"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Receiving mail"
 msgstr "ææéä"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Sending mail"
 msgstr "ääæ - åééä"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Identity"
 msgstr "ääæ - èå"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Receiving options"
 msgstr "ääæ - ææéé"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Receiving options"
 msgstr "ææéé"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Receiving mail"
 msgstr "ääæ - ææéä"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Sending mail"
 msgstr "åééä"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:638
 msgid "Next - Review account"
 msgstr "ääæ - æéåè"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Next - Defaults"
 msgstr "ääæ - èçèæ"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Receiving options"
 msgstr "ääæ - ææéé"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3043
+#: ../capplet/settings/mail-account-view.c:638
+#: ../mail/em-account-editor.c:3202
 msgid "Defaults"
 msgstr "éèå"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:638
 msgid "Back - Sending mail"
 msgstr "ääæ - åééä"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Review account"
 msgstr "æéåè"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Finish"
 msgstr "åæ"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Back - Sending"
 msgstr "ääæ - åé"
 
-#: ../capplet/settings/mail-account-view.c:740
+#: ../capplet/settings/mail-account-view.c:760
 msgid "Setup Google contacts with Evolution"
 msgstr "å Google èçäåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:741
+#: ../capplet/settings/mail-account-view.c:761
 msgid "Setup Google calendar with Evolution"
 msgstr "å Google ææåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:746
+#: ../capplet/settings/mail-account-view.c:766
 msgid "You may need to enable IMAP access."
 msgstr "äåèéèåç IMAP ååã"
 
-#: ../capplet/settings/mail-account-view.c:754
+#: ../capplet/settings/mail-account-view.c:774
 msgid "Google account settings:"
 msgstr "Google åèèååï"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:800
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "å Yahoo èäæåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:784
-msgid "Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct."
+#: ../capplet/settings/mail-account-view.c:804
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
 msgstr "Yahoo èäææååç åå_åæãæåååèçæéåèäæçåçãåæèçèåïåææéèèéæèåèäæçåçã"
 
-#: ../capplet/settings/mail-account-view.c:793
+#: ../capplet/settings/mail-account-view.c:813
 msgid "Yahoo account settings:"
 msgstr "Yahoo åèèååï"
 
-#: ../capplet/settings/mail-account-view.c:807
+#: ../capplet/settings/mail-account-view.c:827
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo èäæåçï"
 
-#: ../capplet/settings/mail-account-view.c:1079
+#: ../capplet/settings/mail-account-view.c:1099
 msgid "Password:"
 msgstr "åçï"
 
-#: ../capplet/settings/mail-account-view.c:1130
+#: ../capplet/settings/mail-account-view.c:1150
 #: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "ééåé"
 
-#: ../capplet/settings/mail-account-view.c:1140
+#: ../capplet/settings/mail-account-view.c:1160
 msgid "Account Wizard"
 msgstr "åèçé"
 
-#: ../capplet/settings/mail-capplet-shell.c:209
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "Evolution åèåç"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:353
-#: ../mail/e-mail-migrate.c:680
-#: ../mail/e-mail-store.c:229
-#: ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149
-#: ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163
-#: ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1721
-#: ../modules/addressbook/e-book-shell-backend.c:92
-#: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:103
-#: ../modules/calendar/e-cal-shell-migrate.c:150
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:117
+#: ../capplet/settings/mail-capplet-shell.c:368 ../mail/e-mail-migrate.c:744
+#: ../mail/e-mail-store.c:234 ../mail/em-folder-tree-model.c:146
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:235
+#: ../mail/message-list.c:1714
+#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "æçéè"
 
@@ -7290,10 +7245,9 @@ msgstr "èäæääéç"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution éééç"
 
-#: ../data/evolution.desktop.in.in.h:1
-#: ../mail/e-mail-browser.c:952
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:253
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:996
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7301,8 +7255,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution éäèèäæ"
 
-#: ../data/evolution.desktop.in.in.h:3
-#: ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:657
 msgid "Groupware Suite"
 msgstr "Groupware åèèä"
 
@@ -7319,36 +7272,36 @@ msgid "Email Settings"
 msgstr "éåéäèåå"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:223
+#: ../e-util/e-activity.c:227
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s ïååæï"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:226
+#: ../e-util/e-activity.c:230
 #, c-format
 msgid "%s (completed)"
 msgstr "%s ïååæï "
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:229
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (æåçå)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:237
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (æååæ)"
 
-#: ../e-util/e-activity.c:235
+#: ../e-util/e-activity.c:239
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:240
+#: ../e-util/e-activity.c:244
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% åæ)"
@@ -7410,16 +7363,12 @@ msgid "Western European, New"
 msgstr "èäèæèç"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85
-#: ../e-util/e-charset.c:87
-#: ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "çé"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:91
-#: ../e-util/e-charset.c:93
-#: ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
 #: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "çé"
@@ -7435,27 +7384,26 @@ msgid "Visual"
 msgstr "èè"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../e-util/e-datetime-format.c:199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1823
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:308
+#: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "äå"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:207
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æå"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:212
 msgid "Yesterday"
 msgstr "æå"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:217
+#: ../e-util/e-datetime-format.c:220
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "äéä"
@@ -7463,7 +7411,7 @@ msgstr "äéä"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:223
+#: ../e-util/e-datetime-format.c:226
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "äéä"
@@ -7471,7 +7419,7 @@ msgstr "äéä"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:229
+#: ../e-util/e-datetime-format.c:232
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "äéä"
@@ -7479,7 +7427,7 @@ msgstr "äéä"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:235
+#: ../e-util/e-datetime-format.c:238
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "äéå"
@@ -7487,7 +7435,7 @@ msgstr "äéå"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:241
+#: ../e-util/e-datetime-format.c:244
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "äéä"
@@ -7495,7 +7443,7 @@ msgstr "äéä"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:247
+#: ../e-util/e-datetime-format.c:250
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "äéå"
@@ -7503,55 +7451,54 @@ msgstr "äéå"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:253
+#: ../e-util/e-datetime-format.c:256
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "äéæ"
 
-#: ../e-util/e-datetime-format.c:335
-#: ../e-util/e-datetime-format.c:345
-#: ../e-util/e-datetime-format.c:354
+#: ../e-util/e-datetime-format.c:338 ../e-util/e-datetime-format.c:348
+#: ../e-util/e-datetime-format.c:357
 msgid "Use locale default"
 msgstr "äçååèåéèå"
 
-#: ../e-util/e-datetime-format.c:551
+#: ../e-util/e-datetime-format.c:554
 msgid "Format:"
 msgstr "æåï"
 
-#: ../e-util/e-file-utils.c:152
+#: ../e-util/e-file-utils.c:151
 msgid "(Unknown Filename)"
 msgstr "ïäæçææåçï"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:156
+#: ../e-util/e-file-utils.c:155
 #, c-format
 msgid "Writing \"%s\""
 msgstr "æåååã%sã"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:161
+#: ../e-util/e-file-utils.c:160
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "æåååã%sãè %s"
 
-#: ../e-util/e-plugin-util.c:426
-#: ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:378
+#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:380
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "é"
 
-#: ../e-util/e-print.c:157
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "æåæççéè"
 
-#: ../e-util/e-print.c:164
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "æåççååäåéææéèçèçèèï"
 
-#: ../e-util/e-print.c:170
-msgid "The printing system did not report any additional details about the error."
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr "æåççææååääéææéèçéåèèã"
 
 #: ../e-util/e-signature.c:707
@@ -7578,264 +7525,215 @@ msgstr "èèåå?"
 msgid "File exists \"{0}\"."
 msgstr "ææåååã{0}ãã"
 
-#: ../e-util/e-system.error.xml.h:6
-#: ../mail/mail.error.xml.h:157
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
 msgid "_Overwrite"
 msgstr "èå(_O)"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:117
 msgid "Could not open the link."
 msgstr "çæéåèéçã"
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
 msgstr "çæéç Evolution çæåæäã"
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1318
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf éèï%s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1329
 msgid "All further errors shown only on terminal."
 msgstr "ææéäæçéèèæåæåççæäéçã"
 
-#: ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1050
-#: ../mail/e-mail-tag-editor.c:325
-#: ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1054
+#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "åäè"
 
-#: ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1051
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1055
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "åè"
 
-#: ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2397
-#: ../mail/em-format-html.c:2465
-#: ../mail/em-format-html.c:2488
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
+#: ../mail/em-format-html.c:2564 ../mail/em-format-html.c:2632
+#: ../mail/em-format-html.c:2655 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "åæ"
 
-#: ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2398
-#: ../mail/em-format-html.c:2469
-#: ../mail/em-format-html.c:2491
-#: ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
+#: ../mail/em-format-html.c:2565 ../mail/em-format-html.c:2636
+#: ../mail/em-format-html.c:2658 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "åäåæ"
 
-#: ../em-format/em-format-quote.c:427
-#: ../em-format/em-format.c:1055
-#: ../mail/e-mail-tag-editor.c:330
-#: ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18
-#: ../modules/mail/em-mailer-prefs.c:75
-#: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5
-#: ../smime/lib/e-cert.c:1140
+#: ../em-format/em-format-quote.c:463 ../em-format/em-format.c:1059
+#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../smime/lib/e-cert.c:1142
 msgid "Subject"
 msgstr "äæ"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438
-#: ../mail/em-format-html.c:2585
-#: ../modules/mail/em-mailer-prefs.c:1119
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2757
+#: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "åäè"
 
-#: ../em-format/em-format-quote.c:519
-#: ../mail/em-composer-utils.c:1179
+#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1189
 msgid "-------- Forwarded Message --------"
 msgstr "-------- èéçéä --------"
 
-#: ../em-format/em-format.c:1056
-#: ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76
-#: ../widgets/misc/e-dateedit.c:523
+#: ../em-format/em-format.c:1060 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "ææ"
 
-#: ../em-format/em-format.c:1057
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "æèçç"
 
-#: ../em-format/em-format.c:1058
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "éè"
 
-#: ../em-format/em-format.c:1455
+#: ../em-format/em-format.c:1466
 #, c-format
 msgid "%s attachment"
 msgstr "%s éä"
 
-#: ../em-format/em-format.c:1566
+#: ../em-format/em-format.c:1577
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "çæåæ S/MIME éä:æççéè"
 
-#: ../em-format/em-format.c:1748
-#: ../em-format/em-format.c:1942
+#: ../em-format/em-format.c:1769 ../em-format/em-format.c:1995
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "çæèæ MIME æåçéäãååéçååæã"
 
-#: ../em-format/em-format.c:1758
+#: ../em-format/em-format.c:1780
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "åéä/åååäææçååéå"
 
-#: ../em-format/em-format.c:1778
+#: ../em-format/em-format.c:1800
 msgid "Could not parse PGP/MIME message"
 msgstr "çæåæ PGP/MIME éä"
 
-#: ../em-format/em-format.c:1779
+#: ../em-format/em-format.c:1801
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "çæåæ PGP/MIME éäïæççéè"
 
-#: ../em-format/em-format.c:1967
+#: ../em-format/em-format.c:2020
 msgid "Unsupported signature format"
 msgstr "äææçççæå"
 
-#: ../em-format/em-format.c:1980
-#: ../em-format/em-format.c:2159
+#: ../em-format/em-format.c:2033 ../em-format/em-format.c:2215
 msgid "Error verifying signature"
 msgstr "æéççççéè"
 
-#: ../em-format/em-format.c:1981
-#: ../em-format/em-format.c:2146
-#: ../em-format/em-format.c:2160
+#: ../em-format/em-format.c:2034 ../em-format/em-format.c:2200
+#: ../em-format/em-format.c:2216
 msgid "Unknown error verifying signature"
 msgstr "æéççççäæéè"
 
-#: ../em-format/em-format.c:2251
+#: ../em-format/em-format.c:2308
 msgid "Could not parse PGP message: "
 msgstr "çæèæ PGP éäï"
 
-#: ../em-format/em-format.c:2257
-#: ../mail/em-folder-tree.c:656
-#: ../mail/mail-ops.c:624
-#: ../plugins/caldav/caldav-browse-server.c:210
-#: ../plugins/caldav/caldav-browse-server.c:1407
-#: ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:100
-msgid "Unknown error"
-msgstr "äæçéè"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
 #: ../filter/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "1 çå"
-msgstr[1] "%d çå"
+msgstr[0] "%d çå"
 
 #: ../filter/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
-msgstr[0] "1 çå"
-msgstr[1] "%d çå"
+msgstr[0] "%d çå"
 
 #: ../filter/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "1 åéå"
-msgstr[1] "%d åéå"
+msgstr[0] "%d åéå"
 
 #: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] "1 åéå"
-msgstr[1] "%d åéå"
+msgstr[0] "%d åéå"
 
 #: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
-msgstr[0] "1 åæå"
-msgstr[1] "%d åæå"
+msgstr[0] "%d åæå"
 
 #: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
-msgstr[0] "1 åæå"
-msgstr[1] "%d åæå"
+msgstr[0] "%d åæå"
 
 #: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
-msgstr[0] "1 æå"
-msgstr[1] "%d æå"
+msgstr[0] "%d æå"
 
 #: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
-msgstr[0] "1 åå"
-msgstr[1] "%d åå"
+msgstr[0] "%d åå"
 
 #: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] "1 éå"
-msgstr[1] "%d éå"
+msgstr[0] "%d éå"
 
 #: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] "1 éå"
-msgstr[1] "%d éå"
+msgstr[0] "%d éå"
 
 #: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
-msgstr[0] "1 æå"
-msgstr[1] "%d æå"
+msgstr[0] "%d æå"
 
 #: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
-msgstr[0] "1 åæå"
-msgstr[1] "%d åæå"
+msgstr[0] "%d åæå"
 
 #: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
-msgstr[0] "1 åå"
-msgstr[1] "%d åå"
+msgstr[0] "%d åå"
 
 #: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
-msgstr[0] "1 åå"
-msgstr[1] "%d åå"
+msgstr[0] "%d åå"
 
 #: ../filter/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<æéèéæææ>"
 
-#: ../filter/e-filter-datespec.c:132
-#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
 #: ../filter/e-filter-datespec.c:154
 msgid "now"
 msgstr "çå"
@@ -7849,69 +7747,66 @@ msgstr "%Y-%b-%d"
 msgid "Select a time to compare against"
 msgstr "éæèæåçæé"
 
-#: ../filter/e-filter-file.c:188
+#: ../filter/e-filter-file.c:190
 msgid "Choose a File"
 msgstr "éæææ"
 
-#: ../filter/e-filter-rule.c:662
+#: ../filter/e-filter-rule.c:664
 msgid "R_ule name:"
 msgstr "èååç(_U):"
 
-#: ../filter/e-filter-rule.c:692
+#: ../filter/e-filter-rule.c:694
 msgid "Find items that meet the following conditions"
 msgstr "åæçåäåæäçéç"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:719
 msgid "If all conditions are met"
 msgstr "åæåéæäçå"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:720
 msgid "If any conditions are met"
 msgstr "åæääæäçå"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:723
 msgid "_Find items:"
 msgstr "åæéç(_F):"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:750
+#: ../filter/e-filter-rule.c:752
 msgid "None"
 msgstr "ææ"
 
-#: ../filter/e-filter-rule.c:751
+#: ../filter/e-filter-rule.c:753
 msgid "All related"
 msgstr "ææçéç"
 
-#: ../filter/e-filter-rule.c:752
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:754 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "åè"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:755
 msgid "Replies and parents"
 msgstr "åèåçä"
 
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:756
 msgid "No reply or parent"
 msgstr "ææååæååéä"
 
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:759
 msgid "I_nclude threads"
 msgstr "åæéäçç(_N)"
 
-#: ../filter/e-filter-rule.c:782
+#: ../filter/e-filter-rule.c:784
 msgid "A_dd Condition"
 msgstr "ååæä(_D)"
 
-#: ../filter/e-filter-rule.c:1130
-#: ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:316
+#: ../filter/e-filter-rule.c:1133 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:319
 msgid "Incoming"
 msgstr "åé"
 
-#: ../filter/e-filter-rule.c:1130
-#: ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1133 ../mail/em-utils.c:320
 msgid "Outgoing"
 msgstr "åå"
 
@@ -7943,8 +7838,7 @@ msgstr "çåææã"
 msgid "Missing file name."
 msgstr "çåææåçã"
 
-#: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
 msgid "Missing name."
 msgstr "çååçã"
 
@@ -8000,8 +7894,7 @@ msgstr ""
 "éäææåæèéæååèæç\n"
 "æéäæèã"
 
-#: ../filter/filter.ui.h:11
-#: ../mail/em-filter-editor.c:193
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
 msgid "_Filter Rules"
 msgstr "éæåèå(_F)"
 
@@ -8038,98 +7931,292 @@ msgstr "äæåçæå"
 msgid "years"
 msgstr "å"
 
-#: ../mail/e-mail-attachment-bar.c:86
-#: ../mail/e-mail-attachment-bar.c:91
-#: ../mail/em-format-html-display.c:1122
-#: ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:124
-#: ../widgets/misc/e-attachment-paned.c:129
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:569 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "ææåå"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:573 ../mail/mail-config.ui.h:130
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "TLS åå"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:577 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "SSL åå"
+
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:840 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "ææ"
+
+#: ../mail/em-account-editor.c:921
+msgid "Never"
+msgstr "æä"
+
+#: ../mail/em-account-editor.c:922
+msgid "Always"
+msgstr "æé"
+
+#: ../mail/em-account-editor.c:923
+msgid "Ask for each message"
+msgstr "æåéäçèå"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1743 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "ææ"
+
+#: ../mail/em-account-editor.c:2179
+msgid "Mail Configuration"
+msgstr "éäçæ"
+
+#: ../mail/em-account-editor.c:2180
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"æèäç Evolution éäçæåçã\n"
+"\n"
+"æääãççãéåã "
+
+#: ../mail/em-account-editor.c:2183
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr "èåäéèåäçåçåééååããéææãçæäääåèåïééäåæåéåçéäåååéäèèã"
+
+#: ../mail/em-account-editor.c:2185 ../mail/em-account-editor.c:2374
+msgid "Receiving Email"
+msgstr "ææéåéä"
+
+#: ../mail/em-account-editor.c:2186
+msgid "Please configure the following account settings."
+msgstr "èåèåäååèçèååã"
+
+#: ../mail/em-account-editor.c:2188 ../mail/em-account-editor.c:2898
+msgid "Sending Email"
+msgstr "åééåéä"
+
+#: ../mail/em-account-editor.c:2189
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr "èèåääéæåééäæåçèèãåæääææïèèçççççåæççæåäæåã"
+
+#: ../mail/em-account-editor.c:2191 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "åèèè"
+
+#: ../mail/em-account-editor.c:2192
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"èåäéççéèåæèéååèçåçã\n"
+"éååçåååçéçäçã"
+
+#: ../mail/em-account-editor.c:2196
+msgid "Done"
+msgstr "åæ"
+
+#: ../mail/em-account-editor.c:2197
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"æåäïéäèååçåæã\n"
+"\n"
+"äçååäéåäç Evolution æçéåéäã\n"
+"\n"
+"èæääãåçãååèåã"
+
+#: ../mail/em-account-editor.c:2696
+msgid "Check for _new messages every"
+msgstr "èåæææéäæ(_N)"
+
+#: ../mail/em-account-editor.c:2704
+msgid "minu_tes"
+msgstr "åé(_T)"
+
+#: ../mail/em-account-editor.c:3015
+msgid "Please select a folder from the current account."
+msgstr "èéæçååèçèæåã"
+
+#: ../mail/em-account-editor.c:3341 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "ååæ"
+
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:3395 ../mail/em-account-editor.c:3478
+msgid "Receiving Options"
+msgstr "ææéé"
+
+#: ../mail/em-account-editor.c:3396 ../mail/em-account-editor.c:3479
+msgid "Checking for New Messages"
+msgstr "æææéä"
+
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1217 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "éä"
-msgstr[1] "éä"
 
-#: ../mail/e-mail-attachment-bar.c:604
-#: ../widgets/misc/e-attachment-paned.c:619
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
 msgid "Icon View"
 msgstr "åçæè"
 
-#: ../mail/e-mail-attachment-bar.c:606
-#: ../widgets/misc/e-attachment-paned.c:621
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
 msgstr "æåæè"
 
-#: ../mail/e-mail-browser.c:125
-#: ../shell/e-shell-window-actions.c:1405
-#: ../shell/e-shell-window-actions.c:1412
-#: ../shell/e-shell-window-actions.c:1419
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1460
 msgid "Close this window"
 msgstr "ééæèç"
 
-#: ../mail/e-mail-browser.c:282
+#: ../mail/e-mail-browser.c:291
 msgid "(No Subject)"
 msgstr "(ææäæ)"
 
-#: ../mail/e-mail-display.c:62
+#: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
 msgstr "åååéèé(_A)â"
 
-#: ../mail/e-mail-display.c:69
+#: ../mail/e-mail-display.c:73
 msgid "_To This Address"
 msgstr "åéåäå(_T)"
 
-#: ../mail/e-mail-display.c:76
+#: ../mail/e-mail-display.c:80
 msgid "_From This Address"
 msgstr "åéåäå(_F)"
 
-#: ../mail/e-mail-display.c:85
+#: ../mail/e-mail-display.c:87
+msgid "Send _Reply To..."
+msgstr "åéåèå(_R)â"
+
+#: ../mail/e-mail-display.c:89
+msgid "Send a reply message to this address"
+msgstr "åéåèéäåéåäå"
+
+#: ../mail/e-mail-display.c:96
 msgid "Create Search _Folder"
 msgstr "åçæåèæå(_F)"
 
-#: ../mail/e-mail-folder-utils.c:88
+#: ../mail/e-mail-folder-utils.c:111
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "ååéäåèæåã%sã"
 
-#: ../mail/e-mail-label-dialog.c:219
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "åèåçéä"
+
+#: ../mail/e-mail-folder-utils.c:391
+msgid "Scanning messages for duplicates"
+msgstr "ææéäæåæéè"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "åå %d åéä"
+
+#: ../mail/e-mail-folder-utils.c:824
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "çéèæåã%sã"
+
+#: ../mail/e-mail-folder-utils.c:948
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "ææã%sãåçèçéã"
+
+#: ../mail/e-mail-folder-utils.c:952
+msgid "File has been removed."
+msgstr "ææåçèçéã"
+
+#: ../mail/e-mail-folder-utils.c:1011
+msgid "Removing attachments"
+msgstr "æåçééä"
+
+#: ../mail/e-mail-folder-utils.c:1175
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "åå %d åéä"
+
+#: ../mail/e-mail-folder-utils.c:1519 ../mail/em-folder-utils.c:577
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "çæçèæå URIã%sã"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "ååéäéæèäï"
+
+#: ../mail/e-mail-label-dialog.c:223
 msgid "_Label name:"
 msgstr "æçåç(_L):"
 
-#: ../mail/e-mail-label-list-store.c:37
+#: ../mail/e-mail-label-list-store.c:41
 msgid "I_mportant"
 msgstr "éè(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:38
+#: ../mail/e-mail-label-list-store.c:42
 msgid "_Work"
 msgstr "åä(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:39
+#: ../mail/e-mail-label-list-store.c:43
 msgid "_Personal"
 msgstr "åä(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:40
+#: ../mail/e-mail-label-list-store.c:44
 msgid "_To Do"
 msgstr "åèäé(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:45
 msgid "_Later"
 msgstr "çå(_L)"
 
-#: ../mail/e-mail-label-manager.c:161
-#: ../modules/mail/e-mail-shell-view-actions.c:627
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:676
 msgid "Add Label"
 msgstr "ååæç"
 
-#: ../mail/e-mail-label-manager.c:212
+#: ../mail/e-mail-label-manager.c:216
 msgid "Edit Label"
 msgstr "çèæç"
 
-#: ../mail/e-mail-label-manager.c:346
+#: ../mail/e-mail-label-manager.c:350
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -8137,74 +8224,69 @@ msgstr ""
 "ææïåæçåçäçåçæçä\n"
 "æèéåäçæåéã"
 
-#: ../mail/e-mail-label-tree-view.c:84
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "éè"
 
-#: ../mail/e-mail-label-tree-view.c:94
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1296
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../widgets/menus/gal-define-views-dialog.c:334
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../plugins/caldav/caldav-browse-server.c:1295
+#: ../widgets/menus/gal-define-views-dialog.c:336
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "åç"
 
-#: ../mail/e-mail-local.c:35
-#: ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:738
-#: ../mail/em-folder-tree.c:3138
-#: ../modules/mail/e-mail-shell-view-private.c:1118
-#: ../modules/mail/e-mail-shell-view-private.c:1129
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
+#: ../mail/em-folder-tree-model.c:722
+#: ../modules/mail/e-mail-shell-view-private.c:1065
+#: ../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Inbox"
 msgstr "æäå"
 
-#: ../mail/e-mail-local.c:36
-#: ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1116
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
+#: ../modules/mail/e-mail-shell-view-private.c:1063
 msgid "Drafts"
 msgstr "èç"
 
-#: ../mail/e-mail-local.c:37
-#: ../mail/em-folder-tree-model.c:742
-#: ../modules/mail/e-mail-shell-view-private.c:1120
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
+#: ../modules/mail/e-mail-shell-view-private.c:1067
 msgid "Outbox"
 msgstr "åäå"
 
-#: ../mail/e-mail-local.c:38
-#: ../mail/em-folder-tree-model.c:744
-#: ../modules/mail/e-mail-shell-view-private.c:1122
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
+#: ../modules/mail/e-mail-shell-view-private.c:1069
 msgid "Sent"
 msgstr "ååé"
 
-#: ../mail/e-mail-local.c:39
-#: ../mail/em-folder-tree-model.c:733
-#: ../modules/mail/e-mail-shell-view-private.c:1124
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
+#: ../modules/mail/e-mail-shell-view-private.c:1071
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:581
+#: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
+#: ../plugins/templates/templates.c:1293
 msgid "Templates"
 msgstr "çæ"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:133
 msgid "Migrating..."
 msgstr "æåçèâ"
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:168
 msgid "Migration"
 msgstr "çè"
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:209
 #, c-format
 msgid "Migrating '%s':"
 msgstr "æåçèã%sãï"
 
-#: ../mail/e-mail-migrate.c:660
+#: ../mail/e-mail-migrate.c:722
 msgid "Migrating Folders"
 msgstr "æåèçèæå"
 
-#: ../mail/e-mail-migrate.c:661
+#: ../mail/e-mail-migrate.c:723
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -8212,749 +8294,713 @@ msgstr ""
 "\n"
 "ç Evolution çèäçèæåæïèèåçå..."
 
-#: ../mail/e-mail-migrate.c:1126
+#: ../mail/e-mail-migrate.c:1279
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "çæåã%sãåçæåéäèæåï%s"
 
-#: ../mail/e-mail-notebook-view.c:562
+#: ../mail/e-mail-notebook-view.c:619
 msgid "Please select a folder"
 msgstr "èéæèæå"
 
-#. XXX e-error should provide a widget layout and API suitable
-#. *     for packing additional widgets to the right of the alert
-#. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:111
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-msgid "Do not ask me again"
-msgstr "äèåèåæ"
-
-#: ../mail/e-mail-reader.c:306
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:304 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "èèèèæå"
 
-#: ../mail/e-mail-reader.c:306
-#: ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:480
 msgid "C_opy"
 msgstr "èè(_O)"
 
-#. Translators: %s is replaced with a folder name
-#. %d with count of duplicate messages.
-#: ../mail/e-mail-reader.c:523
-#, c-format
-msgid "Folder '%s' contains %d duplicate message. Are you sure you want to delete it?"
-msgid_plural "Folder '%s' contains %d duplicate messages. Are you sure you want to delete them?"
-msgstr[0] "èæåã%sãåå %d åéèçéäãäçåèåéåï"
-msgstr[1] "èæåã%sãåå %d åéèçéäãäçåèåéååï"
-
-#: ../mail/e-mail-reader.c:986
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:806 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "çèèæå"
 
-#: ../mail/e-mail-reader.c:986
-#: ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:480
 msgid "_Move"
 msgstr "çå(_M)"
 
-#. Check buttons
-#: ../mail/e-mail-reader.c:1265
-#: ../mail/e-mail-reader.c:1423
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1167 ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1395
 msgid "_Do not ask me again."
 msgstr "äèåèåæ(_D)ã"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1401
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æéåçéäèåçåèæä(_A)"
 
-#: ../mail/e-mail-reader.c:1581
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "ååéä"
-msgstr[1] "ååéä"
-
-#. Translators: This is a part of a suggested file name
-#. * used when saving a message or multiple messages to an
-#. * mbox format, when the first message doesn't have a
-#. * Subject. The extension ".mbox" is appended to this
-#. * string, thus it will be something like "Message.mbox"
-#. * at the end.
-#: ../mail/e-mail-reader.c:1602
-#: ../plugins/groupwise-features/notification.ui.h:1
-#: ../plugins/groupwise-features/properties.ui.h:3
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "éä"
-msgstr[1] "éä"
-
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1767
 msgid "A_dd Sender to Address Book"
 msgstr "åååäèåçéæå(_D)"
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1769
 msgid "Add sender to address book"
 msgstr "æååäèèéèé"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1774
 msgid "Check for _Junk"
 msgstr "ææååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1776
 msgid "Filter the selected messages for junk status"
 msgstr "çéæéääçååéäçæ"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1781
 msgid "_Copy to Folder..."
 msgstr "èèèèæå(_C)â"
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1783
 msgid "Copy selected messages to another folder"
 msgstr "èèåéåçéäååäåèæå"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1788
 msgid "_Delete Message"
 msgstr "åééä(_D)"
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1790
 msgid "Mark the selected messages for deletion"
 msgstr "åéåçéäæçæèåé"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1795
 msgid "Filter on Mailing _List..."
 msgstr "éäèåéæå(_L)â"
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1797
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "çéåéäèååçéæåèå"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1802
 msgid "Filter on _Recipients..."
 msgstr "æäèéæå(_R)â"
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1804
 msgid "Create a rule to filter messages to these recipients"
 msgstr "çéäæäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1809
 msgid "Filter on Se_nder..."
 msgstr "åäèéæå(_N)â"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1811
 msgid "Create a rule to filter messages from this sender"
 msgstr "çéååäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1816
 msgid "Filter on _Subject..."
 msgstr "äæéæå(_S)â"
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1818
 msgid "Create a rule to filter messages with this subject"
 msgstr "çéåäæåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1823
 msgid "A_pply Filters"
 msgstr "åçéæå(_P)"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1825
 msgid "Apply filter rules to the selected messages"
 msgstr "åçéæåèåææéåçéä"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1830
 msgid "_Find in Message..."
 msgstr "åéäååæ(_F)â"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1832
 msgid "Search for text in the body of the displayed message"
 msgstr "æåéççéäææäçæå"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1837
 msgid "_Clear Flag"
 msgstr "æéæå(_C)"
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1839
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "çééåéäçèéææ"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1844
 msgid "_Flag Completed"
 msgstr "æèçååæ(_F)"
 
-#: ../mail/e-mail-reader.c:1955
+#: ../mail/e-mail-reader.c:1846
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ååéåéäçèéææèçååæ"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1851
 msgid "Follow _Up..."
 msgstr "èé(_U)â"
 
-#: ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1853
 msgid "Flag the selected messages for follow-up"
 msgstr "åéåçéäåäèéææ"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1858
 msgid "_Attached"
 msgstr "éä(_A)"
 
-#: ../mail/e-mail-reader.c:1969
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1860 ../mail/e-mail-reader.c:1867
 msgid "Forward the selected message to someone as an attachment"
 msgstr "åéåçéääéäååèåçæä"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1865
 msgid "Forward As _Attached"
 msgstr "äéäèå(_A)"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1872
 msgid "_Inline"
 msgstr "èå(_I)"
 
-#: ../mail/e-mail-reader.c:1983
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1874 ../mail/e-mail-reader.c:1881
 msgid "Forward the selected message in the body of a new message"
 msgstr "åéèèåçéäåéææéäçåæä"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1879
 msgid "Forward As _Inline"
 msgstr "äèåèå(_I)"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1886
 msgid "_Quoted"
 msgstr "åæ(_Q)"
 
-#: ../mail/e-mail-reader.c:1997
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
 msgid "Forward the selected message quoted like a reply"
 msgstr "åéèèåçéääåèéäæååå"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:1893
 msgid "Forward As _Quoted"
 msgstr "äåæèå(_Q)"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:1900
 msgid "_Load Images"
 msgstr "èååç(_L)"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:1902
 msgid "Force images in HTML mail to be loaded"
 msgstr "éè HTML æåçéäæåèèååç"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:1907
 msgid "_Important"
 msgstr "éè(_I)"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:1909
 msgid "Mark the selected messages as important"
 msgstr "åéåçéäæçæéè"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:1914
 msgid "_Junk"
 msgstr "ååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:1916
 msgid "Mark the selected messages as junk"
 msgstr "åéåçéäæçæååéä"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:1921
 msgid "_Not Junk"
 msgstr "äæååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:1923
 msgid "Mark the selected messages as not being junk"
 msgstr "åéåçéäæçæäæååéä"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:1928
 msgid "_Read"
 msgstr "åéè(_R)"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:1930
 msgid "Mark the selected messages as having been read"
 msgstr "åéåçéäæçæåçéè"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:1935
 msgid "Uni_mportant"
 msgstr "äéè(_M)"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:1937
 msgid "Mark the selected messages as unimportant"
 msgstr "åéåçéäæçæäéè"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:1942
 msgid "_Unread"
 msgstr "æéè(_U)"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:1944
 msgid "Mark the selected messages as not having been read"
 msgstr "åéåçéäæçææéè"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:1949
 msgid "_Edit as New Message..."
 msgstr "çèçæéä(_E)â"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:1951
 msgid "Open the selected messages in the composer for editing"
 msgstr "åæåèçéåéåçéäääçè"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:1956
 msgid "Compose _New Message"
 msgstr "æåæéä(_N)"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:1958
 msgid "Open a window for composing a mail message"
 msgstr "éåèçääæåéä"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:1963
 msgid "_Open in New Window"
 msgstr "åæèçéå(_O)"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:1965
 msgid "Open the selected messages in a new window"
 msgstr "äçæèçéåéåçéä"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:1970
 msgid "_Move to Folder..."
 msgstr "çèèæå(_M)â"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:1972
 msgid "Move selected messages to another folder"
 msgstr "åéåçéäçèåäåèæå"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:1977
 msgid "_Switch to Folder"
 msgstr "åæèèæå(_S)"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:1979
 msgid "Display the parent folder"
 msgstr "éçäåèæå"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:1984
 msgid "Switch to _next tab"
 msgstr "åæèääååé(_N)"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:1986
 msgid "Switch to the next tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:1991
 msgid "Switch to _previous tab"
 msgstr "åæèääååé(_P)"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:1993
 msgid "Switch to the previous tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:1998
 msgid "Cl_ose current tab"
 msgstr "ééçåçåé(_O)"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2000
 msgid "Close current tab"
 msgstr "ééçåçåé"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2005
 msgid "_Next Message"
 msgstr "ääåéä(_N)"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2007
 msgid "Display the next message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2012
 msgid "Next _Important Message"
 msgstr "ääåéèéä(_I)"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2014
 msgid "Display the next important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2019
 msgid "Next _Thread"
 msgstr "ääåçééä(_T)"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2021
 msgid "Display the next thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2026
 msgid "Next _Unread Message"
 msgstr "ääåæéèçéä(_U)"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2028
 msgid "Display the next unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2033
 msgid "_Previous Message"
 msgstr "ääåéä(_P)"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2035
 msgid "Display the previous message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2040
 msgid "Pr_evious Important Message"
 msgstr "ääåéèéä(_E)"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2042
 msgid "Display the previous important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2047
 msgid "Previous T_hread"
 msgstr "ääåçééä(_H)"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2049
 msgid "Display the previous thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2054
 msgid "P_revious Unread Message"
 msgstr "ääåæéèçéä(_R)"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2056
 msgid "Display the previous unread message"
 msgstr "éçääåæéèçéä"
 
-# zh_HK: msgstr "ååéä"
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2063
 msgid "Print this message"
-msgstr "ååéä"
+msgstr "æåéä"
 
-# zh_HK: msgstr "éèéèååçéä"
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2070
 msgid "Preview the message to be printed"
-msgstr "éèéèååçéä"
+msgstr "éèéèæåçéä"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2075
 msgid "Re_direct"
 msgstr "éæåå(_D)"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2077
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "åéåçéäéæååçæä"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2082
 msgid "Remo_ve Attachments"
 msgstr "çééä(_V)"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2084
 msgid "Remove attachments"
 msgstr "çééä"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2089
 msgid "Remove Du_plicate Messages"
 msgstr "çééèçéä(_P)"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2091
 msgid "Checks selected messages for duplicates"
 msgstr "ææéåçéäæåæéè"
 
-#: ../mail/e-mail-reader.c:2205
-#: ../mail/mail.error.xml.h:102
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
-#: ../modules/mail/e-mail-attachment-handler.c:179
+#: ../mail/e-mail-reader.c:2096 ../mail/mail.error.xml.h:108
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "åèææä(_A)"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2098
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æååéçåéåéäçåéæäè"
 
-#: ../mail/e-mail-reader.c:2212
-#: ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2103 ../mail/mail.error.xml.h:109
 msgid "Reply to _List"
 msgstr "åèèæå(_L)"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2105
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æååéçæéåéäçéäèå"
 
-#: ../mail/e-mail-reader.c:2219
-#: ../modules/mail/e-mail-attachment-handler.c:186
+#: ../mail/e-mail-reader.c:2110
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "åèåäè(_R)"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2112
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æååéçæéåçéäçåäè"
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2117
 msgid "_Save as mbox..."
 msgstr "ååæ mbox(_S)â"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2119
 msgid "Save selected messages as an mbox file"
 msgstr "åéåçéäååæ mbox ææ"
 
-#: ../mail/e-mail-reader.c:2233
-msgid "Search Folder from Mailing _List..."
-msgstr "éäèåæåèæå(_L)â"
-
-#: ../mail/e-mail-reader.c:2235
-msgid "Create a search folder for this mailing list"
-msgstr "çéåéäèååçäåæåèæå"
-
-#: ../mail/e-mail-reader.c:2240
-msgid "Search Folder from Recipien_ts..."
-msgstr "åæäèæåèæå(_T)â"
-
-#: ../mail/e-mail-reader.c:2242
-msgid "Create a search folder for these recipients"
-msgstr "çéäæäèåçäåæåèæå"
-
-#: ../mail/e-mail-reader.c:2247
-msgid "Search Folder from Sen_der..."
-msgstr "åäèæåèæå(_D)â"
-
-#: ../mail/e-mail-reader.c:2249
-msgid "Create a search folder for this sender"
-msgstr "çéååäèåçäåæåèæå"
-
-#: ../mail/e-mail-reader.c:2254
-msgid "Search Folder from S_ubject..."
-msgstr "äææåèæå(_U)â"
-
-#: ../mail/e-mail-reader.c:2256
-msgid "Create a search folder for this subject"
-msgstr "çéåäæåçäåæåèæå"
-
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2124
 msgid "_Message Source"
 msgstr "éääæ(_M)"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2126
 msgid "Show the raw email source of the message"
 msgstr "éçéäååæ"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2138
 msgid "_Undelete Message"
 msgstr "åååééä(_U)"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2140
 msgid "Undelete the selected messages"
 msgstr "åæåééåçéä"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2145
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2147
 msgid "Reset the text to its original size"
 msgstr "éèæåçåååå"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2152
 msgid "_Zoom In"
 msgstr "æè(_Z)"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2154
 msgid "Increase the text size"
 msgstr "åæåæå"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2159
 msgid "Zoom _Out"
 msgstr "æé(_O)"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2161
 msgid "Decrease the text size"
 msgstr "åæåçå"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2168
 msgid "Create R_ule"
 msgstr "åçèå(_U)"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2175
 msgid "Ch_aracter Encoding"
 msgstr "åççç(_A)"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2182
 msgid "F_orward As"
 msgstr "èåç(_O)"
 
-#: ../mail/e-mail-reader.c:2326
+#: ../mail/e-mail-reader.c:2189
 msgid "_Group Reply"
 msgstr "ççåè(_G)"
 
-#: ../mail/e-mail-reader.c:2333
+#: ../mail/e-mail-reader.c:2196
 msgid "_Go To"
 msgstr "çè(_G)"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2203
 msgid "Mar_k As"
 msgstr "æçæ(_K)"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2210
 msgid "_Message"
 msgstr "éä(_M)"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2217
 msgid "_Zoom"
 msgstr "çæ(_Z)"
 
-#: ../mail/e-mail-reader.c:2379
+#: ../mail/e-mail-reader.c:2227
+msgid "Search Folder from Mailing _List..."
+msgstr "éäèåæåèæå(_L)â"
+
+#: ../mail/e-mail-reader.c:2229
+msgid "Create a search folder for this mailing list"
+msgstr "çéåéäèååçäåæåèæå"
+
+#: ../mail/e-mail-reader.c:2234
+msgid "Search Folder from Recipien_ts..."
+msgstr "åæäèæåèæå(_T)â"
+
+#: ../mail/e-mail-reader.c:2236
+msgid "Create a search folder for these recipients"
+msgstr "çéäæäèåçäåæåèæå"
+
+#: ../mail/e-mail-reader.c:2241
+msgid "Search Folder from Sen_der..."
+msgstr "åäèæåèæå(_D)â"
+
+#: ../mail/e-mail-reader.c:2243
+msgid "Create a search folder for this sender"
+msgstr "çéååäèåçäåæåèæå"
+
+#: ../mail/e-mail-reader.c:2248
+msgid "Search Folder from S_ubject..."
+msgstr "äææåèæå(_U)â"
+
+#: ../mail/e-mail-reader.c:2250
+msgid "Create a search folder for this subject"
+msgstr "çéåäæåçäåæåèæå"
+
+#: ../mail/e-mail-reader.c:2273
 msgid "Mark for Follo_w Up..."
 msgstr "æççèé(_W)â"
 
-#: ../mail/e-mail-reader.c:2387
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark as _Important"
 msgstr "æçæéè(_I)"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2285
 msgid "Mark as _Junk"
 msgstr "æçæååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2395
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Not Junk"
 msgstr "æçæéååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2293
 msgid "Mar_k as Read"
 msgstr "æçæåéè(_K)"
 
-#: ../mail/e-mail-reader.c:2403
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as Uni_mportant"
 msgstr "æçæäéè(_M)"
 
-#: ../mail/e-mail-reader.c:2407
+#: ../mail/e-mail-reader.c:2301
 msgid "Mark as _Unread"
 msgstr "æçææéè(_U)"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2345
 msgid "_Caret Mode"
 msgstr "æåæå(_C)"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2347
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "åéççéäåæäéçéçææ"
 
-#: ../mail/e-mail-reader.c:2459
+#: ../mail/e-mail-reader.c:2353
 msgid "All Message _Headers"
 msgstr "ææéäæé(_H)"
 
-#: ../mail/e-mail-reader.c:2461
+#: ../mail/e-mail-reader.c:2355
 msgid "Show messages with all email headers"
 msgstr "éçéäåèçæé"
 
-#: ../mail/e-mail-reader.c:2699
-msgid "Unable to retrieve message"
-msgstr "çæææéä"
-
-#: ../mail/e-mail-reader.c:2761
-#: ../mail/mail-ops.c:2068
+#: ../mail/e-mail-reader.c:2651
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æåååéäã%sã"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3379
-#: ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:538
-#: ../plugins/google-account-setup/google-source.c:674
-#: ../widgets/misc/e-account-tree-view.c:249
+#: ../mail/e-mail-reader.c:3229 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:306
+#: ../plugins/google-account-setup/google-source.c:549
+#: ../plugins/google-account-setup/google-source.c:688
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "éèå"
 
-#: ../mail/e-mail-reader.c:3550
-#: ../modules/mail/e-mail-attachment-handler.c:172
+#: ../mail/e-mail-reader.c:3396
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "èå(_F)"
 
-#: ../mail/e-mail-reader.c:3551
+#: ../mail/e-mail-reader.c:3397
 msgid "Forward the selected message to someone"
 msgstr "åéåçéäèåçæä"
 
-#: ../mail/e-mail-reader.c:3570
+#: ../mail/e-mail-reader.c:3416
 msgid "Group Reply"
 msgstr "ççåè"
 
-#: ../mail/e-mail-reader.c:3571
+#: ../mail/e-mail-reader.c:3417
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "åèçéäèåïææçææçæäè"
 
-#: ../mail/e-mail-reader.c:3616
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:746
+#: ../mail/e-mail-reader.c:3470 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "åé"
 
-#: ../mail/e-mail-reader.c:3649
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
-#: ../widgets/misc/e-calendar.c:201
+#: ../mail/e-mail-reader.c:3503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3653
-#: ../modules/calendar/e-cal-shell-view-actions.c:1304
-#: ../widgets/misc/e-calendar.c:177
+#: ../mail/e-mail-reader.c:3507
+#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3663
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3516 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "åè"
 
-#: ../mail/e-mail-reader.c:4298
+#: ../mail/e-mail-reader.c:4186
 #, c-format
 msgid "Folder '%s'"
 msgstr "èæåã%sã"
 
-#: ../mail/e-mail-session.c:643
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "èèå %s æéçåè"
+#: ../mail/e-mail-reader-utils.c:139
+msgid "Do not warn me again"
+msgstr "äèåèåæ"
 
-#: ../mail/e-mail-session.c:645
-msgid "Enter Passphrase"
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:663
+#, c-format
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] "èæåã%sãåå %u åéèçéäãäçåèåéåï"
+
+#: ../mail/e-mail-reader-utils.c:960
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "ååéä"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * 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:981
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "éä"
+
+#: ../mail/e-mail-session.c:833
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "èèå %s æéçåè"
+
+#: ../mail/e-mail-session.c:837
+msgid "Enter Passphrase"
 msgstr "èååè"
 
-#: ../mail/e-mail-session.c:648
+#: ../mail/e-mail-session.c:841
 #, c-format
 msgid "Enter Password for %s"
 msgstr "èèå %s æéçåç"
 
-#: ../mail/e-mail-session.c:650
+#: ../mail/e-mail-session.c:845
 msgid "Enter Password"
 msgstr "èååç"
 
-#: ../mail/e-mail-session.c:703
+#: ../mail/e-mail-session.c:896
 #, c-format
 msgid "User canceled operation."
 msgstr "äçèååææäã"
 
-#: ../mail/e-mail-session.c:873
+#: ../mail/e-mail-session.c:1009
 #, c-format
-msgid "No destination address provided, forward of the message has been cancelled."
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
 msgstr "æææäççåäåïéäçèååçåæã"
 
-#: ../mail/e-mail-session.c:882
+#: ../mail/e-mail-session.c:1018
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æäååäççåèïéäçèååçåæã"
 
-#: ../mail/e-mail-session.c:1286
-#: ../mail/mail-ops.c:1220
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "éåèæåã%sã"
-
-#: ../mail/e-mail-session.c:1302
+#: ../mail/e-mail-session-utils.c:419
 #, c-format
-msgid "Invalid folder: %s"
-msgstr "çæçèæåï%s"
+msgid "Cannot get transport for account '%s'"
+msgstr "äèåååèã%sãçåè"
 
-#: ../mail/e-mail-session-utils.c:490
-#: ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:506 ../mail/mail-ops.c:633
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "çæåçååéæåï%s"
 
-#: ../mail/e-mail-session-utils.c:514
-#: ../mail/e-mail-session-utils.c:548
-#: ../mail/mail-ops.c:622
-#: ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:530 ../mail/e-mail-session-utils.c:564
+#: ../mail/mail-ops.c:652 ../mail/mail-ops.c:686
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -8963,221 +9009,79 @@ msgstr ""
 "çæéåè %sï%s\n"
 "æéåèæåãåäåãèæåã"
 
-#: ../mail/e-mail-session-utils.c:568
-#: ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:584 ../mail/mail-ops.c:706
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "çæéåèæåãåäåãèæåï%s"
 
-#: ../mail/e-mail-session-utils.c:779
-#: ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/e-mail-session-utils.c:795 ../mail/mail-ops.c:809
+#: ../mail/mail-ops.c:905
 msgid "Sending message"
 msgstr "æååééä"
 
-#: ../mail/e-mail-session-utils.c:850
+#: ../mail/e-mail-session-utils.c:871
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "åæèéèæå ã%sã"
 
-#: ../mail/e-mail-store-utils.c:39
+#: ../mail/e-mail-store-utils.c:167
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "äæèã%sãçéç"
 
-#: ../mail/e-mail-store-utils.c:130
+#: ../mail/e-mail-store-utils.c:258
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "éæéçåã%sã"
 
+#: ../mail/e-mail-store-utils.c:333
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "æååèã%sãéçåä"
+
 #: ../mail/e-mail-tag-editor.c:291
 msgid "Flag to Follow Up"
 msgstr "èèéçæå"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:564
-#: ../mail/mail-config.ui.h:69
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "ææåå"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:568
-#: ../mail/mail-config.ui.h:126
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "TLS åå"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:572
-#: ../mail/mail-config.ui.h:91
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL åå"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:835
-#: ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "ææ"
-
-#: ../mail/em-account-editor.c:916
-msgid "Never"
-msgstr "æä"
-
-#: ../mail/em-account-editor.c:917
-msgid "Always"
-msgstr "æé"
-
-#: ../mail/em-account-editor.c:918
-msgid "Ask for each message"
-msgstr "æåéäçèå"
-
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1701
-#: ../widgets/misc/e-account-tree-view.c:127
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "ææ"
-
-#: ../mail/em-account-editor.c:2088
-msgid "Mail Configuration"
-msgstr "éäçæ"
-
-#: ../mail/em-account-editor.c:2089
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"æèäç Evolution éäçæåçã\n"
-"\n"
-"æääãååãéåã "
-
-#: ../mail/em-account-editor.c:2092
-msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
-msgstr "èåäéèåäçåçåééååããéææãçæäääåèåïééäåæåéåçéäåååéäèèã"
-
-#: ../mail/em-account-editor.c:2094
-#: ../mail/em-account-editor.c:2257
-msgid "Receiving Email"
-msgstr "ææéåéä"
-
-#: ../mail/em-account-editor.c:2095
-msgid "Please configure the following account settings."
-msgstr "èåèåäååèçèååã"
-
-#: ../mail/em-account-editor.c:2097
-#: ../mail/em-account-editor.c:2757
-msgid "Sending Email"
-msgstr "åééåéä"
-
-#: ../mail/em-account-editor.c:2098
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
-msgstr "èèåääéæåééäæåçèèãåæääææïèèçççççåæççæåäæåã"
-
-#: ../mail/em-account-editor.c:2100
-#: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "åèèè"
-
-#: ../mail/em-account-editor.c:2101
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"èåäéççéèåæèéååèçåçã\n"
-"éååçåååçéçäçã"
-
-#: ../mail/em-account-editor.c:2105
-msgid "Done"
-msgstr "åæ"
-
-#: ../mail/em-account-editor.c:2106
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1183
 msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"æåäïéäèååçåæã\n"
-"\n"
-"äçååäéåäç Evolution æçéåéäã\n"
-"\n"
-"èæääãåçãååèåã"
-
-#: ../mail/em-account-editor.c:2571
-msgid "Check for _new messages every"
-msgstr "èåæææéäæ(_N)"
-
-#: ../mail/em-account-editor.c:2579
-msgid "minu_tes"
-msgstr "åé(_T)"
-
-#: ../mail/em-account-editor.c:2862
-msgid "Please select a folder from the current account."
-msgstr "èéæçååèçèæåã"
-
-#: ../mail/em-account-editor.c:3172
-#: ../mail/mail-config.ui.h:98
-msgid "Security"
-msgstr "ååæ"
-
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3218
-#: ../mail/em-account-editor.c:3286
-msgid "Receiving Options"
-msgstr "ææéé"
-
-#: ../mail/em-account-editor.c:3219
-#: ../mail/em-account-editor.c:3287
-msgid "Checking for New Messages"
-msgstr "æææéä"
-
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1173
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 msgstr "æ ${AbbrevWeekdayName}ï${Year}-${Month}-${Day} æ ${24Hour}:${Minute} ${TimeZone}ï${Sender} æåï"
 
-#: ../mail/em-composer-utils.c:1184
+#: ../mail/em-composer-utils.c:1194
 msgid "-----Original Message-----"
 msgstr "-----ååéä-----"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1851
+#: ../mail/em-composer-utils.c:1975
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "äåç %s äæã%sã (%s) çéäåèéèã"
 
-#: ../mail/em-composer-utils.c:1905
+#: ../mail/em-composer-utils.c:2034
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "éééçïã%sã"
 
-#: ../mail/em-composer-utils.c:2356
+#: ../mail/em-composer-utils.c:2536
 msgid "an unknown sender"
 msgstr "äæçåäè"
 
-#: ../mail/em-composer-utils.c:2787
+#: ../mail/em-composer-utils.c:2937
 msgid "Posting destination"
 msgstr "åèçççç"
 
-#: ../mail/em-composer-utils.c:2788
+#: ../mail/em-composer-utils.c:2938
 msgid "Choose folders to post the message to."
 msgstr "éåèæåäåèéäã"
 
-#: ../mail/em-filter-folder-element.c:339
+#: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
 msgstr "éæèæå"
 
@@ -9294,8 +9198,7 @@ msgstr "æèå"
 msgid "is set"
 msgstr "èå"
 
-#: ../mail/em-filter-i18n.h:41
-#: ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "ååéä"
 
@@ -9344,13 +9247,11 @@ msgid "Play Sound"
 msgstr "ææéæ"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "åè"
 
-#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "æäè"
 
@@ -9378,13 +9279,11 @@ msgstr "åååæ"
 msgid "Run Program"
 msgstr "åèçå"
 
-#: ../mail/em-filter-i18n.h:62
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "åæ"
 
-#: ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "åäè"
 
@@ -9429,40 +9328,35 @@ msgid "Unset Status"
 msgstr "åæèåçæ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:536
+#: ../mail/em-filter-rule.c:538
 msgid "Then"
 msgstr "æçææ"
 
-#: ../mail/em-filter-rule.c:567
+#: ../mail/em-filter-rule.c:569
 msgid "Add Ac_tion"
 msgstr "åååä(_T)"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:124
+#: ../mail/em-folder-properties.c:143
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "æèéä:"
-msgstr[1] "æèéä:"
 
-#. TODO: can this be done in a loop?
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:128
+#: ../mail/em-folder-properties.c:154
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ææéä:"
-msgstr[1] "ææéä:"
 
-#: ../mail/em-folder-properties.c:146
+#: ../mail/em-folder-properties.c:175
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "ééäçé (%s):"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage"
 msgstr "éåçé"
 
-#: ../mail/em-folder-properties.c:290
+#: ../mail/em-folder-properties.c:315
 msgid "Folder Properties"
 msgstr "èæååå"
 
@@ -9470,350 +9364,345 @@ msgstr "èæååå"
 msgid "<click here to select a folder>"
 msgstr "<æéèéæèæå>"
 
-#: ../mail/em-folder-selector.c:261
+#: ../mail/em-folder-selector.c:385
 msgid "C_reate"
 msgstr "åç(_R)"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:391
 msgid "Folder _name:"
 msgstr "èæååç(_N):"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147
-#: ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1164
-#: ../mail/mail-vfolder.c:1239
-msgid "Search Folders"
-msgstr "æåèæå"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172
-#: ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr "äçå"
-
-#: ../mail/em-folder-tree-model.c:808
-#: ../mail/em-folder-tree-model.c:1085
-msgid "Loading..."
-msgstr "èåäâ"
-
-#: ../mail/em-folder-tree.c:197
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "ææã%sãåçèæå"
-
-#: ../mail/em-folder-tree.c:625
+#: ../mail/em-folder-tree.c:647
 msgid "Folder names cannot contain '/'"
 msgstr "èæååçäèååæçã"
 
-#: ../mail/em-folder-tree.c:1245
+#: ../mail/em-folder-tree.c:1331
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1482
+#: ../mail/em-folder-tree.c:1568
 msgid "Mail Folder Tree"
 msgstr "éäèæåæ"
 
-#: ../mail/em-folder-tree.c:1938
-#: ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
 msgstr "æåçåèæå %s"
 
-#: ../mail/em-folder-tree.c:1942
-#: ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
 msgstr "æåèèèæå %s"
 
-#: ../mail/em-folder-tree.c:1951
-#: ../mail/message-list.c:2243
+#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2218
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æååéäçèèæå %s"
 
-#: ../mail/em-folder-tree.c:1955
-#: ../mail/message-list.c:2245
+#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2220
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æåèèéäèèæå %s"
 
-#: ../mail/em-folder-tree.c:1974
+#: ../mail/em-folder-tree.c:2101
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "çæåéäææåæäåçååå"
 
-#: ../mail/em-folder-utils.c:422
+#. load store to mail component
+#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
+#: ../mail/mail-vfolder.c:1165 ../mail/mail-vfolder.c:1240
+msgid "Search Folders"
+msgstr "æåèæå"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
+msgid "UNMATCHED"
+msgstr "äçå"
+
+#: ../mail/em-folder-tree-model.c:792 ../mail/em-folder-tree-model.c:1061
+msgid "Loading..."
+msgstr "èåäâ"
+
+#: ../mail/em-folder-utils.c:481
 msgid "Move Folder To"
 msgstr "çåèæåå"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-utils.c:481
 msgid "Copy Folder To"
 msgstr "èèèæåå"
 
-#: ../mail/em-folder-utils.c:571
-#: ../plugins/groupwise-features/share-folder-common.c:138
-#, c-format
-msgid "Creating folder '%s'"
-msgstr "æååçèæåã%sã"
-
-#: ../mail/em-folder-utils.c:741
+#: ../mail/em-folder-utils.c:556
 msgid "Create Folder"
 msgstr "åçèæå"
 
-#: ../mail/em-folder-utils.c:742
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../mail/em-folder-utils.c:557
 msgid "Specify where to create the folder:"
 msgstr "æåèåçèæåçäçï"
 
-#: ../mail/em-format-html-display.c:84
-#: ../mail/em-format-html.c:1601
+#: ../mail/em-format-html.c:165
+msgid "Formatting message"
+msgstr "æååéä"
+
+#: ../mail/em-format-html.c:368
+msgid "Formatting Message..."
+msgstr "æååéäâ"
+
+#: ../mail/em-format-html.c:1541 ../mail/em-format-html.c:1551
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "æåååã%sã"
+
+#: ../mail/em-format-html.c:1697 ../mail/em-format-html-display.c:85
 msgid "Unsigned"
 msgstr "æçç"
 
-#: ../mail/em-format-html-display.c:84
-msgid "This message is not signed. There is no guarantee that this message is authentic."
-msgstr "æéäæççãääèæéäåéèã"
-
-#: ../mail/em-format-html-display.c:85
-#: ../mail/em-format-html.c:1602
+#: ../mail/em-format-html.c:1698 ../mail/em-format-html-display.c:86
 msgid "Valid signature"
 msgstr "ææççç"
 
-#: ../mail/em-format-html-display.c:85
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
-msgstr "æéäåççèäææïèçåéåæåèæéèçéäã"
-
-#: ../mail/em-format-html-display.c:86
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1699 ../mail/em-format-html-display.c:87
 msgid "Invalid signature"
 msgstr "çæççç"
 
-#: ../mail/em-format-html-display.c:86
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr "éäççççææéïåèåååéæèæåäã"
-
-#: ../mail/em-format-html-display.c:87
-#: ../mail/em-format-html.c:1604
+#: ../mail/em-format-html.c:1700 ../mail/em-format-html-display.c:88
 msgid "Valid signature, but cannot verify sender"
 msgstr "ççææïäæçææéåäè"
 
-#: ../mail/em-format-html-display.c:87
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
-msgstr "æéäæäåææçççïäæéäçåäèçææéã"
-
-#: ../mail/em-format-html-display.c:88
-#: ../mail/em-format-html.c:1605
+#: ../mail/em-format-html.c:1701 ../mail/em-format-html-display.c:89
 msgid "Signature exists, but need public key"
 msgstr "ççååïäéèåéåçå"
 
-#: ../mail/em-format-html-display.c:88
-msgid "This message is signed with a signature, but there is no corresponding public key."
-msgstr "æéäæäåææçççïäæææåæçåéåçåã"
-
-#: ../mail/em-format-html-display.c:95
-#: ../mail/em-format-html.c:1611
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:96
 msgid "Unencrypted"
 msgstr "æåå"
 
-#: ../mail/em-format-html-display.c:95
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
-msgstr "æéäæååãåçåååééäèçåéåèæèæéã"
-
-#: ../mail/em-format-html-display.c:96
-#: ../mail/em-format-html.c:1612
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:97
 msgid "Encrypted, weak"
 msgstr "åååïäåå"
 
-#: ../mail/em-format-html-display.c:96
-msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
-msgstr "æéäåååïäæäçäååçååæçæãåéçäåéæéååïäåèääææïääæçææèæéäçååã"
-
-#: ../mail/em-format-html-display.c:97
-#: ../mail/em-format-html.c:1613
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:98
 msgid "Encrypted"
 msgstr "ååå"
 
-#: ../mail/em-format-html-display.c:97
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
-msgstr "æéäåååãåéçäéäæèæéäçååã"
-
-#: ../mail/em-format-html-display.c:98
-#: ../mail/em-format-html.c:1614
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:99
 msgid "Encrypted, strong"
 msgstr "åååïåå"
 
-#: ../mail/em-format-html-display.c:98
-msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
-msgstr "æéäåååïäçååçååæçæãçäçéäææéïåéçäåéæéæéäçååã"
-
-#: ../mail/em-format-html-display.c:236
-#: ../smime/gui/smime-ui.ui.h:47
-msgid "_View Certificate"
-msgstr "æèèæ(_V)"
-
-#: ../mail/em-format-html-display.c:249
-msgid "This certificate is not viewable"
-msgstr "æèæçææè"
-
-#: ../mail/em-format-html-display.c:538
-msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
-msgstr "Evolution çæéçæåéåéäïåçååèåèèççååãäåäçäæççæåæäçåéæåçèåäéèåã"
-
-#: ../mail/em-format-html-display.c:804
-msgid "Completed on"
-msgstr "ååææ"
-
-#: ../mail/em-format-html-display.c:812
-msgid "Overdue:"
-msgstr "åææ:"
-
-#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:816
-msgid "by"
-msgstr "æ"
-
-#: ../mail/em-format-html-display.c:1047
-#: ../mail/em-format-html-display.c:1094
-msgid "View _Unformatted"
-msgstr "æéææçç(_U)"
-
-#: ../mail/em-format-html-display.c:1049
-msgid "Hide _Unformatted"
-msgstr "éèææçç(_U)"
-
-#: ../mail/em-format-html-display.c:1114
-msgid "O_pen With"
-msgstr "äâéå(_O)"
-
-#: ../mail/em-format-html-print.c:176
-#, c-format
-msgid "Page %d of %d"
-msgstr "ç %d / %d é"
-
-#: ../mail/em-format-html.c:161
-msgid "Formatting message"
-msgstr "æååéä"
-
-#: ../mail/em-format-html.c:360
-msgid "Formatting Message..."
-msgstr "æååéäâ"
-
-#: ../mail/em-format-html.c:1445
-#: ../mail/em-format-html.c:1455
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "æåååã%sã"
-
-#: ../mail/em-format-html.c:1976
+#: ../mail/em-format-html.c:2110
 msgid "Unknown external-body part."
 msgstr "æççååææéåã"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2120
 msgid "Malformed external-body part."
 msgstr "æåäèçååææéåã"
 
-#: ../mail/em-format-html.c:2014
+#: ../mail/em-format-html.c:2151
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP çæç (%s)"
 
-#: ../mail/em-format-html.c:2025
+#: ../mail/em-format-html.c:2162
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æåçææ (%s) æ ã%sãææçæç"
 
-#: ../mail/em-format-html.c:2027
+#: ../mail/em-format-html.c:2164
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æåæææç (%s)"
 
-#: ../mail/em-format-html.c:2048
+#: ../mail/em-format-html.c:2185
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "éçèææç (%s)"
 
-#: ../mail/em-format-html.c:2059
+#: ../mail/em-format-html.c:2200
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "äæçåéæææç (ã%sãéå)"
 
-#. To translators: This message suggests to the receipients that the sender of the mail is
-#. different from the one listed in From field.
-#: ../mail/em-format-html.c:2763
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2905
+#: ../plugins/mail-notification/mail-notification.c:405
+#, c-format
+msgid "From: %s"
+msgstr "åäèï%s"
+
+#: ../mail/em-format-html.c:2927
+msgid "(no subject)"
+msgstr "(ææäæ)"
+
+#: ../mail/em-format-html.c:3003
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "éåéäæç %s äè %s åå"
 
-#: ../mail/em-html-stream.c:82
-#: ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
-#, c-format
+#: ../mail/em-format-html-display.c:85
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "æéäæççãääèæéäåéèã"
+
+#: ../mail/em-format-html-display.c:86
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "æéäåççèäææïèçåéåæåèæéèçéäã"
+
+#: ../mail/em-format-html-display.c:87
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr "éäççççææéïåèåååéæèæåäã"
+
+#: ../mail/em-format-html-display.c:88
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr "æéäæäåææçççïäæéäçåäèçææéã"
+
+#: ../mail/em-format-html-display.c:89
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr "æéäæäåææçççïäæææåæçåéåçåã"
+
+#: ../mail/em-format-html-display.c:96
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr "æéäæååãåçåååééäèçåéåèæèæéã"
+
+#: ../mail/em-format-html-display.c:97
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr "æéäåååïäæäçäååçååæçæãåéçäåéæéååïäåèääææïääæçææèæéäçååã"
+
+#: ../mail/em-format-html-display.c:98
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr "æéäåååãåéçäéäæèæéäçååã"
+
+#: ../mail/em-format-html-display.c:99
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr "æéäåååïäçååçååæçæãçäçéäææéïåéçäåéæéæéäçååã"
+
+#: ../mail/em-format-html-display.c:237 ../smime/gui/smime-ui.ui.h:47
+msgid "_View Certificate"
+msgstr "æèèæ(_V)"
+
+#: ../mail/em-format-html-display.c:250
+msgid "This certificate is not viewable"
+msgstr "æèæçææè"
+
+#: ../mail/em-format-html-display.c:552
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr "Evolution çæéçæåéåéäïåçååèåèèççååãäåäçäæççæåæäçåéæåçèåäéèåã"
+
+#: ../mail/em-format-html-display.c:848
+msgid "Completed on"
+msgstr "ååææ"
+
+#: ../mail/em-format-html-display.c:860
+msgid "Overdue:"
+msgstr "åææ:"
+
+#: ../mail/em-format-html-display.c:868
+msgid "by"
+msgstr "æ"
+
+#: ../mail/em-format-html-display.c:1142 ../mail/em-format-html-display.c:1189
+msgid "View _Unformatted"
+msgstr "æéææçç(_U)"
+
+#: ../mail/em-format-html-display.c:1144
+msgid "Hide _Unformatted"
+msgstr "éèææçç(_U)"
+
+#: ../mail/em-format-html-display.c:1209
+msgid "O_pen With"
+msgstr "äâéå(_O)"
+
+#: ../mail/em-format-html-print.c:176
+#, c-format
+msgid "Page %d of %d"
+msgstr "ç %d / %d é"
+
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
+#, c-format
 msgid "No HTML stream available"
 msgstr "ææ HTML äæåç"
 
-#: ../mail/em-subscription-editor.c:1105
+#: ../mail/em-subscription-editor.c:1138
 msgid "Folder Subscriptions"
 msgstr "èæåèé"
 
-#: ../mail/em-subscription-editor.c:1144
+#: ../mail/em-subscription-editor.c:1177
 msgid "_Account:"
 msgstr "åè(_A):"
 
-#: ../mail/em-subscription-editor.c:1159
+#: ../mail/em-subscription-editor.c:1192
 msgid "Clear Search"
 msgstr "æéæå"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1210
 msgid "Sho_w items that contain:"
 msgstr "éçéçåå(_W):"
 
-#: ../mail/em-subscription-editor.c:1216
+#: ../mail/em-subscription-editor.c:1249
 msgid "Subscribe to the selected folder"
 msgstr "èééåçèæå"
 
-#: ../mail/em-subscription-editor.c:1217
+#: ../mail/em-subscription-editor.c:1250
 msgid "Su_bscribe"
 msgstr "èé(_B)"
 
-#: ../mail/em-subscription-editor.c:1228
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../mail/em-subscription-editor.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Unsubscribe from the selected folder"
 msgstr "åæèééåçèæå"
 
-#: ../mail/em-subscription-editor.c:1229
-#: ../modules/mail/e-mail-shell-view-actions.c:1176
+#: ../mail/em-subscription-editor.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "_Unsubscribe"
 msgstr "åæèé(_U)"
 
-#: ../mail/em-subscription-editor.c:1240
+#: ../mail/em-subscription-editor.c:1273
 msgid "Collapse all folders"
 msgstr "ææææçèæå"
 
-#: ../mail/em-subscription-editor.c:1241
+#: ../mail/em-subscription-editor.c:1274
 msgid "C_ollapse All"
 msgstr "åéææ(_O)"
 
-#: ../mail/em-subscription-editor.c:1251
+#: ../mail/em-subscription-editor.c:1284
 msgid "Expand all folders"
 msgstr "åéææçèæå"
 
-#: ../mail/em-subscription-editor.c:1252
+#: ../mail/em-subscription-editor.c:1285
 msgid "E_xpand All"
 msgstr "åéåé(_X)"
 
-#: ../mail/em-subscription-editor.c:1262
+#: ../mail/em-subscription-editor.c:1295
 msgid "Refresh the folder list"
 msgstr "éææçèæåæå"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1307
 msgid "Stop the current operation"
 msgstr "åæçåçæä"
 
@@ -9821,23 +9710,22 @@ msgstr "åæçåçæä"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:102
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "äçåèäæéå %d åéäï"
-msgstr[1] "äçåèäæéå %d åéäï"
 
-#: ../mail/em-utils.c:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:151
+#: ../mail/em-utils.c:158
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "äèåéçéåèæ(_D)"
 
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:331
 msgid "Message Filters"
 msgstr "éäèå"
 
-#: ../mail/em-utils.c:904
+#: ../mail/em-utils.c:916
 #, c-format
 msgid "Messages from %s"
 msgstr "äè %s çéä"
@@ -9846,7 +9734,7 @@ msgstr "äè %s çéä"
 msgid "Search _Folders"
 msgstr "æåèæå(_F)"
 
-#: ../mail/em-vfolder-rule.c:610
+#: ../mail/em-vfolder-rule.c:604
 msgid "Add Folder"
 msgstr "ååèæå"
 
@@ -9908,7 +9796,9 @@ msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "éèèæåçæåäéççæé(ç)ã"
 
 #: ../mail/evolution-mail.schemas.in.h:15
-msgid "Asks whether to close the message window when the user forwards or replies to the message shown in the window"
+msgid ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
 msgstr "çäçèèåæåèèçäéççéäæèåæåèéééäèç"
 
 #: ../mail/evolution-mail.schemas.in.h:16
@@ -9960,11 +9850,15 @@ msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "åçå TO/CC/BCC ääåçéçæå"
 
 #: ../mail/evolution-mail.schemas.in.h:28
-msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
 msgstr "å TO/CC/BCC ääåçéçæååçç address_count äæåçéåã"
 
 #: ../mail/evolution-mail.schemas.in.h:29
-msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
 msgstr "æåæåçææèéçéääæååæçéçãééåéèåæ 30 çã"
 
 #: ../mail/evolution-mail.schemas.in.h:30
@@ -9972,7 +9866,9 @@ msgid "Custom headers to use while checking for junk."
 msgstr "ææååéäççèéæéã"
 
 #: ../mail/evolution-mail.schemas.in.h:31
-msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
 msgstr "ææååéäççèéæéãææåäçåçæåçãheadername=valueãåäã"
 
 #: ../mail/evolution-mail.schemas.in.h:32
@@ -10024,708 +9920,860 @@ msgid "Default width of the mail browser window."
 msgstr "éäçèåèççéèéåã"
 
 #: ../mail/evolution-mail.schemas.in.h:44
-msgid "Determines whether to look up addresses for junk filtering in local address book only"
-msgstr "æåæåååæåçéèéäåæææååéäççéåéääå"
+msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr "æèåçææèäçéäæééèæèæææåéãã0ã= åé ã1ã = ææ"
 
 #: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr "æåæåååæåçéèéäåæææååéäççéåéääå"
+
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "æåæååéèéäåæåäèéåéäåè"
 
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
 msgstr "æåæååéèéäåæåäèéåéäåèãåææååïåäåæçååéäãåææåæèçèåèéçéèéãäèæèçèåèéçæéçéèéïå LDAPïïåéååèæåæã"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "æåæåäçèéæéäææååéä"
 
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
 msgstr "æåæåäçèéæéäææååéäãåæåçéåééääæäæéïåææåååéäææçéåã"
 
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
 msgstr "æåæåååçæèçãéäãèçãåääãåãäæãääçåæçååã"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "çäéäçèåèå/éäççéã"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "çäååéäåäæççéã"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "åçæåçåéåçèæååçççåè"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr "åéçäèéæåååçéäæå"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "çæååçåæåéçè"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "çäèåååæåæåäéçæåéèæçã"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "ééææçååéäèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "çæææçååèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "éé Evolution ææçææååéäèæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "çæ Evolution ææçææååèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:60
-msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
 msgstr "åç HTML éääçåçåçãèåäçèèçåçåçåçäïåèååäéæåçäæã"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "åçæåèæåïåæäåäåéèéäæçåææã"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "åçæåçéèççé"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "åçæåçæèååéäæçæçã"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "åçæåçéæåæåè"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
 msgstr "åçæåèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
 msgstr "åççåéåææåèæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "Enable the side bar search feature to allow interactive searching of folder names."
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr "åçåéåæååèåèäååæåèæååçã"
 
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
 msgstr "åçæééååéäéèãéäæååèæåääçççéæåçéã"
 
-#: ../mail/evolution-mail.schemas.in.h:69
-msgid "Enable to display only message texts not exceeding size defined in 'message_text_part_limit' key."
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
 msgstr "åçååæéçäèéãmessage_text_part_limitãèåéäæåççååçéäæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "åçäåææèæåäçéäçéäæåæèèåå"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "åçæééæèææçèæåäçéäçéäæåæèèååã"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "åç/åçæåèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:73
-#: ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "åææåçççç Outlook/GMail åå"
 
-#: ../mail/evolution-mail.schemas.in.h:74
-msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr "åéäæéäçææåçççç Outlook æ GMail çååïåèååèæçéçç Evolution ååç UTF-8 åçææåçïåçååäæéå RFC 2231 èçïèçääæçç RFC 2047 ææã"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr "éæåæçåäå"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Forward message."
 msgstr "èåéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr "ççåèåäåéäèå"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "éäæåçæéå"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "éäæåçæçéåã"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "éèåèæåéèäçééåå"
 
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
 msgstr "åæäçèåèäæéå 10 ææåçéäïèåäçèæåçåèééåã"
 
-#: ../mail/evolution-mail.schemas.in.h:82
-msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
+#: ../mail/evolution-mail.schemas.in.h:83
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
 msgstr "åæææåçæèååçæ Evolution èéçæç MIME éåïääéçåææåç  MIME éåäåæè GNOME ç MIME éåèæåä Bonobo åäæèåïæçæéçååã"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr "åçéäèå Reply-To:"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Initial height of the \"Filter Editor\" window. The value updates as the user resizes the window vertically."
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
 msgstr "ãéææäçèåãèççååéåãéåæåæåèçåçæèååæææã"
 
-#: ../mail/evolution-mail.schemas.in.h:85
-msgid "Initial height of the \"Folder Subscriptions\" window. The value updates as the user resizes the window vertically."
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr "ãèæåèéãèççååéåãéåæåæåèçåçæèååæææã"
 
-#: ../mail/evolution-mail.schemas.in.h:86
-msgid "Initial height of the \"Search Folder Editor\" window. The value updates as the user resizes the window vertically."
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr "ãæåèæåçèåãèççååéåãéåæåæåèçåçæèååæææã"
 
-#: ../mail/evolution-mail.schemas.in.h:87
-msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr "ãåéèææéäãèççååéåãéåæåæåèçåçæèååæææã"
 
-#: ../mail/evolution-mail.schemas.in.h:88
-msgid "Initial maximize state of the \"Filter Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Filter Editor\" window cannot be maximized. This key exists only as an implementation detail."
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
 msgstr "ãéææäçèåãèççååæååçæãéåæåæåäçèæååæåææååèçæææãææïéåçåçæåäèå Evolution ääçïåçãéææäçèåãèçäèæååãéåéååçäåäéèèååã"
 
-#: ../mail/evolution-mail.schemas.in.h:89
-msgid "Initial maximize state of the \"Folder Subscriptions\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Folder Subscriptions\" window cannot be maximized. This key exists only as an implementation detail."
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
 msgstr "ãèæåèéãèççååæååçæãéåæåæåäçèæååæåææååèçæææãææïéåçåçæåäèå Evolution ääçïåçãèæåèéãèçäèæååãéåéååçäåäéèèååã"
 
-#: ../mail/evolution-mail.schemas.in.h:90
-msgid "Initial maximize state of the \"Search Folder Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Search Folder Editor\" window cannot be maximized. This key exists only as an implementation detail."
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
 msgstr "ãæåèæåçèåãèççååæååçæãéåæåæåäçèæååæåææååèçæææãææïéåçåçæåäèå Evolution ääçïåçãæåèæåçèåãèçäèæååãéåéååçäåäéèèååã"
 
-#: ../mail/evolution-mail.schemas.in.h:91
-msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
 msgstr "ãåéèææéäãèççååæååçæãéåæåæåäçèæååæåææååèçæææãææïéåçåçæåäèå Evolution ääçïåçãåéèææéäãèçäèæååãéåéååçäåäéèèååã"
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid "Initial width of the \"Filter Editor\" window. The value updates as the user resizes the window horizontally."
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
 msgstr "ãéææäçèåãèççååéåãéåæåæåèçæåæèååæææã"
 
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Initial width of the \"Folder Subscriptions\" window. The value updates as the user resizes the window horizontally."
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr "ãèæåèéãèççååéåãéåæåæåèçæåæèååæææã"
 
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Initial width of the \"Search Folder Editor\" window. The value updates as the user resizes the window horizontally."
+#: ../mail/evolution-mail.schemas.in.h:95
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr "ãæåèæåçèåãèççååéåãéåæåæåèçæåæèååæææã"
 
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr "ãåéèææéäãèççååéåãéåæåæåèçæåæèååæææã"
 
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid "Instead of the normal \"Reply to All\" behaviour, this option will make the 'Group Reply' toolbar button try to reply only to the mailing list through which you happened to receive the copy of the message to which you're replying."
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
 msgstr "æåæäèçãåèåéãèçïéåééæèãççåèãåååæéåèååäåéäèåïäåæäæåèåèçéåäçäæã"
 
-#: ../mail/evolution-mail.schemas.in.h:97
-msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
 msgstr "ååç/åçååæåèæåäåééäææåéèæçäèåéåææäåééäïèéåæåéäèæåçæäçéã"
 
-#: ../mail/evolution-mail.schemas.in.h:98
-msgid "It disables/enables the repeated prompts to warn that you are sending a private reply to a message which arrived via a mailing list."
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
 msgstr "åæåç/åçéèæçèåäæåèåèçäääçéééäèåååçäã"
 
-#: ../mail/evolution-mail.schemas.in.h:99
-msgid "It disables/enables the repeated prompts to warn that you are sending a reply to many people."
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
 msgstr "åæåç/åçèåäãäæåèçååäãçéèæçã"
 
-#: ../mail/evolution-mail.schemas.in.h:100
-msgid "It disables/enables the repeated prompts to warn that you are trying sending a private reply to a message which arrived via a mailing list, but the list sets a Reply-To: header which redirects your reply back to the list"
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
 msgstr "åæåç/åçéèæçèåäæåèåèçäääçéééäèåååçäãèéäèåèåç Reply-To: æéæåäçåäéæååèéäèåäçæææå"
 
-#: ../mail/evolution-mail.schemas.in.h:101
-msgid "It disables/enables the repeated prompts to warn that you are trying to send a message to recipients not entered as mail addresses"
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
 msgstr "åæåç/åçéèæçèåäæåèåééäçææèåéåéäååçæäè"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Junk was run"
 msgstr "äææçååéäçæé"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Last time Empty Trash was run"
 msgstr "äææçåæççæé"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Layout style"
 msgstr "éçæå"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "Level beyond which the message should be logged."
 msgstr "æèéçéäççã"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "æçåçéèåçæå"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME éåæåïææ Bonobo åäæèå"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "ææçæææå"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "åèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:110
-msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr "Evolution çéäåäåççåèæåãæåååè /apps/evolution/mail/accounts çéçåäåååçéã"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr "èéæéäåååæååççæå"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
 msgstr "çææåææçååèèçæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr "Evolution çéäåäåççæçæåãæååååäïåäåå name:colorïcolor äç HTML ååéäççã"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "åçæååææçååæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
 msgstr "éé HTTP èå HTML éäçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
-msgstr "éé HTTP(S) èå HTML éäçåçãåèçåçïã0ãâ äåççèååçãã1ãâ åææåèçäèçåäèæïèååçãã2ã- äååççèååçã"
-
 #: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
+msgstr "éé HTTP(S) èå HTML éäçåçãåèçåçïã0ãâ äåççèååçãã1ãâ åææåèçäèçåäèæïèååçãã2ã- äååççèååçã"
+
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "èééæååä"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "åéæååäèéåæåçèéææã"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
 msgstr "çæèééæååäçèéææ"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
 msgstr "çæèééæååäçèéææã"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser height"
 msgstr "éäçèåéå"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr "éäçèåæåå"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mail browser width"
 msgstr "éäçèåéå"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "åæåçæééåïæçæåéè"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "åæåçæééåïæçæåéèã"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "åéäãéèãäæçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "åéäãéèãäæçåçã"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr "éçéäæåéå"
 
-# (pofilter) gconf: do not translate gconf attribute: "normal", "source"
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "èæéçæå (ãnormalã[äè]ããfull headersã[åææé]ããsourceã[äæ])"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
 msgstr "çæææçååéäæåééåæ"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum days between emptying the trash on exit"
 msgstr "çæææçåæçæåééåæ"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "çæææçååéäæåééåæã"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "çæææçåæçæåééåæã"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "éçæ TO/CC/BCC ääåçéå"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Original message."
 msgstr "ååéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
 msgstr "åçéçäæåååçèå"
 
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Possible values are: never - to never close browser window always - to always close browser window ask - (or any other value) will ask user"
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
 msgstr "åèçæåæïnever - æäééçèåèç always - çæééçèåèç ask - (æääåäæå) æèåäçè"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "åäçææèåææéåéäååçæäèååæç"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "ææäæææç"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "çäçèåèæçèæåæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "çäçèåéææäæçéäæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "çåéæåèæåäçéäæéçæç"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "çéäèååæçäåèææç"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying privately to list messages"
 msgstr "ççäåèéäèåéäææç"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when replying to many recipients"
 msgstr "çåèçèåæäèææç"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "äçèæçææç"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr "çäçèååååäåæææç"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "çäçèåèäæéå 10 åææåéäææçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 msgstr "çäçèåèåé HTML éäåäææå HTML éäçæäèæïéçæçã"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "çäçèåéäåæäèæåææäèçéäæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "çäçèåèåéäæèç HTML ææç"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "çæèååéäææç"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr "ååäåçåæçæåäéç"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Put the cursor at the bottom of replies"
 msgstr "åèæåææçæåé"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "èèæåäçèæçèäåäæåçã"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "èèæåäçéçäåäåäã"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "ååéçéäåèååéäææã"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "ååçé"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
 msgstr "åæåçéèéæååäèçç"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "éèåé HTML éä"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "éèåé HTML éäã"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
 msgstr "åéäæåçåäèéåéäæä"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "äæååæéé"
 
-#: ../mail/evolution-mail.schemas.in.h:164
-msgid "Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail."
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
 msgstr "èç TRUE èçåäæåéäæäæåçåæåååçåæåéçã"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "åééäèææéçãåäåæãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "åééäèææéçãåæãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "åèåæèççæéçãåäèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "åèåæèççæéçãåèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "åééäèææéçãåèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "éçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
 msgstr "éçææéäæé"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
 msgstr "æèéäæéçæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "ææåçåçã"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "åéäæåäéçåéçéä (åäåéè)"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr "åéäæåäéçåéçéä"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
 msgstr "éçåçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr "éçååçãææãæéæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "éçåäèççç"
 
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr "åééäèææéçãåäåæãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:180
-msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr "åééäèææéçãåæãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
 msgstr "åèåæèççæéçãåäèãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:182
-msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
 msgstr "åèåæèççæéçãåèãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:183
-msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
 msgstr "åééäèææéçãåèãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:184
-msgid "Show the email-address of the sender in a separate column in the message list."
+#: ../mail/evolution-mail.schemas.in.h:185
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
 msgstr "åéäæåçääåéçæäéçåäèçéåéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:185
-msgid "Show the original \"Date\" header (with a local time only if the time zone differs). Otherwise always show \"Date\" header value in a user preferred format and local time zone."
+#: ../mail/evolution-mail.schemas.in.h:186
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
 msgstr "éçååçãææãæéïèæåäåææäççåæéïãååæéääçèååçæååæåæåéçãææãæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "åéäéèçæäéçåäèçççã"
 
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid "Some mailing lists set a Reply-To: header to trick users into sending replies to the list, even when they ask Evolution to make a private reply. Setting this option to TRUE will attempt to ignore such Reply-To: headers, so that Evolution will do as you ask it. If you use the private reply action, it will reply privately, while if you use the 'Reply to List' action it will do that. It works by comparing the Reply-To: header with a List-Post: header, if there is one."
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
 msgstr "æäéäèåæèå Reply-To: æéäèåäçèåéåèçääåèåäïåääçèåèæ Evolution éèçäåèääæãåéåééèç TRUE æåèåç Reply-To: æéïåæ Evolution åèææäæèæçèåãåæääççäåèåäïååæéèåäçåäçåäïèåæääçãåèåèåãåäïåäæçåãåçéäæåææå Reply-To: æéå List-Post: æéïåææçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "èåæåææ"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "æåææéè"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "æåææèè"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr "çææèäéäæéççæ"
+
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
 msgstr "ççæåå"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The default plugin for Junk hook"
 msgstr "ååééçéèåæçå"
 
-#: ../mail/evolution-mail.schemas.in.h:193
-msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+#: ../mail/evolution-mail.schemas.in.h:195
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "äæåèæçååéäçæéïå 1970 åäæäæ(éèçå)åçèçææã"
 
-#: ../mail/evolution-mail.schemas.in.h:194
-msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "äæåèæååæççæéïå 1970 åäæäæ(éèçå)åçèçææã"
 
-#: ../mail/evolution-mail.schemas.in.h:195
-msgid "The layout style determines where to place the preview pane in relation to the message list. \"0\" (Classic View) places the preview pane below the message list. \"1\" (Vertical View) places the preview pane next to the message list."
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
 msgstr "éçæåæåäåéäæåäéèçæçäçãã0ãïæææèïåéèçææåéäæåäæãã1ãïåçæèïåéèçææåéäæåæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
 msgstr "çæéçéäçççæååã"
 
-#: ../mail/evolution-mail.schemas.in.h:197
-msgid "The text that is inserted when forwarding a message, saying that the forwarded message follows."
+#: ../mail/evolution-mail.schemas.in.h:199
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
 msgstr "åèåéäæèæåçæåïèææääæèåçéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:198
-msgid "The text that is inserted when replying to a message (top posting), saying that the original message follows."
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
 msgstr "ååèéäæèæåçæåïçéåèïïèææääæååéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:199
-msgid "The text that is inserted when replying to a message, attributing the message to the original author."
+#: ../mail/evolution-mail.schemas.in.h:201
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
 msgstr "ååèéäæèæåçæåïèæéäçåäèã"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
 msgstr "çæéçéäçèåéåååã"
 
-#: ../mail/evolution-mail.schemas.in.h:201
-msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
+#: ../mail/evolution-mail.schemas.in.h:203
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr "éèåäçäçæåãã0ãçéèïã1ãçèåïã2ãçééèæã"
 
-#: ../mail/evolution-mail.schemas.in.h:202
-msgid "This decides the max size of the message text that will be displayed under Evolution, specified in terms of KB. The default is 4096 (4MB). This value is used only when 'force_message_limit' key is activated."
+#: ../mail/evolution-mail.schemas.in.h:204
+msgid ""
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr "éèæåäéäåæå Evolution äåéççæååéïä KB çåäæåãéèåç 4096 (4MB)ãéåæååæåäçãforce_message_limitãèåéæææã"
 
-#: ../mail/evolution-mail.schemas.in.h:203
-msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
+#: ../mail/evolution-mail.schemas.in.h:205
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
 msgstr "éæéèçååéäåæçåïåäååçäåäçåæçåãåæåçéèååçéèåæçåïääæåéåäåççåæçåã"
 
-#: ../mail/evolution-mail.schemas.in.h:204
-msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
+#: ../mail/evolution-mail.schemas.in.h:206
+msgid ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr "éåéååèèåäæïäæåèååèçãfalseããéææåæåæåäåèéäçéåäçéåèèæåçéèã"
 
-#: ../mail/evolution-mail.schemas.in.h:205
-msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+#: ../mail/evolution-mail.schemas.in.h:207
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
 msgstr "æåçåæèåå XML æåïåææåèéæéïäåæåéçååãXML çæçæåæ &lt;header enabled&gt; - åææéæéçåéäæèïåèåæ enabledã"
 
-#: ../mail/evolution-mail.schemas.in.h:206
-msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
+#: ../mail/evolution-mail.schemas.in.h:208
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
 msgstr "éåééçéæéåãlookup_addressbookãïæçäæåæåååæåçéèéäæèéåéääåäçæååéäéææãæéåçèçäååçéäãåèã"
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr "éåééèåååéææçéåã"
 
-#: ../mail/evolution-mail.schemas.in.h:208
-msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
+#: ../mail/evolution-mail.schemas.in.h:210
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
 msgstr "éæèååéèéäæåæèäéçäåçéåïèéçéåæéçãâãã"
 
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Requires a restart to apply."
+#: ../mail/evolution-mail.schemas.in.h:211
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Requires a restart to apply."
 msgstr "éåèååæåçééäéèçåéæææççæãéèéæååæèåçã"
 
-#: ../mail/evolution-mail.schemas.in.h:210
-msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
+#: ../mail/evolution-mail.schemas.in.h:212
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
 msgstr "éåèååæåçééäèæææåéäççææçéäæåïèéææéäçææãEvolution åéèéæååã"
 
-#: ../mail/evolution-mail.schemas.in.h:211
-msgid "This value can be an empty string, which means it'll use the system Picture folder, usually set to ~/Pictures. This folder will be also used when the set path is not pointing to the existent folder."
+#: ../mail/evolution-mail.schemas.in.h:213
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
 msgstr "éåæååäæçåäïäèèäçççåçèæåïéåèåå ~/Picturesãéåèæåäæåèåæåäååçèæåæäçã"
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "ääæçåçäæéäæå"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "åéäæçæåéèçæé"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "åéäæçæåéèçæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
 msgstr "éèåèç UID åäã"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "äçèåæåæææåæéåçåçéèã"
 
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "Use SpamAssassin daemon and client"
-msgstr "äç SpamAsssassin äæçåååæç"
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "äç SpamAsssassin äæçåååæç (spamc/spamd)ã"
-
 #: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "äçèéåå"
@@ -10735,58 +10783,66 @@ msgid "Use custom fonts for displaying mail."
 msgstr "äçèéååäéçéäã"
 
 #: ../mail/evolution-mail.schemas.in.h:221
-msgid "Use only local spam tests."
-msgstr "åäçæåååéäæèã"
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Use only the local spam tests (no DNS)."
-msgstr "åäçæåååéäæè (ææ DNS)ã"
-
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
 msgstr "äçèååèéäæåæææååäèãéææåæææçåéäçéçæåéã"
 
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
+#: ../mail/evolution-mail.schemas.in.h:222
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
 msgstr "äçèååèéäæåæäåçåææåäèãéææåçåææçåéäçéçæåéã"
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "èåéååå"
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æåéèåæåéäååèäåæçèæ"
 
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "Whether check for new messages in all active accounts regardless of the account \"Check for new messages every X minutes\" option when Evolution is started. This option is used only together with 'send_recv_on_start' option."
+#: ../mail/evolution-mail.schemas.in.h:225
+msgid ""
+"Whether check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
 msgstr "ç Evolution ååææåææææäçäåèçæéäèäçãæææéäææ X åéãééãéåééåèåãsend_recv_on_startãééäèäçã"
 
-#: ../mail/evolution-mail.schemas.in.h:228
-msgid "Whether check for new messages when Evolution is started. This includes also sending messages from Outbox."
+#: ../mail/evolution-mail.schemas.in.h:226
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
 msgstr "ç Evolution ååææåæææéäãéäåååååäåäçéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æååçåéåçèæååçççã"
 
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+#: ../mail/evolution-mail.schemas.in.h:228
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr "çéääåå In-Reply-To æ References æéæïæåæçäææåéäççã"
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æåææéäççäææçéääæåçééä"
 
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid "Whether to flush Outbox after filtering is done. Outbox flush will happen only when there was used any 'Forward to' filter action and approximately one minute after the last action invocation."
+#: ../mail/evolution-mail.schemas.in.h:230
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
 msgstr "æååéæååæçåäåãåäåçæçåçåçäçäääãèåèãéæååäïääåéååäååçäåééåéèã"
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "éäæåçæéå"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "éäæåçæçéåã"
 
@@ -10794,90 +10850,88 @@ msgstr "éäæåçæçéåã"
 msgid "Importing Elm data"
 msgstr "èå Elm èæ"
 
-#: ../mail/importers/elm-importer.c:339
-#: ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1044
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:446
+#: ../modules/mail/e-mail-shell-view.c:1036
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "éä"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm èåå"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:383
 msgid "Import mail from Elm."
 msgstr "å Elm ååéäã"
 
-#: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:242
+#: ../mail/importers/evolution-mbox-importer.c:135
+#: ../plugins/dbx-import/dbx-importer.c:249
 msgid "_Destination folder:"
 msgstr "çççèæå(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:259
 #: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder"
 msgstr "éæèæå"
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/dbx-import/dbx-importer.c:253
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../mail/importers/evolution-mbox-importer.c:143
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:319
 msgid "Select folder to import into"
 msgstr "éåèæåäèå"
 
-#: ../mail/importers/evolution-mbox-importer.c:403
+#: ../mail/importers/evolution-mbox-importer.c:417
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "äæ"
 
-#: ../mail/importers/evolution-mbox-importer.c:408
+#: ../mail/importers/evolution-mbox-importer.c:422
 msgctxt "mboxImp"
 msgid "From"
 msgstr "åäè"
 
-#: ../mail/importers/evolution-mbox-importer.c:452
-#: ../shell/e-shell-utils.c:253
+#: ../mail/importers/evolution-mbox-importer.c:466
+#: ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley éääç (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:453
+#: ../mail/importers/evolution-mbox-importer.c:467
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "åå Berkeley éääçæåèæå"
 
-#: ../mail/importers/mail-importer.c:65
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "æåååäç"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:593
-#: ../plugins/pst-import/pst-importer.c:480
-#: ../plugins/pst-import/pst-importer.c:589
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:603
+#: ../plugins/pst-import/pst-importer.c:500
+#: ../plugins/pst-import/pst-importer.c:609
 #, c-format
 msgid "Importing '%s'"
 msgstr "æåååã%sã"
 
-#: ../mail/importers/mail-importer.c:308
+#: ../mail/importers/mail-importer.c:315
 #, c-format
 msgid "Scanning %s"
 msgstr "ææ %s"
 
-#: ../mail/importers/pine-importer.c:223
+#: ../mail/importers/pine-importer.c:250
 msgid "Importing Pine data"
 msgstr "èåçéèæ"
 
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../mail/importers/pine-importer.c:451
+#: ../modules/addressbook/addressbook-config.c:1053
 msgid "Address Book"
 msgstr "éèé"
 
-#: ../mail/importers/pine-importer.c:462
+#: ../mail/importers/pine-importer.c:493
 msgid "Evolution Pine importer"
 msgstr "Evolution çéèåå"
 
-#: ../mail/importers/pine-importer.c:463
+#: ../mail/importers/pine-importer.c:494
 msgid "Import mail from Pine."
 msgstr "å Pine ååéäã"
 
@@ -10886,8 +10940,7 @@ msgstr "å Pine ååéäã"
 msgid "Mail to %s"
 msgstr "éäéå %s"
 
-#: ../mail/mail-autofilter.c:238
-#: ../mail/mail-autofilter.c:280
+#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "éääè %s "
@@ -10897,12 +10950,12 @@ msgstr "éääè %s "
 msgid "Subject is %s"
 msgstr "äææ %s"
 
-#: ../mail/mail-autofilter.c:303
+#: ../mail/mail-autofilter.c:305
 #, c-format
 msgid "%s mailing list"
 msgstr "%s éäåè"
 
-#: ../mail/mail-autofilter.c:394
+#: ../mail/mail-autofilter.c:414
 msgid "Add Filter Rule"
 msgstr "æåéæåèå"
 
@@ -10911,7 +10964,7 @@ msgstr "æåéæåèå"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:492
+#: ../mail/mail-autofilter.c:517
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -10923,10 +10976,6 @@ msgid_plural ""
 msgstr[0] ""
 "éæåèåã%sãåçäæïåçååçååååéçèæå\n"
 "ã%sãã"
-msgstr[1] ""
-"äåéæåèå\n"
-"%s åçææïåçåååçååååéçèæå\n"
-"ã%sãã"
 
 #: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
@@ -10936,448 +10985,467 @@ msgstr "ååæççåæ(_W)â"
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "äçæåèæäåååéçéäçç(_W)"
 
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr "æææéäçæéçåæåèçäçéæèåéæçååéä"
+
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "åèçéäèååçäåèååèå(_M)"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "çåéååéäæäååæè(_F)"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "äååéåæ (cc) ç(_S):"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "äååéåäåæ (bcc) ç(_B):"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ååææéääæçåçååèçåçå(_T)"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "çåéååéäææéèæåå(_M)"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "æéèæèäåæ(_D)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr "åææèæååççåçæèèåå(_V)"
 
-#: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1060
 msgid "Authentication"
 msgstr "éè"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "èåæåèæçè(_E)"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "åçé(_H):"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "ææææçéå(_E) "
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "äèéæéææååéä(_S)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new _messages on start"
 msgstr "ååææææéä(_M)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check for new messa_ges in all active accounts"
 msgstr "ææææäçäåèçæéä(_G)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "ææåééäæåçååéä(_M)"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "çæèåææææå(_T)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "æé(_A)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "æé(_R)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "æéåçéè(_M):"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "æåçèéä"
 
-#: ../mail/mail-config.ui.h:27
-#: ../modules/plugin-manager/evolution-plugin-manager.c:157
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
 msgid "Configuration"
 msgstr "çæ"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "åéèæåæçè(_W)"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Confirmations"
 msgstr "çè"
 
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:155
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:159
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Date/Time Format"
 msgstr "ææ/æåæå"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Default Behavior"
 msgstr "éèèç"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "éèåççç(_N):"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "åééä"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "ééæåéååéä(_X)"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "çåéçéäåäæççç [éèå](_U)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "éççéäæé"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "èåäèåæçéèéäåäèåéäæèçååéä(_K)"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "ääçåæ"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "èçå(_F):"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "éåéääå(_A):"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "ééææçåæçèæå(_X)"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "ååèæ(_P):"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "åååéçéä (éèå)(_E)"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "F_all back to threading messages by subject"
 msgstr "éååææäæççééä(_A)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed Width Font:"
 msgstr "ååéååå(_E):"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "åéäæååç _HTML"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "åå(_E):"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "åæåèïççåèåçæéäèå"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML éä"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP äçäæå:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
+msgid "Header content"
+msgstr "æéåå"
+
+#: ../mail/mail-config.ui.h:57
+msgid "Header name"
+msgstr "æéåç"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "æé"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "åèåæç(_Q)"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "åçéäèåç Reply-To:"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "èå"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "èåïOutlook éæï"
 
-#: ../mail/mail-config.ui.h:61
-#: ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æç"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "èèè"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "æåèååç"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "éäæéè"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "äçäç"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "éäéç"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "éäåæ"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "ææäçäæåç(_P):"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "åææåçåçèéååéäæééåééåæèåçã"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "éææçèè"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "åé(_G):"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG åçå ID:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "åç(_W):"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:79
 #: ../modules/calendar/e-calendar-preferences.ui.h:23
 msgid "Pick a color"
 msgstr "æééè"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "éæå:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "ååçéæ (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "Proxy Settings"
 msgstr "äçäæåèåå"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Quoted"
 msgstr "åæ"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "èäåç(_M)"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "åèåå(_P):"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "èäåç(_P)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
 msgid "Replies and Forwards"
 msgstr "åèåèå"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Required Information"
 msgstr "åèçèè"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "æ Evolution çæäææ SSL"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "åæåæåçéèéäçåäèçç(_E)"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "éå(_E)â"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "åééäåæ(_E):"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "ææåå(_T):"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "ååå MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "éæ HTML ååéååå"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "éæ HTML åèéååå"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "åäèçç"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:106
 msgid "Sending a _private reply to a mailing list message"
 msgstr "åéçäåèåéäèå(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:108
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "åéçææèåææéåéäååçæäè(_R)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:110
 msgid "Sending a message with an _empty subject line"
 msgstr "åéææäæçéä(_E)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:112
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "åéåææååäåææäèçéä(_B)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr "åéæåéæäèçéä(_N)"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "åééäèæå(_M):"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "äæåèæéè(_V)"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
 msgstr "äæåçæ"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
 msgstr "äæåéå(_T):"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:119
+msgid "Set custom junk header"
+msgstr "èåèéååéäæé"
+
+#: ../mail/mail-config.ui.h:120
 msgid "Si_gning algorithm:"
 msgstr "ççæçæ(_G):"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "çåæ(_N)"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "ççèæ(_N):"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "çåæ(_U):"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "çåæ"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:125
 msgid "Signing _algorithm:"
 msgstr "ççæçæ(_A):"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:126
 msgid "Special Folders"
 msgstr "çæèæå"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "æåææ"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "åèæååééåèå(_T)"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:129
 msgid "Start up"
 msgstr "åå"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "éå(_Y):"
 
-#: ../mail/mail-config.ui.h:128
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+#: ../mail/mail-config.ui.h:132
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr "éèçèèæåååæååçåèååçèèã"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11387,11 +11455,13 @@ msgstr ""
 "çåæãäæåçåçåæäç\n"
 "éçäçã"
 
-#: ../mail/mail-config.ui.h:132
-msgid "To help avoid email accidents and embarrassments, ask for confirmation before taking the following checkmarked actions:"
+#: ../mail/mail-config.ui.h:136
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
 msgstr "èéåéåéäåçæåæääéåçææïåéèäååæååäæèåäçèäååçèï"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11399,144 +11469,141 @@ msgstr ""
 "èåæçääèéååèçåçã\n"
 "äåïãåäãæãåäã"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "äçèåç(_E):"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "äçéè(_N)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:141
 msgid "User _Name:"
 msgstr "äçèåç(_N):"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "ååçåæ(_A)"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "äåèççäèåç(_A)"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "éèéå(_A)"
 
-#: ../mail/mail-config.ui.h:141
-msgid "_Default junk plugin:"
-msgstr "éèååéäåæçå(_D):"
-
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:145
 msgid "_Direct connection to the Internet"
 msgstr "çæéçåäèç(_D)"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "äççæèéè (ååæ _Outlook)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "èåæå(_F):"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
 msgstr "ååéäèæå(_J):"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr "åäæäçååéäççç(_K)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "èè(_L)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
 msgstr "åèåçèçäååéääçåç(_L)"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "ååæåéèéæè(_L)"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "èçæçéèåè(_M)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "æåäçäæåçæ(_M):"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "äåäèççäèåç(_N)"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:157
 msgid "_Path:"
 msgstr "èå(_P):"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "éæå(_P):"
+
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "çåé HTML éäçäææåéééäçèçäæéçæç(_P)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "åèæå(_R):"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "åäç(_S):"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "åå HTTP äçäæå(_S):"
 
-#: ../mail/mail-config.ui.h:160
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "äæå(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
 msgstr "ææåçåç(_S)"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "åéäéèéçåäèçç(_S)"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
 msgstr "åæçèæå(_T):"
 
-#: ../mail/mail-config.ui.h:165
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
 msgstr "äçååéç(_U):"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "äçççéèå(_U)"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "äçèåäæççåçåçåå(_U)"
 
-#: ../mail/mail-config.ui.h:168
-#: ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:169
-#: ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "èå"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "æè"
 
@@ -11556,63 +11623,64 @@ msgstr "æææåçèæå"
 msgid "Call"
 msgstr "ååäç"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "ååæ(_M)"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "æççç"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "äèèå"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
 msgstr "åå"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "èé"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "çäçèè"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "èå"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "ææåç"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "äéèåæ"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "åèåé"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "æé"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "æåèæåäæ"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "äåæèè"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "æåçèæå"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -11620,23 +11688,23 @@ msgstr ""
 "äéæèèéçéäååäéååã\n"
 "èåãæåãéåäéæèéçåäã"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "æåææ(_A)"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "åææ(_D):"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "æå(_F):"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "éåæéäæåææåç(_T)"
 
-#: ../mail/mail-folder-cache.c:789
+#: ../mail/mail-folder-cache.c:767
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -11645,210 +11713,141 @@ msgstr "Pinging %s"
 msgid "Filtering Selected Messages"
 msgstr "éæéæçéä"
 
-#: ../mail/mail-ops.c:226
+#: ../mail/mail-ops.c:205
 msgid "Fetching Mail"
 msgstr "ææéä"
 
-#: ../mail/mail-ops.c:785
+#: ../mail/mail-ops.c:820
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æååééä %d / %d"
 
-#: ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:868
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "çæåéç %d åéä (å %d å)"
 
-#: ../mail/mail-ops.c:833
-#: ../mail/mail-send-recv.c:788
+#: ../mail/mail-ops.c:872 ../mail/mail-send-recv.c:824
 msgid "Canceled."
 msgstr "ååæã"
 
-#: ../mail/mail-ops.c:835
-#: ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:874 ../mail/mail-send-recv.c:826
 msgid "Complete."
 msgstr "åæã"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:984
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "åéäçåã%sã"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "åéäèèåã%sã"
 
-#: ../mail/mail-ops.c:1062
-#, c-format
-msgid "Scanning folders in '%s'"
-msgstr "ææã%sãåçèæå"
-
-#: ../mail/mail-ops.c:1178
-msgid "Forwarded messages"
-msgstr "åèåçéä"
-
-#: ../mail/mail-ops.c:1295
-#, c-format
-msgid "Retrieving quota information for folder '%s'"
-msgstr "ååèæåã%sãççéééèè"
-
-#: ../mail/mail-ops.c:1370
-#, c-format
-msgid "Opening store '%s'"
-msgstr "éåèèã%sã"
-
-#: ../mail/mail-ops.c:1446
-#, c-format
-msgid "Removing folder '%s'"
-msgstr "çéèæåã%sã"
-
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1102
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æåèèèæåã%sã"
 
-#: ../mail/mail-ops.c:1678
+#: ../mail/mail-ops.c:1176
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æçååååè '%s'"
 
-#: ../mail/mail-ops.c:1679
+#: ../mail/mail-ops.c:1177
 #, c-format
 msgid "Storing account '%s'"
 msgstr "åååè '%s'"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1239
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "éææçèæåã%sã"
 
-#: ../mail/mail-ops.c:1901
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "æåååèæåã%sã"
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æçã%sãçåæç"
 
-#: ../mail/mail-ops.c:1974
+#: ../mail/mail-ops.c:1491
 msgid "Local Folders"
 msgstr "ææèæå"
 
-#: ../mail/mail-ops.c:2147
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "åå %d åéä"
-msgstr[1] "åå %d åéä"
-
-#: ../mail/mail-ops.c:2240
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "åå %d åéä"
-msgstr[1] "åå %d åéä"
-
-#: ../mail/mail-ops.c:2336
-#, c-format
-msgid "Error saving messages to: %s:\n"
-msgstr "ååéäåï%s æççéèï\n"
-
-#: ../mail/mail-ops.c:2411
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "æååèã%sãéçåä"
-
-#: ../mail/mail-ops.c:2502
-msgid "Checking Service"
-msgstr "æææå"
-
-#: ../mail/mail-ops.c:2582
+#: ../mail/mail-ops.c:1589
 #, c-format
 msgid "Disconnecting %s"
 msgstr "æåäæ %s"
 
-#: ../mail/mail-ops.c:2639
-#, c-format
-msgid "Removing attachments"
-msgstr "æåçééä"
-
-#: ../mail/mail-ops.c:2686
-#, c-format
-msgid "File \"%s\" has been removed."
-msgstr "ææã%sãåçèçéã"
-
-#: ../mail/mail-send-recv.c:191
+#: ../mail/mail-send-recv.c:197
 msgid "Canceling..."
 msgstr "æååæâ"
 
-#: ../mail/mail-send-recv.c:436
+#: ../mail/mail-send-recv.c:443
 msgid "Send & Receive Mail"
 msgstr "åéèææéä"
 
-#: ../mail/mail-send-recv.c:452
+#: ../mail/mail-send-recv.c:459
 msgid "Cancel _All"
 msgstr "åéåæ(_A)"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:963
 msgid "Updating..."
 msgstr "ææäâ"
 
-#: ../mail/mail-send-recv.c:569
-#: ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:680
 msgid "Waiting..."
 msgstr "æåçåâ"
 
-#: ../mail/mail-send-recv.c:903
+#: ../mail/mail-send-recv.c:943
 #, c-format
 msgid "Checking for new mail"
 msgstr "æææéä"
 
-#: ../mail/mail-tools.c:69
+#: ../mail/mail-tools.c:72
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "çæåçæåååçéã%sãï%s"
 
-#: ../mail/mail-tools.c:102
+#: ../mail/mail-tools.c:106
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "æååèçåé mbox äæã%sãçéä"
 
-#: ../mail/mail-tools.c:214
+#: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "èåçéä - %s"
 
-#: ../mail/mail-tools.c:216
+#: ../mail/mail-tools.c:217
 msgid "Forwarded message"
 msgstr "èåçéä"
 
-#: ../mail/mail-vfolder.c:86
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "èåæåèæåï %s"
 
-#: ../mail/mail-vfolder.c:235
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
-msgstr "ææ '%s:%s' çæåèæå"
-
-#: ../mail/mail-vfolder.c:242
+#: ../mail/mail-vfolder.c:238
 #, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "ææ '%s' çæåèæå"
+msgid "Updating Search Folders for '%s' : %s"
+msgstr "ææã%sãçæåèæåï%s"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
 #. * 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.
-#: ../mail/mail-vfolder.c:718
+#: ../mail/mail-vfolder.c:681
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted folder\n"
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
@@ -11857,12 +11856,8 @@ msgid_plural ""
 msgstr[0] ""
 "æåèæåã%sãåçäæïåçååçååååéçèæå\n"
 "ã%sãã"
-msgstr[1] ""
-"äåæåèæå\n"
-"%s åçææïåçåååçååååéçèæå\n"
-"ã%sãã"
 
-#: ../mail/mail-vfolder.c:1297
+#: ../mail/mail-vfolder.c:1294
 msgid "Edit Search Folder"
 msgstr "çèæåèæå"
 
@@ -11894,22 +11889,29 @@ msgstr "åçæåççã{1}ãçèæåååãèäçäåçåç
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit."
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
 msgstr ""
 "äæã{1}ãçéççèæååçååã\n"
 "\n"
 "äåäéæåçæèæåãèåæéååçååæèçæã"
 
 #: ../mail/mail.error.xml.h:9
-msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr "ã{1}ãåèæåéèäåæãæååéèäåæç {0}ï"
 
 #: ../mail/mail.error.xml.h:10
-msgid "A signature already exists with the name \"{0}\". Please specify a different name."
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr "åçæåççã{0}ãççåæååãèäçäåçåçã"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr "çéäåäææççäæïåäèæäèçéäçéäåäéäæéã"
 
 #: ../mail/mail.error.xml.h:12
@@ -11921,15 +11923,20 @@ msgid "Are you sure you want to delete this account?"
 msgstr "çåèåééååèï"
 
 #: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr "çåèåééååèäååææçäçäæåï"
 
 #: ../mail/mail.error.xml.h:15
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr "èæäçéææèæåäææåéçéäï"
 
 #: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
 msgstr "çåèæäçéèæåã{0}ãäææåéçéäï"
 
 #: ../mail/mail.error.xml.h:17
@@ -12005,7 +12012,9 @@ msgid "Cannot open target \"{2}\"."
 msgstr "äèéåçæã{2}ãã"
 
 #: ../mail/mail.error.xml.h:35
-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."
+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:36
@@ -12032,9 +12041,10 @@ msgstr "äèååèææã{0}ãã"
 msgid "Cannot set signature script \"{0}\"."
 msgstr "äèèåçåæåäçã{0}ãã"
 
-# (Abel) éççéæåäèä
 #: ../mail/mail.error.xml.h:42
-msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr "èææåçæåæåæçãèææïåååçåååååïäåèæä Caps Lockã"
 
 #: ../mail/mail.error.xml.h:43
@@ -12045,101 +12055,130 @@ msgstr "éééäèçã"
 msgid "Could not save signature file."
 msgstr "çæååççææã"
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "æååéæåèæåã{0}ãäçéäï"
-
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Disable"
 msgstr "äèåç(_N)"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Send"
 msgstr "äèåé(_N)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Synchronize"
 msgstr "äèåæ(_N)"
 
-#: ../mail/mail.error.xml.h:50
-msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
+#: ../mail/mail.error.xml.h:49
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
 msgstr "æåèåæåçåæéäæèçéçäççèæåï"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "æåèååéçéäæçæåéèï"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "èååæåçææï"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "èååçã"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "èåéæååçæççéèã"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "åèäææïççéèã"
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "ç {0} æççéèã"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 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 want to migrate now?\n"
+"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 "
+"want to migrate now?\n"
 "\n"
-"An mbox account will be created to preserve the old mbox folders. You can delete the account after ensuring the data is safely migrated. Please make sure there is enough disk space if you choose to migrate now."
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
 msgstr ""
 "éèçæåçååååçå mbox æèç Maildir æåãå Evolution ççåäçæåçéäåéèæçæçæåãäçåæåèèæï\n"
 "\n"
 "çåæåçäå mbox åèääçèç mbox èæåãäåäåçèèæéååèæåååååéãåæäéæèæïèçåæèåççéã"
 
-#: ../mail/mail.error.xml.h:63
-msgid "Evolution's local mail format has changed."
-msgstr "Evolution çæåçéäæååçæèäã"
+#: ../mail/mail.error.xml.h:62
+msgid "Evolution's local mail format has changed."
+msgstr "Evolution çæåçéäæååçæèäã"
+
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to download messages for offline viewing."
+msgstr "äèéçäççéäåæã"
+
+#: ../mail/mail.error.xml.h:64
+msgid "Failed to find duplicate messages."
+msgstr "æäåéèçéäã"
+
+#: ../mail/mail.error.xml.h:65
+msgid "Failed to open folder."
+msgstr "çæéåèæåã"
+
+#: ../mail/mail.error.xml.h:66
+msgid "Failed to remove attachments from messages."
+msgstr "çæçééääçéäã"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
+msgid "Failed to retrieve messages."
+msgstr "çæååéäã"
+
+#: ../mail/mail.error.xml.h:68
+msgid "Failed to save messages to disk."
+msgstr "çæåéåçéäååèççã"
+
+#: ../mail/mail.error.xml.h:69
 msgid "Failed to unsubscribe from folder."
 msgstr "çæåæèéèæåã"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:70
 msgid "File exists but cannot overwrite it."
 msgstr "ææååäçæèåã"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but is not a regular file."
 msgstr "ææååääæäèææã"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:73
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "èæåã{0}ãäæååääéèçéäã"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:74
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "åæäéæççïåçæååéäéäã"
 
-#: ../mail/mail.error.xml.h:70
-msgid "If you delete the folder, all of its contents and its subfolders' contents will be deleted permanently."
+#: ../mail/mail.error.xml.h:75
+msgid ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
 msgstr "åæäåéèæåïåçææååååèæåååææéåéã"
 
-#: ../mail/mail.error.xml.h:71
-msgid "If you delete the folder, all of its contents will be deleted permanently."
+#: ../mail/mail.error.xml.h:76
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
 msgstr "åæäéæåéèæåïåçææååææéæåã"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:77
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "åæççïææçäçäæååèææäåéã"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12147,145 +12186,166 @@ msgstr ""
 "åæççïèåèçèèäå\n"
 "åææçäçäæåææéåéã"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:80
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "åæççïåèèèææäåéã"
 
-#: ../mail/mail.error.xml.h:76
-msgid "If you quit, these messages will not be sent until Evolution is started again."
+#: ../mail/mail.error.xml.h:81
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr "åæäéæçæïåæåå Evolution äåïäæåééäéäã"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:82
 msgid "Ignore"
 msgstr "åç"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:83
 msgid "Invalid authentication"
 msgstr "çæçéè"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:84
 msgid "Mail Deletion Failed"
 msgstr "åééäåæ"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:85
 msgid "Mail filters automatically updated."
 msgstr "éäéæåèåææã"
 
-#: ../mail/mail.error.xml.h:81
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+#: ../mail/mail.error.xml.h:86
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr "ååéåéäççææå Apparently-To æéèåæåäåææäèçéäãåæååäææéïææéåçéääææçæäèãèéåæææïæèèåæåäåãæäèïãæãåæïãæäèã"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:87
+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:88
 msgid "Missing folder."
 msgstr "éæèæåã"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:90
 msgid "N_ever"
 msgstr "æä(_E)"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:91
 msgid "No duplicate messages found."
 msgstr "æäåéèçéäã"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:92
 msgid "No sources selected."
 msgstr "æéåäæã"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:93
 msgid "Opening too many messages at once may take a long time."
 msgstr "äæéåéåéäåèæèèèåæéã"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:94
 msgid "Please check your account settings and try again."
 msgstr "èææåèèåäåèäæã"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:95
 msgid "Please enable the account or send using another account."
 msgstr "èåçèåèæäçåäåèåéã"
 
-#: ../mail/mail.error.xml.h:90
-msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
+#: ../mail/mail.error.xml.h:96
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 msgstr "èåãæäèïãæäèåäåææçéåéäååãäåäæääèåæåæéçãæäèïãæéïæåéåéäååã"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:97
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}"
 msgstr ""
 "èçåääæäèåæääåäææ HTML éåéäï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:99
 msgid "Please provide an unique name to identify this signature."
 msgstr "èèååäèèéåçåæçççåçã"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:100
 msgid "Please wait."
 msgstr "èçåã"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:101
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "èçèéäèæåã{0}ãççåéã"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:102
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "åäæåæèææçéèæçææåã"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:103
 msgid "Read receipt requested."
 msgstr "èæèäåæã"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:104
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "çåèåéèæåã{0}ãäååææçåèæå?"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\"?"
 msgstr "çåèåéèæåã{0}ãï"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:106
 msgid "Remove duplicate messages?"
 msgstr "æåçééèçéäï"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:107
 msgid "Reply _Privately"
 msgstr "çäåè(_P)"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:110
 msgid "Search Folders automatically updated."
 msgstr "æåèæåèåææã"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:111
 msgid "Send private reply?"
 msgstr "æååéçäåèï"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:112
 msgid "Send reply to all recipients?"
 msgstr "æååèçææçæäèï"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:113
 msgid "Signature Already Exists"
 msgstr "çåæåçåå"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:114
 msgid "Synchronize folders locally for offline usage?"
 msgstr "æååæèæåääéçäçï"
 
-#: ../mail/mail.error.xml.h:109
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
+#: ../mail/mail.error.xml.h:115
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr "Evolution éèççèæåæèæåäæïèäèèæåäåäéæååãçåæåéã"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 "åéçèçäæåæèåæéèæåæäèã\n"
 "\n"
 "ååéåéäççææå Apparently-To æéèåæåäåææäèçéäãåææåææéïæåçéääææçæäèãèéåæææïäæèèåæåäåãæäèïãæãåæïãæäèã "
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12293,7 +12353,7 @@ msgstr ""
 "äåæäèçæèèçææçéåéäååï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12301,11 +12361,15 @@ msgstr ""
 "äåæäèçæèèçææçéåéäååï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:124
 msgid "The script file must exist and be executable."
 msgstr "åäçææåéååèäåäåèã"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:125
+msgid "These messages are not copies."
+msgstr "éäéääæèæã"
+
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12313,253 +12377,273 @@ msgstr ""
 "æèæååèåçèåæåã\n"
 "éèæïèçèæåèæåçèåïäæåæåæååã"
 
-#: ../mail/mail.error.xml.h:121
-msgid "This message cannot be sent because the account you chose to send with is not enabled"
+#: ../mail/mail.error.xml.h:128
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr "åçäææåçéæçäåéçåèïæäçæåéæéäã"
 
-#: ../mail/mail.error.xml.h:122
-msgid "This message cannot be sent because you have not specified any recipients"
+#: ../mail/mail.error.xml.h:129
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
 msgstr "åçäæææåääæäèïæäçæåéæéä"
 
-#: ../mail/mail.error.xml.h:123
-msgid "This server does not support this type of authentication and may not support authentication at all."
+#: ../mail/mail.error.xml.h:130
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr "æäæåäæææéèéåèäææäææéèã"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:131
 msgid "This signature has been changed, but has not been saved."
 msgstr "æççåçææïäåæååã"
 
-#: ../mail/mail.error.xml.h:125
-msgid "This will mark all messages as read in the selected folder and its subfolders."
+#: ../mail/mail.error.xml.h:132
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
 msgstr "éæåæçéåçèæååååèæåäææéäçåéèã"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:133
 msgid "This will mark all messages as read in the selected folder."
 msgstr "éæåæçéåçèæåäææéäçåéèã"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:134
 msgid "Unable to connect to the GroupWise server."
 msgstr "çæéçè GroupWise äæåã"
 
-#: ../mail/mail.error.xml.h:128
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+#: ../mail/mail.error.xml.h:135
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
 msgstr "çæéåæåèçèçèæåãæåäçççèçèæåäæï"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:136
 msgid "Unable to read license file."
 msgstr "çæèåææææã"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:137
+msgid "Unable to retrieve message."
+msgstr "çæææéäã"
+
+#: ../mail/mail.error.xml.h:138
 msgid "Use _Default"
 msgstr "äçéèå(_D)"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:139
 msgid "Use default drafts folder?"
 msgstr "äçéèçèçèæåï"
 
-#: ../mail/mail.error.xml.h:132
-msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
-"Do you really want to do this?"
-msgstr ""
-"èåïåæåèæåäåééäåæèäçæåæéçèæååéåéçéäã\n"
-"æåçåèééåï"
-
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:140
 msgid "Would you like to close the message window?"
 msgstr "äæèéééäèçåï"
 
-#: ../mail/mail.error.xml.h:135
-msgid "You are replying privately to a message which arrived via a mailing list, but the list is trying to redirect your reply to go back to the list. Are you sure you want to proceed?"
+#: ../mail/mail.error.xml.h:141
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
 msgstr "äæäçäåèäèéäèåçéäïäæéåéäèååèåäçåäååèåãäçåèççåï"
 
-#: ../mail/mail.error.xml.h:136
-msgid "You are replying to a message which arrived via a mailing list, but you are replying privately to the sender; not to the list. Are you sure you want to proceed?"
+#: ../mail/mail.error.xml.h:142
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
 msgstr "äæååèäèéäèåçéäïäæääçäåèæååçååäèïèéååéäèåãäçåèççåï"
 
-#: ../mail/mail.error.xml.h:137
-msgid "You are replying to a message which was sent to many recipients. Are you sure you want to reply to ALL of them?"
+#: ../mail/mail.error.xml.h:143
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
 msgstr "äæååèçääæåéçèåæäèãäçååäçäååéï"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:144
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "äææèåçæéåéæåéäã"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:145
 msgid "You have not filled in all of the required information."
 msgstr "äææååææåéçèèã"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:146
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "äææååçéäïäçèåäéèééåï"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:147
 msgid "You may not create two accounts with the same name."
 msgstr "ääèççåçåçåçåååèã"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:148
 msgid "You must name this Search Folder."
 msgstr "äåéååææåèæåã"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:149
 msgid "You must specify a folder."
 msgstr "äåéæåäåèæåã"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:150
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
 "äåéèåæåäåèæåçæäæã\n"
 "ååéåèæåïçå/æéåæææåèæåãææéçèæåæäèçéã"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:152
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "äçåäæåã{0}ãçåèçã{0}ãïäåæäã"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:153
 msgid "_Always"
 msgstr "çæ(_A)"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:154
 msgid "_Append"
 msgstr "æå(_A)"
 
-#: ../mail/mail.error.xml.h:149
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../mail/mail.error.xml.h:155
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "åç(_D)"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:156
 msgid "_Discard changes"
 msgstr "ææææ(_D)"
 
-#: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../mail/mail.error.xml.h:157
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "_Empty Trash"
 msgstr "æçåæç(_E)"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:158
 msgid "_Exit Evolution"
 msgstr "çæ _Evolution "
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:159
 msgid "_Expunge"
 msgstr "æé(_E)"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:160
 msgid "_Migrate Now"
 msgstr "çåèç(_M)"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:161
 msgid "_No"
 msgstr "å(_N)"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:162
 msgid "_Open Messages"
 msgstr "éåéä(_O)"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:165
 msgid "_Send Receipt"
 msgstr "åéåæ(_S)"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:166
 msgid "_Synchronize"
 msgstr "åæå(_S)"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:167
 msgid "_Yes"
 msgstr "æ(_Y)"
 
-#: ../mail/message-list.c:1215
+#: ../mail/mail.error.xml.h:168
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1211
 msgid "Unseen"
 msgstr "æéè"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1212
 msgid "Seen"
 msgstr "åéè"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1213
 msgid "Answered"
 msgstr "ååè"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1214
 msgid "Forwarded"
 msgstr "èå"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1215
 msgid "Multiple Unseen Messages"
 msgstr "ååæéèçéä"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1216
 msgid "Multiple Messages"
 msgstr "ååéä"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1220
 msgid "Lowest"
 msgstr "æä"
 
-#: ../mail/message-list.c:1225
+#: ../mail/message-list.c:1221
 msgid "Lower"
 msgstr "ä"
 
-#: ../mail/message-list.c:1229
+#: ../mail/message-list.c:1225
 msgid "Higher"
 msgstr "é"
 
-#: ../mail/message-list.c:1230
+#: ../mail/message-list.c:1226
 msgid "Highest"
 msgstr "æé"
 
-#: ../mail/message-list.c:1849
-#: ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1838 ../widgets/table/e-cell-date.c:48
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1856
-#: ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1845 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "äå %p %l:%M"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1854
 msgid "Yesterday %l:%M %p"
 msgstr "æå %p %l:%M"
 
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:1866
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../mail/message-list.c:1885
+#: ../mail/message-list.c:1874
 msgid "%b %d %l:%M %p"
 msgstr "%mæ%dæ %p %l:%M"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1876
 msgid "%b %d %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../mail/message-list.c:2672
+#: ../mail/message-list.c:2644
 msgid "Select all visible messages"
 msgstr "éæåéåèçéä"
 
-#: ../mail/message-list.c:2830
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2802 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "éä"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:3997
+msgid "Follow-up"
+msgstr "èé"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4506
-#: ../mail/message-list.c:4930
+#: ../mail/message-list.c:4501 ../mail/message-list.c:4920
 msgid "Generating message list"
 msgstr "ççéäæå"
 
-#: ../mail/message-list.c:4745
-msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+#: ../mail/message-list.c:4738
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
 msgstr "ææéäçåäçæåæäãåääçãæå->æéãéåéçäæéæåææèåã"
 
-#: ../mail/message-list.c:4747
+#: ../mail/message-list.c:4740
 msgid "There are no messages in this folder."
 msgstr "éåèæåäææéäã"
 
@@ -12588,7 +12672,7 @@ msgid "Sent Messages"
 msgstr "åééä"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:568
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Size"
 msgstr "åå"
 
@@ -12597,27 +12681,27 @@ msgid "Subject - Trimmed"
 msgstr "äæ - åæç"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../modules/mail/e-mail-shell-view-actions.c:1564
 msgid "Body contains"
 msgstr "åæåå"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1571
 msgid "Message contains"
 msgstr "éäåå"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1522
+#: ../modules/mail/e-mail-shell-view-actions.c:1578
 msgid "Recipients contain"
 msgstr "æäèåå"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1585
 msgid "Sender contains"
 msgstr "åäèåå"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1592
 msgid "Subject contains"
 msgstr "äæåå"
 
@@ -12625,61 +12709,78 @@ msgstr "äæåå"
 msgid "Subject or Addresses contains"
 msgstr "äææéåéääååå"
 
-#: ../modules/addressbook/addressbook-config.c:205
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+#: ../modules/addressbook/addressbook-config.c:207
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
 msgstr "éåæééèçïEvolution åæéçåäç LDAP äæå (åæäç LDAP äæåææ SSL)ã"
 
-#: ../modules/addressbook/addressbook-config.c:207
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+#: ../modules/addressbook/addressbook-config.c:209
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
 msgstr "éåæééèçïEvolution åæéçåäç LDAP äæå (åæäç LDAP äæåææ TLS)ã"
 
-#: ../modules/addressbook/addressbook-config.c:209
-msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
+#: ../modules/addressbook/addressbook-config.c:211
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
 msgstr "éåæééèçïäçäæåäææ SSL æ TLSãéèçäçéçåäååïèääçååæææã "
 
-#: ../modules/addressbook/addressbook-config.c:608
+#: ../modules/addressbook/addressbook-config.c:625
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "çæçæåéåçåæèäæ(_S)"
 
-#: ../modules/addressbook/addressbook-config.c:644
+#: ../modules/addressbook/addressbook-config.c:666
 msgid "Copy _book content locally for offline operation"
 msgstr "èèéèéååèæåçæéçäæ(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:751
-msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
+#: ../modules/addressbook/addressbook-config.c:778
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr "éæ LDAP äæåäçåïEvolution æåèéçåéååæãåæäææåæåãèæèäçççççåïçèäæèæåçåã"
 
-#: ../modules/addressbook/addressbook-config.c:825
-msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
+#: ../modules/addressbook/addressbook-config.c:857
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
 msgstr "éæ Evolution åèçäéèäçææãææèèåæéèãéåéääåãéèèååååäç LDAP äæåã"
 
-#: ../modules/addressbook/addressbook-config.c:900
-msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
+#: ../modules/addressbook/addressbook-config.c:937
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr "æåçåæåçäæåçççéæåäåäæåçæåããsubã(åé)çæåçåæåææååçåäææçéçããoneã(åä)çæåçååæåæåçåäçäååçã"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1058
 msgid "Server Information"
 msgstr "äæåèè"
 
-#: ../modules/addressbook/addressbook-config.c:1021
+#: ../modules/addressbook/addressbook-config.c:1063
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "èçèæ"
 
-#: ../modules/addressbook/addressbook-config.c:1022
-#: ../modules/mail/e-mail-shell-view.c:54
+#: ../modules/addressbook/addressbook-config.c:1064
+#: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "æåæå"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1066
 msgid "Downloading"
 msgstr "äèä"
 
-#: ../modules/addressbook/addressbook-config.c:1230
+#: ../modules/addressbook/addressbook-config.c:1272
 msgid "Address Book Properties"
 msgstr "éèéåå"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1274
 msgid "New Address Book"
 msgstr "æéèé"
 
@@ -12724,363 +12825,399 @@ msgid "Show autocompleted name with an address"
 msgstr "éçèåèéçååèäå"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "Show maps"
+msgstr "éçåå"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show preview pane"
 msgstr "éçéèçæ"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "The UID of the selected (or \"primary\") address book in the sidebar of the \"Contacts\" view."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
 msgstr "ãèçäãæèåéæäåéåïæãäèãïéèéç UIDã"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
-msgid "The layout style determines where to place the preview pane in relation to the contact list. \"0\" (Classic View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview pane next to the contact list."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
 msgstr "éçæåæåäåèçäæåäéèçæçäçãã0ãïæææèïåéèçææåèçäæåäæãã1ãïåçæèïåéèçææåèçäæåæéã"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
-msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
 msgstr "å Evolution åèèååæäåïåéèåçåçæçã"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog"
 msgstr "äæçæéååçåèççèæå URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
 msgstr "äæçæéååçåèççèæå URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
 msgstr "æåååéçåéçäèåèéçèçäååèéåéääåã"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Whether to show maps in preview pane."
+msgstr "æååéèçæäéçååã"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
 msgstr "æåéçéèçæã"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:161
-#: ../modules/mail/em-mailer-prefs.c:1140
+#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
 msgstr "èææ(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:164
+#: ../modules/addressbook/autocompletion-config.c:168
 msgid "Autocompletion"
 msgstr "èååæ"
 
-#: ../modules/addressbook/autocompletion-config.c:167
+#: ../modules/addressbook/autocompletion-config.c:171
 msgid "Always _show address of the autocompleted contact"
 msgstr "æééçèåèéçèçääå(_S)"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:94
-#: ../modules/addressbook/e-book-shell-migrate.c:153
+#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "å LDAP äæå"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "_Contact"
 msgstr "èçä(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "åçæçèçä"
 
-#: ../modules/addressbook/e-book-shell-backend.c:283
+#: ../modules/addressbook/e-book-shell-backend.c:291
 msgctxt "New"
 msgid "Contact _List"
 msgstr "èçäæå(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
-#: ../modules/addressbook/e-book-shell-view-actions.c:780
+#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "åçæçèçäæå"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:301
 msgctxt "New"
 msgid "Address _Book"
 msgstr "éèé(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:295
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "åçæéèé"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:312
-#: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:105
-#: ../modules/calendar/e-cal-shell-migrate.c:59
+#: ../modules/addressbook/e-book-shell-backend.c:320
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:364
 msgid "Contacts"
 msgstr "èçä"
 
-#: ../modules/addressbook/e-book-shell-backend.c:322
+#: ../modules/addressbook/e-book-shell-backend.c:330
 msgid "Certificates"
 msgstr "èæ"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:549
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
 msgstr "ååç vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
 msgstr "èèææçèçäå(_P)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Copy the contacts of the selected address book to another"
 msgstr "ååéåéèéäçèçäèèååäåéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "D_elete Address Book"
 msgstr "åééèé(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Delete the selected address book"
 msgstr "åééåçéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
 msgstr "åææçèçäçå(_V)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Move the contacts of the selected address book to another"
 msgstr "ååéåéèéäçèçäçåååäåéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
 msgstr "æåéèé(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address _Book Properties"
 msgstr "éèéåæ(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show properties of the selected address book"
 msgstr "éçéåéèéçåæ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
-#: ../modules/calendar/e-task-shell-view-actions.c:750
-#: ../modules/mail/e-mail-shell-view-actions.c:1155
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+msgid "Address Book _Map"
+msgstr "éèéåå(_M)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+msgid "Show map with all contacts from selected address book"
+msgstr "éçåéåéèéäææèçäçåå"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
+#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "_Rename..."
 msgstr "éæåå(_R)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Rename the selected address book"
 msgstr "éæååéåçéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-msgid "S_ave Address Book as vCard"
-msgstr "åéèéååç vC_ard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "ååéåéèéäçèçäååç vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Stop loading"
 msgstr "åæèå"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 msgid "_Copy Contact To..."
 msgstr "èèèçäå(_C)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Copy selected contacts to another address book"
 msgstr "åéåçèçäèèååäåéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
 msgstr "åéèçä(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "_Find in Contact..."
 msgstr "åèçäååæ(_F)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Search for text in the displayed contact"
 msgstr "æåéççèçääçæå"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
 msgstr "èåèçä(_F)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Send selected contacts to another person"
 msgstr "åééåèçäçåääçèã"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_Move Contact To..."
 msgstr "åèçäçå(_M)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:766
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move selected contacts to another address book"
 msgstr "åéåçèçäçèåäåéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
 msgstr "æåèçä(_N)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
 msgstr "æåèçäæå(_L)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Open Contact"
 msgstr "éåèçä(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:787
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
 msgstr "æèçåçèçä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
 msgstr "åééäçèçä(_S)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Send a message to the selected contacts"
 msgstr "åééäèéåçèçä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1502
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "_Actions"
 msgstr "åä(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
-#: ../modules/calendar/e-task-shell-view-actions.c:815
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "_Preview"
 msgstr "éè(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
-#: ../modules/calendar/e-memo-shell-view-actions.c:676
-#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-memo-shell-view-actions.c:677
+#: ../modules/calendar/e-task-shell-view-actions.c:829
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "_Properties"
 msgstr "åæ(_P)"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-msgid "_Save as vCard..."
-msgstr "ååæ _vCardâ"
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+msgid "Address Book Map"
+msgstr "éèéåå"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
 msgstr "èçäéè(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
 msgstr "éçèçäéèèç"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+msgid "Show _Maps"
+msgstr "éçåå(_M)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+msgid "Show maps in contact preview window"
+msgstr "åèçäéèèçéçåå"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "_Classic View"
 msgstr "åçæè(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview below the contact list"
 msgstr "åèçäæåäæéçèçäéè"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:904
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
 msgid "_Vertical View"
 msgstr "åçæè(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
 msgid "Show contact preview alongside the contact list"
 msgstr "åèçäæåæééçèçäéè"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1662
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Any Category"
 msgstr "ääåé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1676
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1677
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Unmatched"
 msgstr "ææççèæ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:966
-#: ../modules/mail/e-mail-shell-view-actions.c:1501
-#: ../shell/e-shell-content.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "ééæå"
 
-# zh_HK: msgstr "ååéåçéçä"
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "Print all shown contacts"
-msgstr "ååéåçéçä"
+msgstr "æåææéççèçä"
 
-# zh_HK: msgstr "éèåèååçéçä"
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 msgid "Preview the contacts to be printed"
-msgstr "éèåèååçéçä"
+msgstr "éèåèæåçèçä"
 
-# zh_HK: msgstr "ååéåçéçä"
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "Print selected contacts"
-msgstr "ååéåçéçä"
+msgstr "æååéåçèçä"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+msgid "S_ave Address Book as vCard"
+msgstr "åéèéååç vC_ard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "ååéåéèéäçèçäååç vCard"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "ååæ _vCardâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
 msgid "Save selected contacts as a vCard"
 msgstr "åéåçèçäååç vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Forward Contacts"
 msgstr "èåèçä(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contact"
 msgstr "èåèçä(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contacts"
 msgstr "åééäçèçä(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:380
+#: ../modules/addressbook/e-book-shell-view.c:384
 msgid "_Send Message to List"
 msgstr "åééäçæå(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:386
 msgid "_Send Message to Contact"
 msgstr "åééäçèçä(_S)"
 
-#: ../modules/addressbook/eab-composer-util.c:143
+#: ../modules/addressbook/eab-composer-util.c:147
 msgid "Multiple vCards"
 msgstr "åé vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:151
+#: ../modules/addressbook/eab-composer-util.c:155
 #, c-format
 msgid "vCard for %s"
 msgstr "%s ç vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:163
-#: ../modules/addressbook/eab-composer-util.c:190
+#: ../modules/addressbook/eab-composer-util.c:167
+#: ../modules/addressbook/eab-composer-util.c:194
 #, c-format
 msgid "Contact information"
 msgstr "èçäèè"
 
-#: ../modules/addressbook/eab-composer-util.c:192
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s çèçäèè"
@@ -13126,7 +13263,9 @@ msgid "Search _filter:"
 msgstr "æåéæå(_F):"
 
 #: ../modules/addressbook/ldap-config.ui.h:16
-msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr "æåéæåæåéèæåæäçççäéåãåææéææèäæïéèçæåçææãpersonãçäéåã"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
@@ -13155,12 +13294,8 @@ msgid "_Find Possible Search Bases"
 msgstr "åæåèçæååç(_F)"
 
 #: ../modules/addressbook/ldap-config.ui.h:25
-msgid "_Login method:"
-msgstr "çåææ(_L):"
-
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "éæå(_P):"
+msgid "_Login method:"
+msgstr "çåææ(_L):"
 
 #: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
@@ -13170,14 +13305,45 @@ msgstr "æåçå(_S):"
 msgid "_Timeout:"
 msgstr "æé(_T):"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "äçååéç(_U):"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "åç"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "çæçç Bogofilter (%s):ï"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr "çæåéäèæçååäæåè Bogofilterï"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr "Bogofilter åèçææçæèçéäèæ"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Bogofilter éé"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "åéäæåèæç _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "åéäèæç Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr "åéäæåèæç Unicode UTF-8 äçääèäååéç spam/ham çåã"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -13306,7 +13472,7 @@ msgid "Wee_k starts on:"
 msgstr "äééåæ(_K):"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Work Week"
 msgstr "åäé"
 
@@ -13418,7 +13584,8 @@ msgid "Calendars to run alarms for"
 msgstr "åèééçèäæ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "åæååäçäçè Marcus Bains ççèå(ççèçäçéèå)ã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
@@ -13522,7 +13689,9 @@ msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains çèåâæåå"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
-msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
 msgstr "åãday_second_zonesãæåäèèäçæèäçæåæççæååã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
@@ -13574,11 +13743,15 @@ msgid "Overdue tasks color"
 msgstr "éæçåäèå"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
-msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
 msgstr "æåçæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçèã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
 msgstr "æåçæçäçïåææèäçèçèææåèèäæãåäæåäéïäåçèã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
@@ -13594,15 +13767,21 @@ msgid "Position of the task preview pane when oriented vertically."
 msgstr "æåçåçæåäéèçæçäçã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
 msgstr "åççæçäçïåèäææåèææåèèäæäéã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
 msgstr "åççæçäçïåææèäçèçèææåèèäæãåäæåäéïäåçèã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
 msgstr "åççæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçèã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
@@ -13686,7 +13865,9 @@ msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "åææèãåäéæèåææåèéçéæ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
-msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
 msgstr "åæèååæåææèäéççäæåãæåéäæãtimezoneãèåéççæã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
@@ -13706,32 +13887,48 @@ msgid "Tasks due today color"
 msgstr "äååæåäçèå"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
-msgid "The UID of the selected (or \"primary\") calendar in the sidebar of the \"Calendar\" view."
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
 msgstr "ãèäæãæèåéæäåéåïæãäèãïéèéç UIDã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid "The UID of the selected (or \"primary\") memo list in the sidebar of the \"Memos\" view."
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
 msgstr "ãååéãæèåéæäåéåïæãäèãïéèéç UIDã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
-msgid "The UID of the selected (or \"primary\") task list in the sidebar of the \"Tasks\" view."
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
 msgstr "ãåäãæèåéæäåéåïæãäèãïéèéç UIDã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr "äççé/åçèæåéäçççåçæï%u èäéåéääåçäçèåçéåäåäïè %d èææççååçã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
-msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr "çæèäæäææèæåçéèæåïæçèç Olsen æåèæåäçåå \"America/New York\"ã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
-msgid "The layout style determines where to place the preview pane in relation to the memo list. \"0\" (Classic View) places the preview pane below the memo list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr "éçæåæåäåååéæåäéèçæçäçãã0ãïæææèïåéèçææåååéæåäæãã1ãïåçæèïåéèçææåååéæåæéã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid "The layout style determines where to place the preview pane in relation to the task list. \"0\" (Classic View) places the preview pane below the task list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr "éçæåæåäååäæåäéèçæçäçãã0ãïæææèïåéèçææååäæåäæãã1ãïåçæèïåéèçææååäæåæéã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
@@ -13739,7 +13936,9 @@ msgid "The second timezone for a Day View"
 msgstr "çæææèççäæå"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
 msgstr "éèåäçäçæåãã0ãçéèãã1ãçèåãã2ãçééèæã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
@@ -13758,19 +13957,19 @@ msgstr "æå"
 msgid "Twenty four hour time format"
 msgstr "24 åæåæå"
 
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
 msgstr "çæåéåçåææéçåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)ã"
 
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "éèæéåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)ã"
 
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "æåäæéèåäçåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)ã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
@@ -13806,7 +14005,9 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "æéçææåäææåèæçèã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
 msgstr "æååçææèäçéæïéæåäéäçéåèéæçæäåçääã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
@@ -13814,7 +14015,8 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "æååéåæçæèåéççæççææéã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "æååèäæäçå Marcus Bains çïäèçåæåçççïã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
@@ -13850,7 +14052,8 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "æååää/åä/æèçèåäéç çæ æä"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "æåäç 24 åæåæéèäæäçäå/äåã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
@@ -13885,422 +14088,434 @@ msgstr "åäæéååæ"
 msgid "Workday start minute"
 msgstr "åäæéååé"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:267
+#: ../modules/calendar/e-cal-attachment-handler.c:286
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "åå(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:348
+#: ../modules/calendar/e-cal-attachment-handler.c:367
 msgid "Select a Calendar"
 msgstr "éæèäæ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:375
+#: ../modules/calendar/e-cal-attachment-handler.c:394
 msgid "Select a Task List"
 msgstr "éæåäæå"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:404
 msgid "I_mport to Calendar"
 msgstr "ååèèäæ(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:392
+#: ../modules/calendar/e-cal-attachment-handler.c:411
 msgid "I_mport to Tasks"
 msgstr "ååèåä(_M)"
 
+#: ../modules/calendar/e-calendar-preferences.c:441
+msgid "Selected Calendars for Alarms"
+msgstr "éæééèäæ"
+
+#: ../modules/calendar/e-calendar-preferences.c:840
+msgid "Ti_me and date:"
+msgstr "æååææ(_M):"
+
+#: ../modules/calendar/e-calendar-preferences.c:841
+msgid "_Date only:"
+msgstr "åæææ(_D):"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:107
-#: ../modules/calendar/e-cal-shell-migrate.c:194
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:160
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:100
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:100
+#: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "åççä"
 
-#: ../modules/calendar/e-cal-shell-backend.c:109
-#: ../plugins/calendar-weather/calendar-weather.c:121
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../plugins/calendar-weather/calendar-weather.c:125
 msgid "Weather"
 msgstr "åæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:196
-#: ../modules/calendar/e-cal-shell-migrate.c:62
+#: ../modules/calendar/e-cal-shell-backend.c:202
+#: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "çæåéåçåæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:421
+#: ../modules/calendar/e-cal-shell-backend.c:423
 msgctxt "New"
 msgid "_Appointment"
 msgstr "çæ(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-backend.c:425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Create a new appointment"
 msgstr "åçäåæççæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:428
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "åæçæ(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:432
 msgid "Create a new all-day appointment"
 msgstr "åçæçåæçæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:435
+#: ../modules/calendar/e-cal-shell-backend.c:437
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æè(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgid "Create a new meeting request"
 msgstr "åçææèèæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-cal-shell-backend.c:447
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "èäæ(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-backend.c:449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Create a new calendar"
 msgstr "åçæèäæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:750
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../modules/calendar/e-cal-shell-backend.c:755
+#: ../plugins/itip-formatter/itip-formatter.c:2951
 msgid "Calendar and Tasks"
 msgstr "èäæèåä"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:221
+#: ../modules/calendar/e-cal-shell-sidebar.c:180
 msgid "Loading calendars"
 msgstr "æåèåèäæ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:636
+#: ../modules/calendar/e-cal-shell-sidebar.c:721
 msgid "_New Calendar..."
 msgstr "æåèäæ(_N)â"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:653
+#: ../modules/calendar/e-cal-shell-sidebar.c:738
 msgid "Calendar Selector"
 msgstr "èäæéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:998
+#: ../modules/calendar/e-cal-shell-sidebar.c:1087
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "éåå %s çèäæ"
 
-# zh_HK: msgstr "åå"
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view-actions.c:222
+#: ../modules/calendar/e-cal-shell-view-actions.c:251
 msgid "Print"
-msgstr "åå"
+msgstr "æå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:306
-msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+#: ../modules/calendar/e-cal-shell-view-actions.c:310
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
 msgstr "æäæææäæåéæéåæééèçææääãåæäççïåçæååéäääã"
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:327
 msgid "Purge events older than"
 msgstr "æéææéææéçää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#: ../modules/calendar/e-cal-shell-view-actions.c:541
 msgid "Copying Items"
 msgstr "èèéç"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:816
 msgid "Moving Items"
 msgstr "çåéç"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1131
+#: ../modules/calendar/e-cal-shell-view-actions.c:1143
 msgid "event"
 msgstr "ää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1133
-#: ../modules/calendar/e-cal-shell-view-memopad.c:216
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:510
-#: ../modules/calendar/e-task-shell-view-actions.c:627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1145
+#: ../modules/calendar/e-cal-shell-view-memopad.c:220
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:511
+#: ../modules/calendar/e-task-shell-view-actions.c:628
 msgid "Save as iCalendar"
 msgstr "ååç iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1290
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "_Copy..."
 msgstr "èè(_C)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
 msgid "D_elete Calendar"
 msgstr "åéèäæ(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Delete the selected calendar"
 msgstr "åééåçèäæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Go Back"
 msgstr "åå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Go Forward"
 msgstr "åå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Select today"
 msgstr "éåäæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
 msgid "Select _Date"
 msgstr "éæææ(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1339
 msgid "Select a specific date"
 msgstr "éåçåææ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "_New Calendar"
 msgstr "æåèäæ(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-task-shell-view-actions.c:800
 msgid "Purg_e"
 msgstr "æé(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Purge old appointments and meetings"
 msgstr "åéèçæåæè"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1353
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
 msgid "Re_fresh"
 msgstr "éææç(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Refresh the selected calendar"
 msgstr "éææçéåçèäæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Rename the selected calendar"
 msgstr "éæååéåçèäæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Show _Only This Calendar"
 msgstr "åéçéåèäæ(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Cop_y to Calendar..."
 msgstr "èèèèäæ(_Y)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_Delegate Meeting..."
 msgstr "åææè(_D)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "_Delete Appointment"
 msgstr "åéçæ(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete selected appointments"
 msgstr "åééåççæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Delete This _Occurrence"
 msgstr "åééæçççää(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Delete this occurrence"
 msgstr "åéæéæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Delete All Occ_urrences"
 msgstr "åéææçççää(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "Delete all occurrences"
 msgstr "åéåééæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New All Day _Event..."
 msgstr "æåååää(_E)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new all day event"
 msgstr "åçæçååää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "_Forward as iCalendar..."
 msgstr "ä iCale_ndar èåâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "New _Meeting..."
 msgstr "æåæè(_M)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new meeting"
 msgstr "åçæçæè"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Mo_ve to Calendar..."
 msgstr "çèèäæ(_V)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "New _Appointment..."
 msgstr "æåçæ(_A)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Make this Occurrence _Movable"
 msgstr "åéåääæçæåçå(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Open Appointment"
 msgstr "éåçæ(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../modules/calendar/e-cal-shell-view-actions.c:1465
 msgid "View the current appointment"
 msgstr "æèçåççæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1458
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Reply"
 msgstr "åè(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-msgid "Save as iCalendar..."
-msgstr "ååç iCalendarâ"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "_Schedule Meeting..."
 msgstr "æèæç(_S)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts an appointment to a meeting"
 msgstr "åçæèæçæè"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Conv_ert to Appointment..."
 msgstr "èæççæ(_E)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Converts a meeting to an appointment"
 msgstr "åæèèæççæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Quit"
 msgstr "çæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Day"
 msgstr "å"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show one day"
 msgstr "éçäå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "List"
 msgstr "æå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show as list"
 msgstr "éçææå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Month"
 msgstr "æ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one month"
 msgstr "éçäåæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Week"
 msgstr "é"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one week"
 msgstr "éçäé"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-cal-shell-view-actions.c:1648
 msgid "Show one work week"
 msgstr "éçäååäé"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
 msgid "Active Appointments"
 msgstr "éèäççæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
 msgid "Next 7 Days' Appointments"
 msgstr "æä 7 åççæ(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1700
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Description contains"
 msgstr "æèåå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1707
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Summary contains"
 msgstr "äæåå"
 
-# zh_HK: msgstr "ååéåèäæ"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Print this calendar"
-msgstr "ååéåèäæ"
+msgstr "æåéåèäæ"
 
-# zh_HK: msgstr "éèåèååçèäæåå"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 msgid "Preview the calendar to be printed"
-msgstr "éèåèååçèäæåå"
+msgstr "éèåèæåçèäæ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1749
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+msgid "Save as iCalendar..."
+msgstr "ååç iCalendarâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1826
 msgid "Go To"
 msgstr "çè"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:214
-#: ../modules/calendar/e-memo-shell-view-actions.c:508
+#: ../modules/calendar/e-cal-shell-view-memopad.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:509
 msgid "memo"
 msgstr "ååé"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-memopad.c:261
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "New _Memo"
 msgstr "æåååé(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "Create a new memo"
 msgstr "åçæçååé"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-memopad.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
 msgid "_Open Memo"
 msgstr "éåååé(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:266
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:270
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 msgid "View the selected memo"
 msgstr "æèéåçååé"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Open _Web Page"
 msgstr "éåçé(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:290
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-cal-shell-view-memopad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the selected memo"
 msgstr "æåéåçååé"
 
@@ -14308,252 +14523,237 @@ msgstr "æåéåçååé"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
-#: ../modules/calendar/e-task-shell-view-actions.c:625
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:285
+#: ../modules/calendar/e-task-shell-view-actions.c:626
 msgid "task"
 msgstr "åä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:320
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Assign Task"
 msgstr "ææåä(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "_Mark as Complete"
 msgstr "æççåæ(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:336
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as complete"
 msgstr "åéåçåäæçæåæ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:341
 msgid "_Mark as Incomplete"
 msgstr "æççæåæ(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:343
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Mark selected tasks as incomplete"
 msgstr "åéåçåäæçææåæ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "New _Task"
 msgstr "æååä(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:282
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:350
+#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Create a new task"
 msgstr "åçäåæçåä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "_Open Task"
 msgstr "éååä(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:357
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "View the selected task"
 msgstr "æèéåçåä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
-msgid "_Save as iCalendar..."
-msgstr "ååç iCalendar[_S]â"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
+#: ../modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Print the selected task"
 msgstr "æåéåçåä"
 
-#: ../modules/calendar/e-calendar-preferences.c:437
-msgid "Selected Calendars for Alarms"
-msgstr "éæééèäæ"
-
-#: ../modules/calendar/e-calendar-preferences.c:836
-msgid "Ti_me and date:"
-msgstr "æååææ(_M):"
-
-#: ../modules/calendar/e-calendar-preferences.c:837
-msgid "_Date only:"
-msgstr "åæææ(_D):"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-task-shell-view-actions.c:1029
+msgid "_Save as iCalendar..."
+msgstr "ååç iCalendar[_S]â"
 
-#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-backend.c:285
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ååé(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:288
+#: ../modules/calendar/e-memo-shell-backend.c:292
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "åçååé(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:290
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgid "Create a new shared memo"
 msgstr "åçæçåçååé"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-backend.c:302
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ååéæå(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "Create a new memo list"
 msgstr "åçæååéæå"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:216
+#: ../modules/calendar/e-memo-shell-sidebar.c:175
 msgid "Loading memos"
 msgstr "æåèåååé"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:578
+#: ../modules/calendar/e-memo-shell-sidebar.c:662
 msgid "Memo List Selector"
 msgstr "ååéæåéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:885
+#: ../modules/calendar/e-memo-shell-sidebar.c:973
 #, c-format
 msgid "Opening memos at %s"
 msgstr "éåå %s çååé"
 
-# zh_HK: msgstr "ååååé"
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:222
+#: ../modules/calendar/e-memo-shell-view-actions.c:237
 msgid "Print Memos"
-msgstr "ååååé"
+msgstr "æåååé"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Delete Memo"
 msgstr "åéååé(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
 msgid "_Find in Memo..."
 msgstr "åååéååæ(_F)â"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Search for text in the displayed memo"
 msgstr "æåéççååéäçæå"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "D_elete Memo List"
 msgstr "åéååéæå(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Delete the selected memo list"
 msgstr "åééåçååéæå"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_New Memo List"
 msgstr "æåååéæå(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Refresh the selected memo list"
 msgstr "éææçéåçååéæå"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:629
 msgid "Rename the selected memo list"
 msgstr "éæååéåçååéæå"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "Show _Only This Memo List"
 msgstr "åéçæååéæå(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:712
+#: ../modules/calendar/e-memo-shell-view-actions.c:713
 msgid "Memo _Preview"
 msgstr "ååééè(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-memo-shell-view-actions.c:715
 msgid "Show memo preview pane"
 msgstr "éçååééèçæ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview below the memo list"
 msgstr "åååéæåäæéçååééè"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
 msgid "Show memo preview alongside the memo list"
 msgstr "åååéæåæééçååééè"
 
-# zh_HK: msgstr "ååååéæå"
-#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Print the list of memos"
-msgstr "ååååéæå"
+msgstr "æåååéæå"
 
-# zh_HK: msgstr "éèåèååçååéæå"
-#: ../modules/calendar/e-memo-shell-view-actions.c:807
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Preview the list of memos to be printed"
-msgstr "éèåèååçååéæå"
+msgstr "éèåèæåçååéæå"
+
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "åéååé"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "åéååé"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d éååé"
-msgstr[1] "%d éååé"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
-#: ../modules/calendar/e-task-shell-view-private.c:575
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:573
 #, c-format
 msgid "%d selected"
 msgstr "åéæ %d å"
 
-#: ../modules/calendar/e-memo-shell-view.c:223
-msgid "Delete Memos"
-msgstr "åéååé"
-
-#: ../modules/calendar/e-memo-shell-view.c:225
-msgid "Delete Memo"
-msgstr "åéååé"
-
-#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgctxt "New"
 msgid "_Task"
 msgstr "åä(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:287
+#: ../modules/calendar/e-task-shell-backend.c:291
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ææçåä(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:289
+#: ../modules/calendar/e-task-shell-backend.c:293
 msgid "Create a new assigned task"
 msgstr "åçææåçåä"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-backend.c:301
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "åäæå(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:299
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "Create a new task list"
 msgstr "åçæåäæå"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:216
+#: ../modules/calendar/e-task-shell-sidebar.c:175
 msgid "Loading tasks"
 msgstr "æåèååä"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:578
+#: ../modules/calendar/e-task-shell-sidebar.c:662
 msgid "Task List Selector"
 msgstr "åäæåéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:885
+#: ../modules/calendar/e-task-shell-sidebar.c:973
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "éåå %s çåä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:245
+#: ../modules/calendar/e-task-shell-view-actions.c:260
 msgid "Print Tasks"
 msgstr "æååä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:569
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
@@ -14561,614 +14761,570 @@ msgstr ""
 "\n"
 "çåæééäåäï"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:577
+msgid "Do not ask me again"
+msgstr "äèåèåæ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Delete Task"
 msgstr "åéåä(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Find in Task..."
 msgstr "ååäååæ(_F)â"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-task-shell-view-actions.c:704
 msgid "Search for text in the displayed task"
 msgstr "æåéççåääçæå"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Copy..."
 msgstr "èèâ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "D_elete Task List"
 msgstr "åéåäæå(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Delete the selected task list"
 msgstr "åééåçåäæå"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "_New Task List"
 msgstr "æååäæå(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Refresh the selected task list"
 msgstr "éææçéåçåäæå"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/calendar/e-task-shell-view-actions.c:753
 msgid "Rename the selected task list"
 msgstr "éæååéåçåäæå"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Show _Only This Task List"
 msgstr "åéçæåäæå(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "Mar_k as Incomplete"
 msgstr "æççæåæ(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "Delete completed tasks"
 msgstr "åéååæçåä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:876
+#: ../modules/calendar/e-task-shell-view-actions.c:877
 msgid "Task _Preview"
 msgstr "åäéè(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:878
+#: ../modules/calendar/e-task-shell-view-actions.c:879
 msgid "Show task preview pane"
 msgstr "éçåäéèçæ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview below the task list"
 msgstr "ååäæåäæéçåäéè"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:906
+#: ../modules/calendar/e-task-shell-view-actions.c:907
 msgid "Show task preview alongside the task list"
 msgstr "ååäæåæééçåäéè"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Active Tasks"
 msgstr "éèäçåä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Completed Tasks"
 msgstr "ååæçåä "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Next 7 Days' Tasks"
 msgstr "æä 7 åçåä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Overdue Tasks"
 msgstr "éæçåä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Tasks with Attachments"
 msgstr "æéäçåä"
 
-# zh_HK: msgstr "åååäæå"
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Print the list of tasks"
-msgstr "åååäæå"
+msgstr "æååäæå"
 
-# zh_HK: msgstr "éèåèååçåäæå"
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Preview the list of tasks to be printed"
-msgstr "éèåèååçåäæå"
+msgstr "éèåèæåçåäæå"
 
-#: ../modules/calendar/e-task-shell-view-private.c:468
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "åéåä"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "åéåä"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "éåä"
 
-#: ../modules/calendar/e-task-shell-view-private.c:571
+#: ../modules/calendar/e-task-shell-view-private.c:569
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d éåä"
-msgstr[1] "%d éåä"
 
-#: ../modules/calendar/e-task-shell-view.c:358
-msgid "Delete Tasks"
-msgstr "åéåä"
+#: ../modules/mail/em-account-prefs.c:218
+msgid "Evolution Account Assistant"
+msgstr "Evolution åèåç"
 
-#: ../modules/calendar/e-task-shell-view.c:360
-msgid "Delete Task"
-msgstr "åéåä"
+#: ../modules/mail/em-account-prefs.c:267
+msgid "Account Editor"
+msgstr "åèçèå"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:382
+#: ../modules/mail/e-mail-attachment-handler.c:384
 #, c-format
 msgid "%d attached messages"
 msgstr "%d åéåçéä"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "ææ"
-
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "éäèæ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:185
+#: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
 msgstr "çèæçéäèæ"
 
-#: ../modules/mail/e-mail-shell-backend.c:193
+#: ../modules/mail/e-mail-shell-backend.c:205
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "éäèæå(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
 msgstr "åçæéäèæå"
 
-#: ../modules/mail/e-mail-shell-backend.c:494
+#: ../modules/mail/e-mail-shell-backend.c:408
 msgid "Mail Accounts"
 msgstr "éäåè"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:416
 msgid "Mail Preferences"
 msgstr "éäååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:510
+#: ../modules/mail/e-mail-shell-backend.c:424
 msgid "Composer Preferences"
 msgstr "éäçèåååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:518
+#: ../modules/mail/e-mail-shell-backend.c:432
 msgid "Network Preferences"
 msgstr "ççååèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
-#: ../modules/mail/e-mail-shell-view.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view.c:945
 msgid "_Disable Account"
 msgstr "åçåè(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "Disable this account"
 msgstr "åçéååè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æäçéåææèæååçååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1078
-msgid "C_reate Search Folder From Search..."
-msgstr "åæååçæåèæå(_R)â"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1085
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "_Download Messages for Offline Usage"
 msgstr "äèéçäççéä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "äèæèçéçäççåèèèæåäéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1092
+#: ../modules/mail/e-mail-shell-view-actions.c:1138
 msgid "Fl_ush Outbox"
 msgstr "æçåäå(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "_Copy Folder To..."
 msgstr "èèèæåå(_C)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid "Copy the selected folder into another folder"
 msgstr "èèåéåçèæåååäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1108
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Permanently remove this folder"
 msgstr "æäçééåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1113
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "E_xpunge"
 msgstr "åé(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æäçéåéåèæååååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1120
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Mar_k All Messages as Read"
 msgstr "æçææéäçåéè(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "Mark all messages in the folder as read"
 msgstr "åèæåäåéçéäæçæåéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "_Move Folder To..."
 msgstr "çåèæåå(_M)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1175
 msgid "Move the selected folder into another folder"
 msgstr "åéåçèæåçèåäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1134
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "_New..."
 msgstr "æå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "Create a new folder for storing mail"
 msgstr "åçäåæèæåäååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Change the properties of this folder"
 msgstr "ææéåèæåçåæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1150
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "Refresh the folder"
 msgstr "éæèåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "Change the name of this folder"
 msgstr "ææéåèæåçåç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Select Message _Thread"
 msgstr "éæéäæé(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
 msgid "Select all messages in the same thread as the selected message"
 msgstr "éæææçéçéäçéåçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Select Message S_ubthread"
 msgstr "éæéäåçç(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Select all replies to the currently selected message"
 msgstr "éæææåèéåéäçä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1183
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "Empty _Trash"
 msgstr "æçåæç(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æäçéåææåèååéååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "_New Label"
 msgstr "æåæç(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "N_one"
 msgstr "ææ(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "_Manage Subscriptions"
 msgstr "ççèé(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "èéæåæèéåéçäæåçèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Send / _Receive"
 msgstr "åé/ææ(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Send queued items and retrieve new items"
 msgstr "åéåéçéçäæææçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "R_eceive All"
 msgstr "åéææ(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Receive new items from all accounts"
 msgstr "ææåææåèåçæéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "_Send All"
 msgstr "åéåé(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Send queued items in all accounts"
 msgstr "åéåææåèååéçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
-#: ../widgets/misc/e-activity-proxy.c:306
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "Cancel the current mail operation"
 msgstr "åæçåéäæäçèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Collapse All _Threads"
 msgstr "ææææçééä(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "Collapse all message threads"
 msgstr "ææææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1276
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "E_xpand All Threads"
 msgstr "åéææçééä(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "Expand all message threads"
 msgstr "åéææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1283
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "_Message Filters"
 msgstr "éäèå(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 msgid "Create or edit rules for filtering new mail"
 msgstr "çæéäåçæçèéæèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1290
-msgid "Search F_olders"
-msgstr "æåèæå(_O)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
-msgid "Create or edit search folder definitions"
-msgstr "åçæçèæåèæåçåç"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1297
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_Subscriptions..."
 msgstr "èé(_S)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "F_older"
 msgstr "èæå(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "_Label"
 msgstr "æç(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1353
+#: ../modules/mail/e-mail-shell-view-actions.c:1369
+msgid "C_reate Search Folder From Search..."
+msgstr "åæååçæåèæå(_R)â"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+msgid "Search F_olders"
+msgstr "æåèæå(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
+msgid "Create or edit search folder definitions"
+msgstr "åçæçèæåèæåçåç"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1409
 msgid "_New Folder..."
 msgstr "æåèæå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1381
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
 msgid "Show Message _Preview"
 msgstr "éçéäéè(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1383
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "Show message preview pane"
 msgstr "éçéäéèçæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "Show _Deleted Messages"
 msgstr "éçååééä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1447
 msgid "Show deleted messages with a line through them"
 msgstr "éçååéçéä (åäåéç)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1397
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "_Group By Threads"
 msgstr "ææçééäççç(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1455
 msgid "Threaded message list"
 msgstr "çééäæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1420
+#: ../modules/mail/e-mail-shell-view-actions.c:1476
 msgid "Show message preview below the message list"
 msgstr "åéäæåäæéçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "Show message preview alongside the message list"
 msgstr "åéäæåæééçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "All Messages"
 msgstr "ææéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
 msgid "Important Messages"
 msgstr "éèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
 msgid "Last 5 Days' Messages"
 msgstr "æè 5 åçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "Messages Not Junk"
 msgstr "éååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Messages with Attachments"
 msgstr "æéäçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
 msgid "No Label"
 msgstr "çæç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1533
 msgid "Read Messages"
 msgstr "åèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../modules/mail/e-mail-shell-view-actions.c:1540
 msgid "Recent Messages"
 msgstr "æèçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1547
 msgid "Unread Messages"
 msgstr "æèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1599
 msgid "Subject or Addresses contain"
 msgstr "äææéåéääååå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1609
 msgid "All Accounts"
 msgstr "ææçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1560
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
 msgid "Current Account"
 msgstr "çåçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Current Folder"
 msgstr "çåçèæå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1049
+#: ../modules/mail/e-mail-shell-view.c:559
+msgid "All Account Search"
+msgstr "ææçåèæå"
+
+#: ../modules/mail/e-mail-shell-view.c:732
+msgid "Account Search"
+msgstr "åèæå"
+
+#: ../modules/mail/e-mail-shell-view.c:943
+msgid "Proxy _Logout"
+msgstr "çåäçäæå(_L)"
+
+#: ../modules/mail/e-mail-shell-view-private.c:996
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "åéæ %d åï"
-msgstr[1] "åéæ %d åï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1007
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d åååé"
-msgstr[1] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1013
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ååå"
-msgstr[1] "%d ååå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d åèç"
-msgstr[1] "%d åèç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1085
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d åæåé"
-msgstr[1] "%d åæåé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1091
+#: ../modules/mail/e-mail-shell-view-private.c:1038
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d åååé"
-msgstr[1] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1050
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d åæèï"
-msgstr[1] "%d åæèï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../modules/mail/e-mail-shell-view-private.c:1053
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å %d å"
-msgstr[1] "å %d å"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1126
+#: ../modules/mail/e-mail-shell-view-private.c:1073
 msgid "Trash"
 msgstr "åæç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1600
+#: ../modules/mail/e-mail-shell-view-private.c:1541
 msgid "Send / Receive"
 msgstr "åé/ææ"
 
-#: ../modules/mail/e-mail-shell-view.c:563
-msgid "All Account Search"
-msgstr "ææçåèæå"
-
-#: ../modules/mail/e-mail-shell-view.c:746
-msgid "Account Search"
-msgstr "åèæå"
-
-#: ../modules/mail/e-mail-shell-view.c:951
-msgid "Proxy _Logout"
-msgstr "çåäçäæå(_L)"
-
-#: ../modules/mail/em-account-prefs.c:215
-msgid "Evolution Account Assistant"
-msgstr "Evolution åèåç"
-
-#: ../modules/mail/em-account-prefs.c:264
-msgid "Account Editor"
-msgstr "åèçèå"
-
-#: ../modules/mail/em-composer-prefs.c:502
-#: ../modules/plugin-manager/evolution-plugin-manager.c:356
+#: ../modules/mail/em-composer-prefs.c:493
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
 #: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:220
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "ååç"
 
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:497
 msgid "Language(s)"
 msgstr "èè"
 
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "ææ"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "æåäæ"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "æéäæ"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "ææäæ"
 
-#: ../modules/mail/em-mailer-prefs.c:174
-msgid "Add Custom Junk Header"
-msgstr "ååèéååéäæé"
-
-#: ../modules/mail/em-mailer-prefs.c:182
-msgid "Header Name:"
-msgstr "æéåç:"
-
-#: ../modules/mail/em-mailer-prefs.c:183
-msgid "Header Value Contains:"
-msgstr "æéæååå:"
-
-#: ../modules/mail/em-mailer-prefs.c:283
+#: ../modules/mail/em-mailer-prefs.c:289
 msgid "Header"
 msgstr "éé"
 
-#: ../modules/mail/em-mailer-prefs.c:287
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Contains Value"
 msgstr "ååæå"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693
-#: ../modules/mail/em-mailer-prefs.c:766
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s åæçåååäçääèèääåèåæã"
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:701
-#: ../modules/mail/em-mailer-prefs.c:775
-#, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
-msgstr "%s åæçååçæäçãèæææåæåèèåäã"
-
-#: ../modules/mail/em-mailer-prefs.c:739
-msgid "No junk plugin available"
-msgstr "ææåççååéäåæçå"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1031
 msgid "_Date header:"
 msgstr "æææé(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/mail/em-mailer-prefs.c:1032
 msgid "Show _original header value"
 msgstr "éçååæéæå(_O)"
 
@@ -15177,10 +15333,11 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "ææ Evolution æåçéèçéäçå"
 
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "ææåå Evolution æïææåæåçéèçéäçåã"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:143
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "æåèå Evolution èçäçéèéåéäåæçï"
 
@@ -15188,49 +15345,73 @@ msgstr "æåèå Evolution èçäçéèéåéäåæçï"
 msgid "Click 'Work Online' to return to online mode."
 msgstr "ééãçäåäãäååçäæåã"
 
-# zh_HK: msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
 msgid "Evolution is currently offline due to a network outage."
-msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
+msgstr "åççççæäçïEvolution çåçéçæåã"
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline."
 msgstr "Evolution çåçéçåäã"
 
-# zh_HK: msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
-msgid "Evolution will return to online mode once a network connection is established."
-msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr "äæççéçåçïEvolution åæååçäæåã"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr "å org.gnome æäååæçåèãéæ OnlineAccounts æåçåéèèèçåæã"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr "OAuth"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr "éåééæéé GNOME Online Accounts æåéæåäæå"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
 msgstr "äè"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+#: ../modules/plugin-manager/evolution-plugin-manager.c:254
 msgid "Plugin Manager"
 msgstr "åæçåççå"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:266
+#: ../modules/plugin-manager/evolution-plugin-manager.c:269
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ææïæäææåéæåååææçæ"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:295
+#: ../modules/plugin-manager/evolution-plugin-manager.c:298
 msgid "Overview"
 msgstr "æè"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:364
-#: ../modules/plugin-manager/evolution-plugin-manager.c:447
+#: ../modules/plugin-manager/evolution-plugin-manager.c:367
+#: ../modules/plugin-manager/evolution-plugin-manager.c:450
 msgid "Plugin"
 msgstr "åæçå"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:485
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "_Plugins"
 msgstr "åæçå(_P)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "Enable and disable plugins"
 msgstr "åçèåçåæçå"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python æèåæçå"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Python EPlugin èåçåçæèåæçåã"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -15239,49 +15420,96 @@ msgstr "Hello Python"
 msgid "Python Plugin Loader tests"
 msgstr "Python åæçåèåçåæè"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Python æèåæçå"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "çæçç SpamAssassin (%s)ï"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Python EPlugin èåçåçæèåæçåã"
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "çæåéäèæçååäæåè SpamAssassinï"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "çæååã%sãè SpamAssassinï"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr "çæå SpamAssassin èåèåï"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr "SpamAssassin åèçææçæèçéäèæ"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin éé"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "ååéçæè(_N)"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "éæè SpamAssasin æåéïäéåèæã"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "äç SpamAsssassin äæçåååæç"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "äç SpamAsssassin äæçåååæç (spamc/spamd)ã"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "åäçæåååéäæèã"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "åäçæåååéäæè (ææ DNS)ã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:277
-#: ../widgets/misc/e-import-assistant.c:392
+#: ../modules/startup-wizard/evolution-startup-wizard.c:281
+#: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "èéæäæèååçèèï"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:309
-#: ../widgets/misc/e-import-assistant.c:548
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "äè %sï"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:320
-#: ../modules/startup-wizard/evolution-startup-wizard.c:417
+#: ../modules/startup-wizard/evolution-startup-wizard.c:324
+#: ../modules/startup-wizard/evolution-startup-wizard.c:422
 msgid "Importing Files"
 msgstr "æåååææ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:395
+#: ../modules/startup-wizard/evolution-startup-wizard.c:400
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "ååååæãèæãääæãççã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:413
+#: ../modules/startup-wizard/evolution-startup-wizard.c:418
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "ååååæãèæãääæãççã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:487
+#: ../modules/startup-wizard/evolution-startup-wizard.c:492
 msgid "Evolution Setup Assistant"
 msgstr "Evolution èååç"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:493
+#: ../modules/startup-wizard/evolution-startup-wizard.c:498
 msgid "Welcome"
 msgstr "æèäç"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
@@ -15289,6 +15517,10 @@ msgstr ""
 "\n"
 "èæääãääæãæéççã "
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:608
+msgid "Loading accounts..."
+msgstr "æåèååèâ"
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "åæåéèéåå Evolutionã"
@@ -15298,21 +15530,24 @@ msgid "Local Address Books"
 msgstr "æåçéèé"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "List of clues for the attachment reminder plugin to look for in a message body"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
 msgstr "èéäæéåæçåçäæåéäåæçééåæå"
 
-#. Check buttons
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
+#: ../plugins/attachment-reminder/attachment-reminder.c:125
 msgid "_Do not show this message again."
 msgstr "äèåéçéåèæ(_D)"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:411
+#: ../plugins/attachment-reminder/attachment-reminder.c:457
+#: ../plugins/templates/templates.c:450
 msgid "Keywords"
 msgstr "ééå"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
 msgstr "Evolution åæåæääèèéäæåæéäçééåïåæäåéåéäã"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
@@ -15320,8 +15555,8 @@ msgid "Message has no attachments"
 msgstr "éäææéä"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add attachment..."
-msgstr "æåéä(_A)â"
+msgid "_Add Attachment..."
+msgstr "ååéä(_A)â"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
@@ -15343,156 +15578,160 @@ msgstr "èåéæ"
 msgid "Play audio attachments directly in mail messages."
 msgstr "çæææéääçéæéäã"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:186
 msgid "Select name of the Evolution backup file"
 msgstr "éæ Evolution åäææçåç"
 
-#: ../plugins/backup-restore/backup-restore.c:216
+#: ../plugins/backup-restore/backup-restore.c:219
 msgid "_Restart Evolution after backup"
 msgstr "åäåéæåå Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:242
+#: ../plugins/backup-restore/backup-restore.c:245
 msgid "Select name of the Evolution backup file to restore"
 msgstr "éæèéåç Evolution åäææåç"
 
-#: ../plugins/backup-restore/backup-restore.c:255
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid "_Restart Evolution after restore"
 msgstr "éååéæåå Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:323
-msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
+#: ../plugins/backup-restore/backup-restore.c:326
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr "äåäååääéå Evolutionãååäéåææçéäãèäæãåäãååéãèçäãåäåäéåäææçåäèåãéäéæåçã"
 
-#: ../plugins/backup-restore/backup-restore.c:330
+#: ../plugins/backup-restore/backup-restore.c:333
 msgid "_Restore Evolution from the backup file"
 msgstr "ååäææéå Evolution (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:337
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Please select an Evolution Archive to restore:"
 msgstr "éæèéåç Evolution ææåï"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:343
 msgid "Choose a file to restore"
 msgstr "éæèéåçææ"
 
-#: ../plugins/backup-restore/backup-restore.c:348
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Restore from backup"
 msgstr "ååäææéå"
 
-#: ../plugins/backup-restore/backup-restore.c:386
+#: ../plugins/backup-restore/backup-restore.c:389
 msgid "_Back up Evolution Data..."
 msgstr "åä Evolution èæ(_B)..."
 
-#: ../plugins/backup-restore/backup-restore.c:388
+#: ../plugins/backup-restore/backup-restore.c:391
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "å Evolution çèæèèåååäçææå"
 
-#: ../plugins/backup-restore/backup-restore.c:393
+#: ../plugins/backup-restore/backup-restore.c:396
 msgid "R_estore Evolution Data..."
 msgstr "éå Evolution èæ(_E)..."
 
-#: ../plugins/backup-restore/backup-restore.c:395
+#: ../plugins/backup-restore/backup-restore.c:398
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "åææåéå Evolution çèæèèåå"
 
-#: ../plugins/backup-restore/backup.c:79
+#: ../plugins/backup-restore/backup.c:77
 msgid "Back up Evolution directory"
 msgstr "åä Evolution èæå"
 
-#: ../plugins/backup-restore/backup.c:81
+#: ../plugins/backup-restore/backup.c:79
 msgid "Restore Evolution directory"
 msgstr "éå Evolution çé"
 
-#: ../plugins/backup-restore/backup.c:83
+#: ../plugins/backup-restore/backup.c:81
 msgid "Check Evolution Back up"
 msgstr "ææ Evolution åä"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../plugins/backup-restore/backup.c:83
 msgid "Restart Evolution"
 msgstr "éæåå Evolution"
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
 msgstr "äçååäçèäé"
 
-#: ../plugins/backup-restore/backup.c:289
-#: ../plugins/backup-restore/backup.c:399
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:295
+#: ../plugins/backup-restore/backup.c:412
 msgid "Shutting down Evolution"
 msgstr "æåéé Evolution"
 
-#: ../plugins/backup-restore/backup.c:296
+#: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution accounts and settings"
 msgstr "åä Evolution çåèèèåå"
 
-#: ../plugins/backup-restore/backup.c:304
+#: ../plugins/backup-restore/backup.c:314
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "æååä Evolution èæ (éäãèçäãèäæãåäãååé)"
 
-#: ../plugins/backup-restore/backup.c:317
+#: ../plugins/backup-restore/backup.c:327
 msgid "Back up complete"
 msgstr "åäåæ"
 
-#: ../plugins/backup-restore/backup.c:322
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:334
+#: ../plugins/backup-restore/backup.c:521
 msgid "Restarting Evolution"
 msgstr "éæåå Evolution"
 
-#: ../plugins/backup-restore/backup.c:403
+#: ../plugins/backup-restore/backup.c:418
 msgid "Back up current Evolution data"
 msgstr "åäçåç Evolution èæ"
 
-#: ../plugins/backup-restore/backup.c:409
+#: ../plugins/backup-restore/backup.c:426
 msgid "Extracting files from back up"
 msgstr "ååäèéææ"
 
-#: ../plugins/backup-restore/backup.c:466
+#: ../plugins/backup-restore/backup.c:485
 msgid "Loading Evolution settings"
 msgstr "æåèå Evolution çèåå"
 
-#: ../plugins/backup-restore/backup.c:481
+#: ../plugins/backup-restore/backup.c:502
 msgid "Removing temporary back up files"
 msgstr "çéæåçåäææ"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:514
 msgid "Ensuring local sources"
 msgstr "æåçèæåçäæ"
 
-#: ../plugins/backup-restore/backup.c:678
+#: ../plugins/backup-restore/backup.c:699
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æåäèèæå %s"
 
-#: ../plugins/backup-restore/backup.c:683
+#: ../plugins/backup-restore/backup.c:704
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "åèæåéå %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:728
 msgid "Evolution Back up"
 msgstr "Evolution åä"
 
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:728
 msgid "Evolution Restore"
 msgstr "Evolution éå"
 
-#: ../plugins/backup-restore/backup.c:743
+#: ../plugins/backup-restore/backup.c:766
 msgid "Backing up Evolution Data"
 msgstr "åä Evolution èæ"
 
-#: ../plugins/backup-restore/backup.c:744
+#: ../plugins/backup-restore/backup.c:767
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å Evolution åääçèææèçåã"
 
-#: ../plugins/backup-restore/backup.c:746
+#: ../plugins/backup-restore/backup.c:769
 msgid "Restoring Evolution Data"
 msgstr "éå Evolution èæ"
 
-#: ../plugins/backup-restore/backup.c:747
+#: ../plugins/backup-restore/backup.c:770
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å Evolution éåäçèææèçåã"
 
-#: ../plugins/backup-restore/backup.c:765
+#: ../plugins/backup-restore/backup.c:788
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "éååäæèçæéåææäçåèäèæçååã"
 
@@ -15510,7 +15749,8 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "çåèéé Evolutionï"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected back up file?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected back up file?"
 msgstr "çåèåéåçåäææéå Evolutionï"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
@@ -15538,43 +15778,48 @@ msgid "The selected folder is not writable."
 msgstr "éåçèæåçæååã"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-msgid "To back up your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding."
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
 msgstr "èåääçèæåèååïäåéåéé Evolutionãèçåäåççéèäååååääåæååçèæã"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
-msgid "To restore your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding. This will delete all your current Evolution data and settings and restore them from your back up."
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your back "
+"up."
 msgstr "èéåäçèæåèååïäåéåéé Evolutionãèçåäåççéèäååååääåæååçèæãéååäæåéäçå Evolution ææçèæåèååïäåäçåäéåååã"
 
-#: ../plugins/bbdb/bbdb.c:685
-#: ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:675 ../plugins/bbdb/bbdb.c:684
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "èåååçèçä"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:709
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Create _address book entries when sending mails"
 msgstr "ååééäæèååçéèééç(_A)"
 
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:705
 msgid "Select Address book for Automatic Contacts"
 msgstr "éæçèåååèçäççéèé"
 
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:720
 msgid "Instant Messaging Contacts"
 msgstr "åæèæèçä"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:745
+#: ../plugins/bbdb/bbdb.c:735
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "å Pidgin çååæååæèçäèèååç(_S)"
 
-#: ../plugins/bbdb/bbdb.c:751
+#: ../plugins/bbdb/bbdb.c:741
 msgid "Select Address book for Pidgin buddy list"
 msgstr "éæç Pidgin ååååççéèé"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:762
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Synchronize with _buddy list now"
 msgstr "çåèååæååæ(_B)"
 
@@ -15586,71 +15831,23 @@ msgstr "BBDB"
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
-"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 "äçååèåçççäçéèéäã\n"
 "\n"
 "åèéäæèååéèéäååååèéåéääåãåæäæåååæåäåå IM èçäèèã"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr "Bogofilter åæååãèååèåã"
-
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr "åçç %s æççéèï%s"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr "Bogofilter åçåææåæïäæåâ"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "çå Bogofilter åçåäæïççåâ"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "åçè Bogofilter åæïéèäçï%dã"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
-msgid "Convert message text to _Unicode"
-msgstr "åéäæåèæç _Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "åéäèæç Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
-msgstr "åéäæåèæç Unicode UTF-8 äçääèäååéç spam/ham çåã"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr "Bogofilter ååéäéæå"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "Bogofilter éé"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr "äç Bogofilter éæååéäã"
-
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 msgid "Authentication failed. Server requires correct login."
 msgstr "éèåæãäæåèææçççåã"
 
-#: ../plugins/caldav/caldav-browse-server.c:206
+#: ../plugins/caldav/caldav-browse-server.c:205
 msgid "Given URL cannot be found."
 msgstr "æäåæåç URLã"
 
-#: ../plugins/caldav/caldav-browse-server.c:210
+#: ../plugins/caldav/caldav-browse-server.c:209
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -15659,118 +15856,119 @@ msgstr ""
 "äæåååäæéæçèæã\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:340
-#: ../plugins/caldav/caldav-browse-server.c:664
+#: ../plugins/caldav/caldav-browse-server.c:339
+#: ../plugins/caldav/caldav-browse-server.c:663
 msgid "Failed to parse server response."
 msgstr "çæåæäæåçåæã"
 
-#: ../plugins/caldav/caldav-browse-server.c:434
+#: ../plugins/caldav/caldav-browse-server.c:433
 msgid "Events"
 msgstr "ää"
 
-#: ../plugins/caldav/caldav-browse-server.c:456
+#: ../plugins/caldav/caldav-browse-server.c:455
 msgid "User's calendars"
 msgstr "äçèçèäæ"
 
-#: ../plugins/caldav/caldav-browse-server.c:565
-#: ../plugins/caldav/caldav-browse-server.c:733
+#: ../plugins/caldav/caldav-browse-server.c:564
+#: ../plugins/caldav/caldav-browse-server.c:732
 msgid "Failed to get server URL."
 msgstr "çæååäæå URLã"
 
-#: ../plugins/caldav/caldav-browse-server.c:731
-#: ../plugins/caldav/caldav-browse-server.c:772
-#: ../plugins/caldav/caldav-browse-server.c:1431
+#: ../plugins/caldav/caldav-browse-server.c:730
+#: ../plugins/caldav/caldav-browse-server.c:771
+#: ../plugins/caldav/caldav-browse-server.c:1430
 msgid "Searching for user's calendars..."
 msgstr "æåæåäçèçèäæâ"
 
-#: ../plugins/caldav/caldav-browse-server.c:770
+#: ../plugins/caldav/caldav-browse-server.c:769
 msgid "Could not find any user calendar."
 msgstr "æäåäääçèèäæã"
 
-#: ../plugins/caldav/caldav-browse-server.c:902
+#: ../plugins/caldav/caldav-browse-server.c:901
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "åäæçåèåæï%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:904
+#: ../plugins/caldav/caldav-browse-server.c:903
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "åäæçåèåæäçç %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:909
+#: ../plugins/caldav/caldav-browse-server.c:908
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "èåäçè %s åäæå %s äçåç "
 
-#: ../plugins/caldav/caldav-browse-server.c:968
+#: ../plugins/caldav/caldav-browse-server.c:967
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "äèåç URLã%sãç soup èæ"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1214
+#: ../plugins/caldav/caldav-browse-server.c:1213
 msgid "Searching folder content..."
 msgstr "æåèæåååâ"
 
-#: ../plugins/caldav/caldav-browse-server.c:1263
-#: ../plugins/caldav/caldav-source.c:256
+#: ../plugins/caldav/caldav-browse-server.c:1262
+#: ../plugins/caldav/caldav-source.c:258
 msgid "Server _handles meeting invitations"
 msgstr "äæåèçæèéè(_H)"
 
-#: ../plugins/caldav/caldav-browse-server.c:1270
+#: ../plugins/caldav/caldav-browse-server.c:1269
 msgid "List of available calendars:"
 msgstr "åççèäæçæåï"
 
-#: ../plugins/caldav/caldav-browse-server.c:1308
+#: ../plugins/caldav/caldav-browse-server.c:1307
 msgid "Supports"
 msgstr "ææ"
 
-#: ../plugins/caldav/caldav-browse-server.c:1335
-#: ../plugins/caldav/caldav-source.c:254
-msgid "User e-_mail:"
-msgstr "äçè e-_mailï"
+#: ../plugins/caldav/caldav-browse-server.c:1334
+#: ../plugins/caldav/caldav-source.c:256
+msgid "User e_mail:"
+msgstr "äçè e_mailï"
 
-#: ../plugins/caldav/caldav-browse-server.c:1407
+#: ../plugins/caldav/caldav-browse-server.c:1406
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "çæåçåèçï%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1516
+#: ../plugins/caldav/caldav-browse-server.c:1515
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "äæå URLã%sãäæææç URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1522
+#: ../plugins/caldav/caldav-browse-server.c:1521
 msgid "Browse for a CalDAV calendar"
 msgstr "çè CalDAV èäæ"
 
-#: ../plugins/caldav/caldav-source.c:235
-#: ../plugins/calendar-http/calendar-http.c:100
+#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/calendar-http/calendar-http.c:104
 msgid "_URL:"
 msgstr "çå(_U):"
 
-#: ../plugins/caldav/caldav-source.c:242
-#: ../plugins/google-account-setup/google-contacts-source.c:349
-msgid "Use _SSL"
-msgstr "äç _SSL"
-
 #: ../plugins/caldav/caldav-source.c:244
-#: ../plugins/google-account-setup/google-contacts-source.c:327
-#: ../plugins/google-account-setup/google-source.c:638
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:268
+#: ../plugins/calendar-http/calendar-http.c:138
+#: ../plugins/google-account-setup/google-contacts-source.c:351
+msgid "Use _secure connection"
+msgstr "äçååéç(_S)"
+
+#: ../plugins/caldav/caldav-source.c:246
+#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/google-account-setup/google-source.c:652
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
 msgid "User_name:"
 msgstr "äçèåç(_N):"
 
-#: ../plugins/caldav/caldav-source.c:259
+#: ../plugins/caldav/caldav-source.c:261
 msgid "Brows_e server for a calendar"
 msgstr "çèäæåçèäæ(_E)"
 
-#: ../plugins/caldav/caldav-source.c:277
-#: ../plugins/calendar-file/calendar-file.c:191
-#: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:399
-#: ../plugins/google-account-setup/google-contacts-source.c:367
-#: ../plugins/google-account-setup/google-source.c:645
+#: ../plugins/caldav/caldav-source.c:279
+#: ../plugins/calendar-file/calendar-file.c:195
+#: ../plugins/calendar-http/calendar-http.c:123
+#: ../plugins/calendar-weather/calendar-weather.c:403
+#: ../plugins/google-account-setup/google-contacts-source.c:369
+#: ../plugins/google-account-setup/google-source.c:659
 msgid "Re_fresh:"
 msgstr "éææç(_F):"
 
@@ -15782,31 +15980,31 @@ msgstr "åå Evolution å CalDAV çææã"
 msgid "CalDAV Support"
 msgstr "CalDAV ææ"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:129
 msgid "_Customize options"
 msgstr "èééé(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "File _name:"
 msgstr "ææåç(_N):"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:152
 msgid "Choose calendar file"
 msgstr "éæèäæææ"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "On open"
 msgstr "æéåç"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:201
 msgid "On file change"
 msgstr "æææçææ"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:202
 msgid "Periodically"
 msgstr "éææç"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:217
 msgid "Force read _only"
 msgstr "åååè(_O)"
 
@@ -15818,11 +16016,7 @@ msgstr "åæåçèäæåå Evolutionã"
 msgid "Local Calendars"
 msgstr "æåèäæ"
 
-#: ../plugins/calendar-http/calendar-http.c:134
-msgid "_Secure connection"
-msgstr "ååéç(_S)"
-
-#: ../plugins/calendar-http/calendar-http.c:194
+#: ../plugins/calendar-http/calendar-http.c:198
 msgid "Userna_me:"
 msgstr "äçèåç(_M):"
 
@@ -15834,62 +16028,62 @@ msgstr "åççèäæåå Evolutionã"
 msgid "Web Calendars"
 msgstr "ççèäæ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Fog"
 msgstr "åæïèé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Cloudy"
 msgstr "åæïåé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy Night"
 msgstr "åæïåéçåæ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Overcast"
 msgstr "åæïåé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Showers"
 msgstr "åæïéé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Snow"
 msgstr "åæïäé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Sunny"
 msgstr "åæïèé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Clear Night"
 msgstr "åæïææçåæ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:72
 msgid "Weather: Thunderstorms"
 msgstr "åæïéæ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:226
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "éæäåäç"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:332
-#: ../plugins/calendar-weather/calendar-weather.c:377
+#: ../plugins/calendar-weather/calendar-weather.c:336
+#: ../plugins/calendar-weather/calendar-weather.c:381
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "ææ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:452
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "_Units:"
 msgstr "åä(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:461
+#: ../plugins/calendar-weather/calendar-weather.c:465
 msgid "Metric (Celsius, cm, etc)"
 msgstr "åå(ææãåçç)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:464
+#: ../plugins/calendar-weather/calendar-weather.c:468
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "èå(èæãååç)"
 
@@ -15901,24 +16095,7 @@ msgstr "åå Evolution ååæèäæçææã"
 msgid "Weather Calendars"
 msgstr "æèèäæ"
 
-#: ../plugins/contacts-map/contacts-map.c:55
-#: ../plugins/contacts-map/contacts-map.c:201
-msgid "Contacts map"
-msgstr "èçäåå"
-
-#: ../plugins/contacts-map/contacts-map.c:56
-msgid "Show a map of all the contacts"
-msgstr "éçææèçäçåå"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
-msgid "Add a map showing the location of contacts when possible."
-msgstr "ååäçæåååäåååäéçèçäçäçã"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-msgid "Map for contacts"
-msgstr "èçäçåå"
-
-#: ../plugins/dbx-import/dbx-importer.c:273
+#: ../plugins/dbx-import/dbx-importer.c:282
 msgid "Importing Outlook Express data"
 msgstr "æååå Outlook Express èæ"
 
@@ -15934,23 +16111,23 @@ msgstr "Outlook DBX åå"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Outlook Express 5/6 åäèæå (.dbx)"
 
-#: ../plugins/default-source/default-source.c:83
+#: ../plugins/default-source/default-source.c:87
 msgid "Mark as _default address book"
 msgstr "æççéèéèé(_D)"
 
-#: ../plugins/default-source/default-source.c:96
+#: ../plugins/default-source/default-source.c:100
 msgid "A_utocomplete with this address book"
 msgstr "çéåéèééèèååæ(_U)"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:109
 msgid "Mark as _default calendar"
 msgstr "æççéèèäæ(_D)"
 
-#: ../plugins/default-source/default-source.c:106
+#: ../plugins/default-source/default-source.c:110
 msgid "Mark as _default task list"
 msgstr "æççéèåäæå(_D)"
 
-#: ../plugins/default-source/default-source.c:107
+#: ../plugins/default-source/default-source.c:111
 msgid "Mark as _default memo list"
 msgstr "æççéèååéæå(_D)"
 
@@ -15967,7 +16144,10 @@ msgid "List of Custom Headers"
 msgstr "èéæéçæå"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
 msgstr "éåéåæåçæäåäååååéäçèéæéæåãæåæéèæéæåçæåçïèéæéåçåäã=ãïåéçæååäã;ãéé"
 
 #: ../plugins/email-custom-header/email-custom-header.c:316
@@ -16028,7 +16208,7 @@ msgid "Key"
 msgstr "èåé"
 
 #: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:417
+#: ../plugins/templates/templates.c:456
 msgid "Values"
 msgstr "æå"
 
@@ -16050,7 +16230,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "åéäçèåäæäæéæèååèçèå"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:125
+#: ../plugins/external-editor/external-editor.c:131
 msgid "Automatically launch when a new mail is edited"
 msgstr "ççèæéäæèååè"
 
@@ -16062,11 +16242,11 @@ msgstr "éèåéçèå"
 msgid "The default command that must be used as the editor."
 msgstr "éèçæäåéèåççèåã"
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:120
 msgid "Command to be executed to launch the editor: "
 msgstr "çäååçèåçæä: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:121
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16074,8 +16254,8 @@ msgstr ""
 "Emacs äçãxemacsã\n"
 "VI äçãgvim -fã"
 
-#: ../plugins/external-editor/external-editor.c:381
-#: ../plugins/external-editor/external-editor.c:383
+#: ../plugins/external-editor/external-editor.c:399
+#: ../plugins/external-editor/external-editor.c:401
 msgid "Compose in External Editor"
 msgstr "ååéçèåäæå"
 
@@ -16096,7 +16276,9 @@ msgid "Editor not launchable"
 msgstr "çèåçæåå"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
-msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
 msgstr "Evoluton çæåççäååäéäçæåææãèçååèã"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
@@ -16104,11 +16286,15 @@ msgid "External editor still running"
 msgstr "åéçèåäååèä"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
-msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
 msgstr "åéçèåäååèäãåèèçèåäåäçïéäçèåèçåäèééã"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
 msgstr "äèåååäåæçåååèåäèåçåéçèåãèåèèåäåççèåã"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
@@ -16116,7 +16302,9 @@ msgid "Insert Face picture by default"
 msgstr "éèæååéç"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
-msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens."
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
 msgstr "æåéèåååéääæååéçãåæåéåééäååéåèååççïååäææääææã"
 
 #: ../plugins/face/face.c:286
@@ -16167,17 +16355,17 @@ msgstr "äèèåéåææ"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "äéåçææäääæææç .png åçãéèï{0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
+#: ../plugins/google-account-setup/google-contacts-source.c:317
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:243
 msgid "Server"
 msgstr "äæå"
 
-#: ../plugins/google-account-setup/google-source.c:438
+#: ../plugins/google-account-setup/google-source.c:443
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "èåäçè %s çåçäåååèéçèäææåã"
 
-#: ../plugins/google-account-setup/google-source.c:549
+#: ../plugins/google-account-setup/google-source.c:560
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16186,17 +16374,17 @@ msgstr ""
 "äèå Google äæåèåèæã\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:737
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/google-account-setup/google-source.c:560
+#: ../plugins/mail-to-task/mail-to-task.c:796
+#: ../plugins/mail-to-task/mail-to-task.c:1045
 msgid "Unknown error."
 msgstr "äæçéèã"
 
-#: ../plugins/google-account-setup/google-source.c:649
+#: ../plugins/google-account-setup/google-source.c:663
 msgid "Cal_endar:"
 msgstr "èäæ(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:684
+#: ../plugins/google-account-setup/google-source.c:698
 msgid "Retrieve _List"
 msgstr "ååæå(_L)"
 
@@ -16208,434 +16396,6 @@ msgstr "å Google ææåå Evolutionã"
 msgid "Google Calendars"
 msgstr "Google ææ"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:453
-msgid "Checklist"
-msgstr "æææå"
-
-#. Translators: First %s is the server name, second %s is user name
-#: ../plugins/groupwise-features/camel-gw-listener.c:513
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "èå %s (äçè %s) çåç "
-
-#: ../plugins/groupwise-features/camel-gw-listener.c:533
-msgid "Failed to authenticate.\n"
-msgstr "éèèæåæã\n"
-
-#: ../plugins/groupwise-features/gw-ui.c:112
-msgid "New _Shared Folder..."
-msgstr "æååäèæå(_S)â"
-
-#: ../plugins/groupwise-features/gw-ui.c:119
-msgid "_Proxy Login..."
-msgstr "äçäæåçå(_P)â"
-
-#: ../plugins/groupwise-features/gw-ui.c:170
-msgid "Junk Mail Settings..."
-msgstr "ååéäèååâ"
-
-#: ../plugins/groupwise-features/gw-ui.c:177
-msgid "Track Message Status..."
-msgstr "èèéäçæâ"
-
-#: ../plugins/groupwise-features/gw-ui.c:183
-msgid "Retract Mail"
-msgstr "æåéä"
-
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "æå"
-
-#: ../plugins/groupwise-features/gw-ui.c:338
-msgid "Accept Tentatively"
-msgstr "ææåç"
-
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "æç"
-
-#: ../plugins/groupwise-features/gw-ui.c:352
-msgid "Rese_nd Meeting..."
-msgstr "éåæè(_N)â"
-
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
-msgid "Create folder"
-msgstr "åçèæå"
-
-#: ../plugins/groupwise-features/install-shared.c:230
-#, c-format
-msgid ""
-"The user '%s' has shared a folder with you\n"
-"\n"
-"Message from '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Click 'Apply' to install the shared folder\n"
-"\n"
-msgstr ""
-"äçèã%sãåäääåèæåçä\n"
-"\n"
-"äèã%sãçèæ\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"æãåçãäåèåäèæå\n"
-"\n"
-
-#: ../plugins/groupwise-features/install-shared.c:242
-msgid "Install the shared folder"
-msgstr "åèåäèæå"
-
-#: ../plugins/groupwise-features/install-shared.c:246
-msgid "Shared Folder Installation"
-msgstr "åäèæååè"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:82
-msgid "Junk Settings"
-msgstr "ååéäèåå"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:96
-#: ../plugins/groupwise-features/junk-settings.ui.h:3
-msgid "Junk Mail Settings"
-msgstr "ååéäèåå"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:1
-msgid "Email:"
-msgstr "éåéä:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:2
-msgid "Junk List:"
-msgstr "ååéäæåï"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:6
-msgid "_Enable"
-msgstr "åç(_E)"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:7
-msgid "_Junk List"
-msgstr "ååéäæå(_J)"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:12
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "çé(_R)"
-
-#: ../plugins/groupwise-features/mail-retract.c:81
-msgid "Message Retract"
-msgstr "éäæå"
-
-#: ../plugins/groupwise-features/mail-retract.c:90
-msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?"
-msgstr "æåéäåèæåèéäèæäèçäççéãäçåèééåï"
-
-#: ../plugins/groupwise-features/mail-retract.c:111
-msgid "Message retracted successfully"
-msgstr "éäåæåæå"
-
-#: ../plugins/groupwise-features/mail-send-options.c:202
-msgid "Insert Send options"
-msgstr "æååééé"
-
-#: ../plugins/groupwise-features/notification.ui.h:3
-#: ../plugins/groupwise-features/properties.ui.h:6
-msgid "The participants will receive the following notification.\n"
-msgstr "åèèåææåäåéçã\n"
-
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to GroupWise messages"
-msgstr "å åé ééåå GroupWise èæ"
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "Fine-tune your GroupWise accounts."
-msgstr "æèäç GroupWise åèã"
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "GroupWise Features"
-msgstr "GroupWise åè"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
-msgid "Message retract failed"
-msgstr "éäåæåæ"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
-msgid "The server did not allow the selected message to be retracted."
-msgstr "æäæåäåèåéåçéäåæã"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "åçæåçç &quot;{0}&quot; çåèååãèææäçèæåçæã"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "åèååå"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
-msgid "Invalid user"
-msgstr "çæçäçè"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
-msgstr "ä &quot;{0}&quot; çåäçäæååæãèææäçéåéääåäåèäæã"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
-msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "äèèäçè &quot;{0}&quot; ååäçäæå"
-
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
-msgid "Specify User"
-msgstr "æåäçè"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
-msgid "You have already given proxy permissions to this user."
-msgstr "äåçåäçäæåçæéçäéåäçèã"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
-msgid "You have to specify a valid user name to give proxy rights."
-msgstr "äåéæåææçäçèåçäååäçäæåæéã"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "ääèèæåçäçè &quot;{0}&quot; åäéåèæå"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "äåéæåèååæåäçèåç"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-msgid "Do you want to resend the meeting?"
-msgstr "æåèéæåééåæèï"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-msgid "Do you want to resend the recurring meeting?"
-msgstr "æåèéæåéæéæææèï"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-msgid "Do you want to retract the original item?"
-msgstr "æåèæåååçéçï"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
-msgid "The original will be removed from the recipient's mailbox."
-msgstr "æåäååæäèçäçäçéã"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
-msgid "This is a recurring meeting"
-msgstr "éæéæææè"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
-msgid "This will create a new meeting using the existing meeting details."
-msgstr "éæäçæåçæèèçèæåçæçæèã"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
-msgstr "éæäçæåçæèèçèæåçæçæèãåäéææèåçéåéèéæèåã"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
-msgid "Would you like to accept it?"
-msgstr "äæèæåååï"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
-msgid "Would you like to decline it?"
-msgstr "äæèæçååï"
-
-#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "C_ustomize notification message"
-msgstr "èééçèæ(_U)"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
-msgid "Con_tacts..."
-msgstr "èçä(_T)â"
-
-#: ../plugins/groupwise-features/properties.ui.h:4
-msgid "Shared Folder Notification"
-msgstr "åäèæåéç"
-
-#: ../plugins/groupwise-features/properties.ui.h:8
-msgid "Users:"
-msgstr "äçèï"
-
-#: ../plugins/groupwise-features/properties.ui.h:11
-msgid "_Not Shared"
-msgstr "æåä(_N)"
-
-#: ../plugins/groupwise-features/properties.ui.h:13
-msgid "_Shared With..."
-msgstr "åäç(_S)â"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
-msgid "Access Rights"
-msgstr "ååæå"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
-msgid "Add/Edit"
-msgstr "åå/çè"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
-msgid "Con_tacts"
-msgstr "èçä(_T)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
-msgid "Modify _folders/options/rules/"
-msgstr "çèèæå/éé/èå/(_F)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
-msgid "Read items marked _private"
-msgstr "èåæèççäçéç(_P)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
-msgid "Reminder Notes"
-msgstr "æéååè"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
-msgid "Subscribe to my _alarms"
-msgstr "èéèæçéé(_A)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
-msgid "Subscribe to my _notifications"
-msgstr "èéèæçéç(_N)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
-msgid "_Write"
-msgstr "åå(_W)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
-msgid "permission to read|_Read"
-msgstr "è(_R)"
-
-#: ../plugins/groupwise-features/proxy-listing.ui.h:1
-msgid "Proxy"
-msgstr "äçäæå"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:239
-msgid "Account Name"
-msgstr "åèåç"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
-msgid "Proxy Login"
-msgstr "çåäçäæå"
-
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:494
-#: ../plugins/groupwise-features/send-options.c:84
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sèèå %s æéçåç(äçè %s)"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
-msgid "The Proxy tab will be available only when the account is online."
-msgstr "äçäæåéçåæååèäçæææåçã"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:704
-msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "äçäæåéçåæååçæåèæææåçã"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:709
-msgctxt "GW"
-msgid "Proxy"
-msgstr "äç"
-
-#: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:694
-msgid "Add User"
-msgstr "ååäçè"
-
-#: ../plugins/groupwise-features/send-options.c:214
-msgid "Advanced send options"
-msgstr "ééåééé"
-
-#: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:729
-msgid "Users"
-msgstr "äçè"
-
-#: ../plugins/groupwise-features/share-folder-common.c:317
-msgid "Enter the users and set permissions"
-msgstr "èåäçèäèåæé"
-
-#: ../plugins/groupwise-features/share-folder-common.c:418
-msgid "Sharing"
-msgstr "åä"
-
-#: ../plugins/groupwise-features/share-folder.c:532
-msgid "Custom Notification"
-msgstr "èééç"
-
-#: ../plugins/groupwise-features/share-folder.c:734
-msgid "Add   "
-msgstr "æå"
-
-#: ../plugins/groupwise-features/share-folder.c:740
-msgid "Modify"
-msgstr "äæ"
-
-#: ../plugins/groupwise-features/status-track.c:125
-msgid "Message Status"
-msgstr "éäçæ"
-
-#. Subject
-#: ../plugins/groupwise-features/status-track.c:139
-msgid "Subject:"
-msgstr "äæ:"
-
-#: ../plugins/groupwise-features/status-track.c:153
-msgid "From:"
-msgstr "åäè:"
-
-#: ../plugins/groupwise-features/status-track.c:168
-msgid "Creation date:"
-msgstr "åçææ:"
-
-#: ../plugins/groupwise-features/status-track.c:208
-msgid "Recipient: "
-msgstr "æäè:"
-
-#: ../plugins/groupwise-features/status-track.c:215
-msgid "Delivered: "
-msgstr "åéé:"
-
-#: ../plugins/groupwise-features/status-track.c:221
-msgid "Opened: "
-msgstr "åéå:"
-
-#: ../plugins/groupwise-features/status-track.c:226
-msgid "Accepted: "
-msgstr "åæå:"
-
-#: ../plugins/groupwise-features/status-track.c:231
-msgid "Deleted: "
-msgstr "ååé:"
-
-#: ../plugins/groupwise-features/status-track.c:236
-msgid "Declined: "
-msgstr "ååæ:"
-
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Completed: "
-msgstr "ååæ: "
-
-#: ../plugins/groupwise-features/status-track.c:246
-msgid "Undelivered: "
-msgstr "æéé:"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "èååç"
@@ -16644,12 +16404,12 @@ msgstr "èååç"
 msgid "View image attachments directly in mail messages."
 msgstr "çæåéääéçåçã"
 
-#: ../plugins/imap-features/imap-headers.c:329
+#: ../plugins/imap-features/imap-headers.c:333
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "èéæé"
 
-#: ../plugins/imap-features/imap-headers.c:342
+#: ../plugins/imap-features/imap-headers.c:346
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP æé"
@@ -16660,7 +16420,8 @@ msgstr "åæèéäèåæé(éèå)"
 
 #: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
 "æäåäåæææéäåäæèææçéåæéã\n"
@@ -16676,7 +16437,7 @@ msgstr ""
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "åææé(_B) - (æå)\n"
@@ -16696,201 +16457,207 @@ msgstr "IMAP åè"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:490
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "çæèåèäæã%sã(%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:654
+#: ../plugins/itip-formatter/itip-formatter.c:631
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "èäæ '%s' äççæåéåæèçèç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:655
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "åæåèäæã%sãäççæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:761
 msgid "Unable to find any calendars"
 msgstr "æäåääèäæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this meeting in any calendar"
 msgstr "çæåääèäæäæåéåçæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:772
 msgid "Unable to find this task in any task list"
 msgstr "çæåääåäæåäæåééåä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:804
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find this memo in any memo list"
 msgstr "çæåääååéæåäæåééååé"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
-msgid "Opening the calendar. Please wait.."
+#: ../plugins/itip-formatter/itip-formatter.c:1026
+msgid "Opening the calendar. Please wait..."
 msgstr "æåéåèäæãèçåâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:883
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Searching for an existing version of this appointment"
 msgstr "åæéåçææåççæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1166
+#: ../plugins/itip-formatter/itip-formatter.c:1302
 msgid "Unable to parse item"
 msgstr "çæåæéç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1391
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "çæåééçèèäæã%sãã%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1403
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "åéèèäæ '%s' äèçåæå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "åéèèäæ '%s' äèçäçåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "åéèèäæ '%s' äèçååæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "åéèèäæã%sãäèçååæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1511
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æèåéäåçéäçä %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "Sent a cancelation notice to the delegate"
 msgstr "åéåæéççäçä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1520
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "çæåéåæéççäçä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1495
+#: ../plugins/itip-formatter/itip-formatter.c:1631
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "çæäåæççæäååæèçæçæææï"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1660
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "çæææåæèã%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1528
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid "Attendee status updated"
 msgstr "åæèçæåææ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1532
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "åæèçæäèææïåçéçåçäåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1554
+#: ../plugins/itip-formatter/itip-formatter.c:1690
 msgid "Meeting information sent"
 msgstr "æèèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1693
 msgid "Task information sent"
 msgstr "åäèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1560
+#: ../plugins/itip-formatter/itip-formatter.c:1696
 msgid "Memo information sent"
 msgstr "ååéèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1569
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "çæååæèèèïèæèääåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1708
 msgid "Unable to send task information, the task does not exist"
 msgstr "çæåååäèèïèéåääåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1711
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "çæååååéèèïèååéääåå"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1776
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1645
+#: ../plugins/itip-formatter/itip-formatter.c:1781
 msgid "Save Calendar"
 msgstr "ååèäæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1703
-#: ../plugins/itip-formatter/itip-formatter.c:1714
+#: ../plugins/itip-formatter/itip-formatter.c:1839
+#: ../plugins/itip-formatter/itip-formatter.c:1850
 msgid "The calendar attached is not valid"
 msgstr "éåçèäææçæç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1704
-#: ../plugins/itip-formatter/itip-formatter.c:1715
-msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:1840
+#: ../plugins/itip-formatter/itip-formatter.c:1851
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "æéäååååæèäæååïäåèäæäéææç iCalendarã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1755
-#: ../plugins/itip-formatter/itip-formatter.c:1783
-#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1891
+#: ../plugins/itip-formatter/itip-formatter.c:1919
+#: ../plugins/itip-formatter/itip-formatter.c:2028
 msgid "The item in the calendar is not valid"
 msgstr "èäæäçéçæçæç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1756
-#: ../plugins/itip-formatter/itip-formatter.c:1784
-#: ../plugins/itip-formatter/itip-formatter.c:1893
-msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1920
+#: ../plugins/itip-formatter/itip-formatter.c:2029
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
 msgstr "æéäçååæèäæååïäèååäæååääääãåäæçé/åçèè"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../plugins/itip-formatter/itip-formatter.c:1933
 msgid "The calendar attached contains multiple items"
 msgstr "éåçèäæåååæååéç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1798
-msgid "To process all of these items, the file should be saved and the calendar imported"
+#: ../plugins/itip-formatter/itip-formatter.c:1934
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
 msgstr "èèçéäåéçéçïæèåæææååååååäçèäæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2592
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ææ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2476
+#: ../plugins/itip-formatter/itip-formatter.c:2608
 msgid "Tentatively Accepted"
 msgstr "æææå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2594
+#: ../plugins/itip-formatter/itip-formatter.c:2726
 msgid "This meeting recurs"
 msgstr "éåæèçéæèåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2597
+#: ../plugins/itip-formatter/itip-formatter.c:2729
 msgid "This task recurs"
 msgstr "ééåäçéæèåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2600
+#: ../plugins/itip-formatter/itip-formatter.c:2732
 msgid "This memo recurs"
 msgstr "éåååéçéæèåç"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2834
+#: ../plugins/itip-formatter/itip-formatter.c:2976
 msgid "_Delete message after acting"
 msgstr "åæååééä(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2844
-#: ../plugins/itip-formatter/itip-formatter.c:2877
+#: ../plugins/itip-formatter/itip-formatter.c:2986
+#: ../plugins/itip-formatter/itip-formatter.c:3019
 msgid "Conflict Search"
 msgstr "èççæå"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2859
+#: ../plugins/itip-formatter/itip-formatter.c:3001
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "éæèæåæèèççèäæ"
 
@@ -17085,7 +16852,9 @@ msgstr "%s åæååäåæåçæèï"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "%s through %s wishes to receive the latest information for the following meeting:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
 msgstr "%s éé %s åææåäåæèçææèèï"
 
 #: ../plugins/itip-formatter/itip-view.c:400
@@ -17170,12 +16939,15 @@ msgstr "%s åæååäéæåçåäï"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "%s through %s wishes to receive the latest information for the following assigned task:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
 msgstr "%s éé %s åææåäåææåäçææèèï"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "%s wishes to receive the latest information for the following assigned task:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s åææåäåææåäçææèèï"
 
 #: ../plugins/itip-formatter/itip-view.c:492
@@ -17258,7 +17030,7 @@ msgstr "éåæï"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../plugins/itip-formatter/itip-view.c:1055
 msgid "Start time:"
 msgstr "éåæé:"
 
@@ -17268,100 +17040,100 @@ msgstr "çææï"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../plugins/itip-formatter/itip-view.c:1066
 msgid "End time:"
 msgstr "çææé:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Open Calendar"
 msgstr "éåèäæ(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:849
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:876
-#: ../plugins/itip-formatter/itip-view.c:881
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Decline"
 msgstr "æç(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:878
-#: ../plugins/itip-formatter/itip-view.c:883
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:879
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "A_ccept"
 msgstr "æå(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Decline all"
 msgstr "åéæç(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:855
 msgid "_Tentative all"
 msgstr "åéæè(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:877
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
 msgid "_Tentative"
 msgstr "æè(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:856
 msgid "A_ccept all"
 msgstr "åéæå(_C)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "_Send Information"
 msgstr "åéèè(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Update Attendee Status"
 msgstr "ææååçæ(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:873
+#: ../plugins/itip-formatter/itip-view.c:874
 msgid "_Update"
 msgstr "ææ(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1085
-#: ../plugins/itip-formatter/itip-view.c:1139
+#: ../plugins/itip-formatter/itip-view.c:1086
+#: ../plugins/itip-formatter/itip-view.c:1140
 msgid "Comment:"
 msgstr "èè:"
 
-#: ../plugins/itip-formatter/itip-view.c:1124
+#: ../plugins/itip-formatter/itip-view.c:1125
 msgid "Send _reply to sender"
 msgstr "åèåäè(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "Send _updates to attendees"
 msgstr "åéææçåæè(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "_Apply to all instances"
 msgstr "åçèææåé(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1173
 msgid "Show time as _free"
 msgstr "éçæéççé(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1176
 msgid "_Preserve my reminder"
 msgstr "äçæçæé(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1181
+#: ../plugins/itip-formatter/itip-view.c:1182
 msgid "_Inherit reminder"
 msgstr "çææé(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1924
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Tasks:"
 msgstr "åä(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1926
+#: ../plugins/itip-formatter/itip-view.c:1927
 msgid "_Memos:"
 msgstr "ååé(_M):"
 
@@ -17382,7 +17154,8 @@ msgid "This meeting has been delegated"
 msgstr "éåæèååæ"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "éååèäéäèçåçåæèãååääååçåæèï"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
@@ -17390,66 +17163,52 @@ msgid "Beep or play sound file."
 msgstr "çååèæææèéææã"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "åç D-Bus èæã"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "åçéçåçåçã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "çæéäåéæçç D-BUS èæã"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr "åæçãtrueãïåçæéäæéæçååèåååææèéæã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "åéçæäåçæéäã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "çæéäåéæææèéææã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "åæäæäçåèæåïåæéäéåæææäéçéæã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
-msgstr "ååçäååæéäã"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "çæéäåéæåéçåéçæéäåçã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
 msgstr "èææçèéææåçã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "æéäéåæèææçéæææïåæäæäçåèæåã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Use sound theme"
 msgstr "äçéæäé"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "çæéäåéææåææèéæææçååèã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "æååæéäæéææåçäååèæã"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æååéçæäåçæéäã"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:394
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17460,72 +17219,60 @@ msgid_plural ""
 msgstr[0] ""
 "äåçææ %d åéä ã \n"
 "äæ %sã"
-msgstr[1] ""
-"äåçææ %d åéä ã \n"
-"äæ %sã"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:410
-#, c-format
-msgid "From: %s"
-msgstr "åäèï%s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:423
+#: ../plugins/mail-notification/mail-notification.c:419
 #, c-format
 msgid "Subject: %s"
 msgstr "äæï%s"
 
-#: ../plugins/mail-notification/mail-notification.c:433
+#: ../plugins/mail-notification/mail-notification.c:430
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "äåçææ %d åéä ã "
-msgstr[1] "äåçææ %d åéä ã "
 
-#: ../plugins/mail-notification/mail-notification.c:446
-#: ../plugins/mail-notification/mail-notification.c:454
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:439
+#: ../plugins/mail-notification/mail-notification.c:447
+#: ../plugins/mail-notification/mail-notification.c:450
 msgid "New email"
 msgstr "æéä"
 
-#: ../plugins/mail-notification/mail-notification.c:506
-msgid "Show icon in _notification area"
-msgstr "åéçåäéçåç(_N)"
-
-#: ../plugins/mail-notification/mail-notification.c:536
-msgid "Popup _message together with the icon"
-msgstr "ååçäååèæ(_M)"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:471
+#, c-format
+msgid "Show %s"
+msgstr "éç %s"
 
-#: ../plugins/mail-notification/mail-notification.c:723
-msgid "_Play sound when new messages arrive"
+#: ../plugins/mail-notification/mail-notification.c:673
+msgid "_Play sound when a new message arrives"
 msgstr "çæéäåéæææèéææ(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:753
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "_Beep"
 msgstr "åè(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:766
+#: ../plugins/mail-notification/mail-notification.c:716
 msgid "Use sound _theme"
 msgstr "äçéæäé(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _file:"
 msgstr "ææææ(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:796
+#: ../plugins/mail-notification/mail-notification.c:744
 msgid "Select sound file"
 msgstr "éæèéææ"
 
-#: ../plugins/mail-notification/mail-notification.c:854
+#: ../plugins/mail-notification/mail-notification.c:801
 msgid "Notify new messages for _Inbox only"
 msgstr "åéçæäåçæéä(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:863
-msgid "Generate a _D-Bus message"
-msgstr "çç _D-Bus èæ"
+#: ../plugins/mail-notification/mail-notification.c:811
+msgid "Show _notification when a new message arrives"
+msgstr "çæéäåéæéçéç(_N)"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -17536,138 +17283,131 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "çæéäåéæéçäã"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:157
+#: ../plugins/mail-to-task/mail-to-task.c:235
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "å %s çéäæåç"
 
-#: ../plugins/mail-to-task/mail-to-task.c:490
+#: ../plugins/mail-to-task/mail-to-task.c:586
 #, c-format
-msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr "éåçèäæåçååääã%sããæåèçèæèçääï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:493
+#: ../plugins/mail-to-task/mail-to-task.c:589
 #, c-format
-msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
 msgstr "éåçåäæååçåååäã%sããæåèçèæèçåäï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:592
 #, c-format
-msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
 msgstr "éåçååéæååçååååéã%sããæåèçèæèçååéï"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:516
-msgid "Selected calendar contains some events for the given mails already. Would you like to create new events anyway?"
-msgstr "éåçèäæåçååæäæåéääçääãæåèåååçæçääï"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:522
-msgid "Selected task list contains some tasks for the given mails already. Would you like to create new tasks anyway?"
-msgstr "éåçåäæååçååæäæåéääçåäãæåèåååçæçåäï"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:528
-msgid "Selected memo list contains some memos for the given mails already. Would you like to create new memos anyway?"
-msgstr "éåçååéæååçååæäæåéääçååéãæåèåååçæçååéï"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:549
-msgid "Selected calendar contains an event for the given mail already. Would you like to create new event anyway?"
-msgid_plural "Selected calendar contains events for the given mails already. Would you like to create new events anyway?"
-msgstr[0] "éåçèäæåçååæåéääçääãæåèåååçæçääï"
-msgstr[1] "éåçèäæåçååæåéääçääãæåèåååçæçääï"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:558
-msgid "Selected task list contains a task for the given mail already. Would you like to create new task anyway?"
-msgid_plural "Selected task list contains tasks for the given mails already. Would you like to create new tasks anyway?"
-msgstr[0] "éåçåäæååçååæåéääçåäãæåèåååçæçåäï"
-msgstr[1] "éåçåäæååçååæåéääçåäãæåèåååçæçåäï"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:567
-msgid "Selected memo list contains a memo for the given mail already. Would you like to create new memo anyway?"
-msgid_plural "Selected memo list contains memos for the given mails already. Would you like to create new memos anyway?"
-msgstr[0] "éåçååéæååçååæåéääçååéãæåèåååçæçååéï"
-msgstr[1] "éåçååéæååçååæåéääçååéãæåèåååçæçååéï"
-
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#: ../plugins/mail-to-task/mail-to-task.c:609
+#, c-format
+msgid ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+msgstr "äåçéæ %d åéäèèæçääãçåèæåååéåååï"
+
+#: ../plugins/mail-to-task/mail-to-task.c:612
+#, c-format
+msgid ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+msgstr "äåçéæ %d åéäèèæçåäãçåèæåååéåååï"
+
+#: ../plugins/mail-to-task/mail-to-task.c:615
+#, c-format
+msgid ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr "äåçéæ %d åéäèèæçååéãçåèæåååéåååï"
+
+#: ../plugins/mail-to-task/mail-to-task.c:634
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "æåèççèæåéçéäï"
+
+#: ../plugins/mail-to-task/mail-to-task.c:709
 msgid "[No Summary]"
 msgstr "[æææè]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:637
+#: ../plugins/mail-to-task/mail-to-task.c:721
 msgid "Invalid object returned from a server"
 msgstr "åäæåååçæççä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:708
+#: ../plugins/mail-to-task/mail-to-task.c:771
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "åèçæéççéèï%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:796
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "çæéåèäæã%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:744
-msgid "Selected source is read only, thus cannot create event there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:803
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
 msgstr "éåçäææåèçïåæäèåéèåçääãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:747
-msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:806
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
 msgstr "éåçäææåèçïåæäèåéèåçåäãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
-msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:809
+msgid ""
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 msgstr "éåçäææåèçïåæäèåéèåçååéãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/mail-to-task/mail-to-task.c:1045
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "äèååäææåã%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1075
+#: ../plugins/mail-to-task/mail-to-task.c:1104
+msgid "No writable calendar is available."
+msgstr "ææåååçèäæã"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1196
 msgid "Create an _Event"
 msgstr "åçää(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1198
 msgid "Create a new event from the selected message"
 msgstr "äéåçéäåçæçää"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1082
+#: ../plugins/mail-to-task/mail-to-task.c:1203
 msgid "Create a Mem_o"
 msgstr "åçååé(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1205
 msgid "Create a new memo from the selected message"
 msgstr "äéåçéäåçæçååé"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1089
+#: ../plugins/mail-to-task/mail-to-task.c:1210
 msgid "Create a _Task"
 msgstr "åçåä(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1212
 msgid "Create a new task from the selected message"
 msgstr "äéåçéäåçæçåä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1099
+#: ../plugins/mail-to-task/mail-to-task.c:1220
 msgid "Create a _Meeting"
 msgstr "åçæè(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1101
+#: ../plugins/mail-to-task/mail-to-task.c:1222
 msgid "Create a new meeting from the selected message"
 msgstr "äéåçéäåçæçæè"
 
@@ -17675,55 +17415,55 @@ msgstr "äéåçéäåçæçæè"
 msgid "Convert a mail message to a task."
 msgstr "åéäèæçåäã"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:345
 msgid "Get List _Archive"
 msgstr "ååæåææå(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:347
 msgid "Get an archive of the list this message belongs to"
 msgstr "ååæéäæåèåçææå"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
 msgid "Get List _Usage Information"
 msgstr "ååæåäçèè(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:354
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "ååæéäæåèåçäçææçéèè"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
 msgid "Contact List _Owner"
 msgstr "èçäæåææè(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:361
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "èçæéäæåéäèåçççè"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
 msgid "_Post Message to List"
 msgstr "åééäçèå(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "æåéäçæéäæåçéäèå"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "_Subscribe to List"
 msgstr "èéèå(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "èéæéäæåçéäèå"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "_Unsubscribe from List"
 msgstr "åæèéèå(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "åæèéæéäæåçéäèå"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "Mailing _List"
 msgstr "éäèå(_L)"
 
@@ -17741,9 +17481,11 @@ msgstr "çæäçåä"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message has been sent."
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
 "ååååäåéåéäè URL \"{0}\"ãäåäèåéåéäïææåæçäåäæèã\n"
 "\n"
@@ -17762,7 +17504,9 @@ msgid "Posting not allowed"
 msgstr "äåèåè"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
 msgstr "åæéäèåçåèæäèåèçãéåèæäååèçéäèåãèèçèåçççèäååéäæèèã"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
@@ -17771,7 +17515,8 @@ msgstr "åééäåéäèåï"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -17790,7 +17535,9 @@ msgstr ""
 "æéï {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid "This message does not contain the header information required for this action."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "éåéäææååæåäæéçæéèè"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -17806,18 +17553,20 @@ msgid "Also mark messages in subfolders?"
 msgstr "æåäæèåèæåäçéäï"
 
 #: ../plugins/mark-all-read/mark-all-read.c:44
-msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
 msgstr "äèåçåçèæåäçéäåéèïææååçåçèæååååèæåäææéäã"
 
-#: ../plugins/mark-all-read/mark-all-read.c:193
+#: ../plugins/mark-all-read/mark-all-read.c:213
 msgid "In Current Folder and _Subfolders"
 msgstr "æçåçèæååååèæå(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:207
+#: ../plugins/mark-all-read/mark-all-read.c:227
 msgid "In Current _Folder Only"
 msgstr "æçåçèæå(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:444
+#: ../plugins/mark-all-read/mark-all-read.c:565
 msgid "Mark Me_ssages as Read"
 msgstr "æçéäçåè(_S)"
 
@@ -17855,7 +17604,9 @@ msgid "Show plain text if present"
 msgstr "åæäçæååéçå"
 
 #: ../plugins/prefer-plain/prefer-plain.c:242
-msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
 msgstr "åææçæåçéååéçåïååè Evolution éææäçéåäéçã"
 
 #: ../plugins/prefer-plain/prefer-plain.c:243
@@ -17863,7 +17614,9 @@ msgid "Only ever show plain text"
 msgstr "åäçæåéç"
 
 #: ../plugins/prefer-plain/prefer-plain.c:243
-msgid "Always show plain text part and make attachments from other parts, if requested."
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
 msgstr "åææèææïæééççæåçéåäååäçéåèäéäã"
 
 #: ../plugins/prefer-plain/prefer-plain.c:290
@@ -17874,14 +17627,6 @@ msgstr "åæåç HTML éåéççéä(_U)"
 msgid "HTML _Mode"
 msgstr "HT_ML æå"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-msgid "Evolution Profiler"
-msgstr "Evolution èååå"
-
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Profile data events in Evolution (for developers only)."
-msgstr "Evolution äçèåçåèæääïåäéçèäçïã"
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
 msgstr "å PST ææåå Outlook éä"
@@ -17894,36 +17639,35 @@ msgstr "Outlook PST åå"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook åäèæå (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../plugins/pst-import/pst-importer.c:308
 msgid "_Mail"
 msgstr "éä(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:326
 msgid "Destination folder:"
 msgstr "ççåèæå:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:331
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Address Book"
 msgstr "éèé(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:338
+#: ../plugins/pst-import/pst-importer.c:339
 msgid "A_ppointments"
 msgstr "çæ(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:344
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:345 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "åä(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:350
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "_Journal entries"
 msgstr "æèéç(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:365
+#: ../plugins/pst-import/pst-importer.c:366
 msgid "Importing Outlook data"
 msgstr "åå Outlook èæ"
 
@@ -18076,159 +17820,102 @@ msgstr "äçèåç(_U):"
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:69
-#: ../plugins/publish-calendar/publish-format-ical.c:82
+#: ../plugins/publish-calendar/publish-format-fb.c:88
+#: ../plugins/publish-calendar/publish-format-ical.c:86
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "çæçåèäæïèäæåççååäåå"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:484
+#: ../plugins/publish-calendar/url-editor-dialog.c:487
 msgid "New Location"
 msgstr "æçäç"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:486
-msgid "Edit Location"
-msgstr "çèäç"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "æäå SpamAssassinïäçï%d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "åçåçåæï%s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "fork äåççéèï%s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr "SpamAssassin åçåææåæïäæåâ"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "çå SpamAssassin åçåäæïççåâ"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "åçè SpamAssassin åæïéèäçï%d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
-#, c-format
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "SpamAssassin çæäçãèååèåã"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "éæè SpamAssasin æåéïäéåèæ"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
-msgid "I_nclude remote tests"
-msgstr "ååéçæè(_N)"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr "äç SpamAssassin éæååéäã"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr "SpamAssassin ååéäéæå"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin éé"
+#: ../plugins/publish-calendar/url-editor-dialog.c:489
+msgid "Edit Location"
+msgstr "çèäç"
 
-#.
-#. * Translator: the %F %T is the thirth argument for a strftime function.
-#. * It lets you define the formatting of the date in the csv-file.
-#. *
-#: ../plugins/save-calendar/csv-format.c:161
+#. Translators: the %F %T is the third argument for a
+#. * strftime function.  It lets you define the formatting
+#. * of the date in the csv-file.
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Description List"
 msgstr "æèæå"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Categories List"
 msgstr "åéæå"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Comment List"
 msgstr "èèæå"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Contact List"
 msgstr "èçäæå"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Start"
 msgstr "éå"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "End"
 msgstr "çæ"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Due"
 msgstr "ææ"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "percent Done"
 msgstr "ïååæ"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "URL"
 msgstr "çå"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Attendees List"
 msgstr "åæèæå"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Modified"
 msgstr "åäæ"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV æåçéééé(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:537
+#: ../plugins/save-calendar/csv-format.c:568
 msgid "Prepend a _header"
 msgstr "éåèçæé(_H)"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:577
 msgid "_Value delimiter:"
 msgstr "æååçç(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:588
 msgid "_Record delimiter:"
 msgstr "çéåçç(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:599
 msgid "_Encapsulate values with:"
 msgstr "äæåèæå(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:582
-msgid "Comma separated value format (.csv)"
+#: ../plugins/save-calendar/csv-format.c:625
+msgid "Comma separated values (.csv)"
 msgstr "éèééçæåæå (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:162
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar æå (.ics)"
+#: ../plugins/save-calendar/ical-format.c:166 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -18247,47 +17934,52 @@ msgstr "åèäææåäååèççã"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:369
-msgid "RDF format (.rdf)"
-msgstr "RDF æå (.rdf)"
+#: ../plugins/save-calendar/rdf-format.c:375
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:122
 msgid "_Format:"
 msgstr "æå(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:183
 msgid "Select destination file"
 msgstr "éåççææ"
 
-#: ../plugins/save-calendar/save-calendar.c:334
+#: ../plugins/save-calendar/save-calendar.c:336
 msgid "Save the selected calendar to disk"
 msgstr "åéåçèäæååèçç"
 
-#: ../plugins/save-calendar/save-calendar.c:365
+#: ../plugins/save-calendar/save-calendar.c:367
 msgid "Save the selected memo list to disk"
 msgstr "åéåçååéæåååèçç"
 
-#: ../plugins/save-calendar/save-calendar.c:396
+#: ../plugins/save-calendar/save-calendar.c:398
 msgid "Save the selected task list to disk"
 msgstr "åéåçåäæåååèçç"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
 msgstr "äçéäåæççæåæçååççééå/æåçæåã"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "åæèçççæåæçå"
+msgid ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
+"an email you are replying to."
+msgstr "åæèçççæåæçåãäåääççèææ $ORIG[subject], $ORIG[from], $ORIG[to] æ $ORIG[body]ïååæääæåèçéääçæååäã"
 
-#: ../plugins/templates/templates.c:635
+#: ../plugins/templates/templates.c:1066
 msgid "No Title"
 msgstr "æææé"
 
-#: ../plugins/templates/templates.c:746
+#: ../plugins/templates/templates.c:1167
 msgid "Save as _Template"
 msgstr "ååççæ(_T)"
 
-#: ../plugins/templates/templates.c:748
+#: ../plugins/templates/templates.c:1169
 msgid "Save as Template"
 msgstr "ååççæ"
 
@@ -18307,27 +17999,26 @@ msgstr "èå vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "çæåéääéç vCardã"
 
-#: ../plugins/vcard-inline/vcard-inline.c:198
-#: ../plugins/vcard-inline/vcard-inline.c:283
+#: ../plugins/vcard-inline/vcard-inline.c:200
+#: ../plugins/vcard-inline/vcard-inline.c:285
 msgid "Show Full vCard"
 msgstr "éçåæç vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:201
+#: ../plugins/vcard-inline/vcard-inline.c:203
 msgid "Show Compact vCard"
 msgstr "éçççç vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:262
+#: ../plugins/vcard-inline/vcard-inline.c:264
 msgid "There is one other contact."
 msgstr "éæèçäã"
 
-#: ../plugins/vcard-inline/vcard-inline.c:271
+#: ../plugins/vcard-inline/vcard-inline.c:273
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "éæ %d ååäèçäã"
-msgstr[1] "éæ %d ååäèçäã"
 
-#: ../plugins/vcard-inline/vcard-inline.c:292
+#: ../plugins/vcard-inline/vcard-inline.c:294
 msgid "Save in Address Book"
 msgstr "ååéèé"
 
@@ -18339,15 +18030,15 @@ msgstr "å WebDAV èçäåå Evolutionã"
 msgid "WebDAV contacts"
 msgstr "WebDAV èçä"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:67
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:256
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:255
 msgid "URL:"
 msgstr "çå:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:282
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:281
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "éå IfM_atch (éäç Apache < 2.2.8)"
 
@@ -18392,7 +18083,8 @@ msgid "Enable express mode"
 msgstr "åçåéæå"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "çååäèçäç HTTP/ ååå HTTP æåçäçäæåèååã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
@@ -18420,7 +18112,11 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ååæéèéççåäçé ID æååã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr "åæç trueïåäçäæåçéçåéèéèãåääçèåçæå GConf çãapps/evolution/shell/network_config/authentication_userãéåååïèåçæå gnome-keyring æã~/.gnome2_private/Evolutionãçåçææååã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
@@ -18436,7 +18132,9 @@ msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser åèççååèæåã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
 msgstr "éäååååäçååæèãã0ãæåçïã1ãææåæèã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
@@ -18444,7 +18142,8 @@ msgid "Last upgraded configuration version"
 msgstr "äæåçççæçæ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "èåæèçççèæåïåèåæå (äéçäç)"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
@@ -18476,7 +18175,11 @@ msgid "Secure HTTP proxy port"
 msgstr "ååå HTTP äçäæåéèå"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
 msgstr "éæäçäæåçææåãææçæåæ 0ã 1ã 2ã å 3ïååäèãäçççèååãããääçäçäæåãããäçæåäçäæåçæãåãäçå autoconfig url äæäçäçäæåçæãã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
@@ -18487,8 +18190,7 @@ msgstr "éçåéæ"
 msgid "Skip development warning dialog"
 msgstr "åçéçèååèç"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-#: ../shell/main.c:371
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "äéçæååå"
 
@@ -18497,7 +18199,9 @@ msgid "Statusbar is visible"
 msgstr "çæåèçéç"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
 msgstr "Evolution ççæçæïä major/minor/configuration åçèç(äåã2.6.0ã) ã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
@@ -18521,7 +18225,9 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "åéæçéèéåïäåçèã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
 msgstr "äæåçç Evolution çæçæïä major/minor/configuration åçèç(äåã2.6.0ã) ã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
@@ -18537,24 +18243,36 @@ msgid "The machine name to proxy socks through."
 msgstr "socks äçäæåäæåçã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
 msgstr "åçæã/apps/evolution/shell/network_config/http_hostãçäçäæåäæéèåã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
 msgstr "åçæã/apps/evolution/shell/network_config/secure_hostãçäçäæåäæéèåã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
 msgstr "åçæã/apps/evolution/shell/network_config/socks_hostãçäçäæåäæéèåã"
 
-# (pofilter) gconf: do not translate gconf attribute: "text", "icons", "both", "toolbar", "toolbar"
 #: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
 msgstr "èçæéçéæãåäæãtextã(æå)ããiconsã(åç)ããbothã(åè)ããtoolbarã(ååå)ãåæèçãtoolbarã(ååå)ïæéçéææææ GNOME åååèååæåã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr "éåéåååäèçæéçïäééäçäæåïåææäçïçäæãæååäçäæåçãçåïééäçèçåçå *.foo.comïãIP äåïIPv4 å IPv6 çåïæåæåççéççäåïåæ 192.168.0.0/24ïã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
@@ -18570,13 +18288,12 @@ msgid "Use HTTP proxy"
 msgstr "äç HTTP äçäæå"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr "äç HTTP äçäæåæçäéèçäçèåçã"
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr "äç HTTP äçäæåæéèèèçäçèåçã"
 
-# zh_HK: msgstr "Evolution æåäéçæååååäçäæåã"
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "Evolution æåäéçæååååäçäæåã"
+msgstr "Evolution æåäéçæååååäçäæåã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
@@ -18595,7 +18312,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "æååäçååååã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "æåçç Evulution éççæçèååèçã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:62
@@ -18610,12 +18328,11 @@ msgstr "èçæééæ"
 msgid "Window buttons are visible"
 msgstr "èçæéæåèç"
 
-#: ../shell/e-shell-content.c:695
-#: ../shell/e-shell-content.c:696
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "æå"
 
-#: ../shell/e-shell-content.c:738
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "ååæåçæ"
 
@@ -18623,42 +18340,38 @@ msgstr "ååæåçæ"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:935
+#: ../shell/e-shell-searchbar.c:938
 msgid "Sho_w:"
 msgstr "éç(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:968
+#: ../shell/e-shell-searchbar.c:971
 msgid "Sear_ch:"
 msgstr "æå(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1031
+#: ../shell/e-shell-searchbar.c:1034
 msgid "i_n"
 msgstr "æ(_N)"
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:223
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:257
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
-#: ../shell/e-shell-utils.c:278
+#: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "ææææ (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:295
 msgid "Saving user interface state"
 msgstr "ååäçèäéçæ"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:648
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -18669,268 +18382,278 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:659
 msgid "Evolution Website"
 msgstr "Evolution çç"
 
-#: ../shell/e-shell-window-actions.c:1215
+#: ../shell/e-shell-window-actions.c:921
+msgid "Categories Editor"
+msgstr "åéçèå"
+
+#: ../shell/e-shell-window-actions.c:1256
 msgid "Bug Buddy is not installed."
 msgstr "åæåè Bug Buddyã"
 
-#: ../shell/e-shell-window-actions.c:1217
+#: ../shell/e-shell-window-actions.c:1258
 msgid "Bug Buddy could not be run."
 msgstr "çæåè Bug Buddyã"
 
-#: ../shell/e-shell-window-actions.c:1398
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Show information about Evolution"
 msgstr "éç Evolution çéèè"
 
-#: ../shell/e-shell-window-actions.c:1403
-#: ../shell/e-shell-window-actions.c:1417
+#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1458
 msgid "_Close Window"
 msgstr "ééèç(_C)"
 
-#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1465
 msgid "_Contents"
 msgstr "åå(_C)"
 
-#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1467
 msgid "Open the Evolution User Guide"
 msgstr "éå Evolution äçèæå"
 
-#: ../shell/e-shell-window-actions.c:1452
+#: ../shell/e-shell-window-actions.c:1493
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1454
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "éååèåé(FAQ)çé"
 
-#: ../shell/e-shell-window-actions.c:1459
+#: ../shell/e-shell-window-actions.c:1500
 msgid "_Forget Passwords"
 msgstr "éååç(_F)"
 
-#: ../shell/e-shell-window-actions.c:1461
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Forget all remembered passwords"
 msgstr "åèææèæçåç"
 
-#: ../shell/e-shell-window-actions.c:1466
+#: ../shell/e-shell-window-actions.c:1507
 msgid "I_mport..."
 msgstr "åå(_M)â"
 
-#: ../shell/e-shell-window-actions.c:1468
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Import data from other programs"
 msgstr "åååäçåçèæ"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1514
 msgid "New _Window"
 msgstr "éæèç(_W)"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Create a new window displaying this view"
 msgstr "åçäåæçèçäéçéåæè"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1528
+msgid "Available Cate_gories"
+msgstr "åççåé(_G)"
+
+#: ../shell/e-shell-window-actions.c:1530
+msgid "Manage available categories"
+msgstr "ççåççåé"
+
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Quick Reference"
 msgstr "åéååèå(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Show Evolution's shortcut keys"
 msgstr "éç Evolution çæåé"
 
-#: ../shell/e-shell-window-actions.c:1503
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Exit the program"
 msgstr "éééåçå"
 
-#: ../shell/e-shell-window-actions.c:1508
+#: ../shell/e-shell-window-actions.c:1556
 msgid "_Advanced Search..."
 msgstr "ééæå(_A)â"
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Construct a more advanced search"
 msgstr "åçæééçæå"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Clear the current search parameters"
 msgstr "æéçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Edit Saved Searches..."
 msgstr "çèååçæåçæ(_E)â"
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Manage your saved searches"
 msgstr "ççäåååçæå"
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Click here to change the search type"
 msgstr "æéèäæèæåéå"
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1584
 msgid "_Find Now"
 msgstr "çåæå(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Execute the current search parameters"
 msgstr "åèçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1591
 msgid "_Save Search..."
 msgstr "ååæåçæ(_S)â"
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Save the current search parameters"
 msgstr "ååçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1605
 msgid "Submit _Bug Report..."
 msgstr "åééèåå(_B)â"
 
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Submit a bug report using Bug Buddy"
 msgstr "äç Bug Buddy éåéèååã"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1612
 msgid "_Work Offline"
 msgstr "éçåä(_W)"
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1614
 msgid "Put Evolution into offline mode"
 msgstr "è Evolution éåéçæå"
 
-# zh_HK: msgstr "çäåä(_W)"
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1619
 msgid "_Work Online"
-msgstr "çäåä(_W)"
+msgstr "çäåä(_W)"
 
-# zh_HK: msgstr "äçäæååå"
-#: ../shell/e-shell-window-actions.c:1573
+#: ../shell/e-shell-window-actions.c:1621
 msgid "Put Evolution into online mode"
-msgstr "äçäæååå"
+msgstr "è Evolution éåäçæå"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1649
 msgid "Lay_out"
 msgstr "äå(_O)"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_New"
 msgstr "æå(_N)"
 
-#: ../shell/e-shell-window-actions.c:1615
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Search"
 msgstr "æå(_S)"
 
-#: ../shell/e-shell-window-actions.c:1622
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_Switcher Appearance"
 msgstr "åæåè(_S)"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1684
 msgid "_Window"
 msgstr "èç(_O)"
 
-#: ../shell/e-shell-window-actions.c:1665
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show Side _Bar"
 msgstr "éçåéæ(_B)"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1715
 msgid "Show the side bar"
 msgstr "éçåéå"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1721
 msgid "Show _Buttons"
 msgstr "éçæé(_B)"
 
-#: ../shell/e-shell-window-actions.c:1675
+#: ../shell/e-shell-window-actions.c:1723
 msgid "Show the switcher buttons"
 msgstr "éçåæçåæé"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1729
 msgid "Show _Status Bar"
 msgstr "éççæå(_S)"
 
-#: ../shell/e-shell-window-actions.c:1683
+#: ../shell/e-shell-window-actions.c:1731
 msgid "Show the status bar"
 msgstr "éççæå"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Show _Tool Bar"
 msgstr "éçååå(_T)"
 
-#: ../shell/e-shell-window-actions.c:1691
+#: ../shell/e-shell-window-actions.c:1739
 msgid "Show the tool bar"
 msgstr "éçååå"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1761
 msgid "_Icons Only"
 msgstr "åæåç(_I)"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons with icons only"
 msgstr "åéçèçæéçåç"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1768
 msgid "_Text Only"
 msgstr "åææå(_T)"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Display window buttons with text only"
 msgstr "åéçèçæéçæå"
 
-#: ../shell/e-shell-window-actions.c:1727
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Icons _and Text"
 msgstr "åçåæå(_A)"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1777
 msgid "Display window buttons with icons and text"
 msgstr "éçèçæéçåçåæå"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1782
 msgid "Tool_bar Style"
 msgstr "åååéæ(_B)"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1784
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "äçæéåååèååéçèçæé"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Define Views..."
 msgstr "åçæèâ"
 
-#: ../shell/e-shell-window-actions.c:1746
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Create or edit views"
 msgstr "åçæçèæè(_C)"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1799
 msgid "Save Custom View..."
 msgstr "ååèéæèâ"
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1801
 msgid "Save current custom view"
 msgstr "ååçåçèéæè"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1808
 msgid "C_urrent View"
 msgstr "çåæè(_U)"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1818
 msgid "Custom View"
 msgstr "èéæè"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1820
 msgid "Current view is a customized view"
 msgstr "çåçæèæåæèéçæè"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1830
 msgid "Change the page settings for your current printer"
 msgstr "äæçåæåæçééæåèå"
 
-#: ../shell/e-shell-window-actions.c:2167
+#: ../shell/e-shell-window-actions.c:2215
 #, c-format
 msgid "Switch to %s"
 msgstr "åæè %s"
 
-#: ../shell/e-shell-window-actions.c:2382
+#: ../shell/e-shell-window-actions.c:2430
 msgid "Execute these search parameters"
 msgstr "åèéäæååæ"
 
@@ -18940,24 +18663,24 @@ msgstr "åèéäæååæ"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:438
+#: ../shell/e-shell-window.c:442
 msgid "New"
 msgstr "æå"
 
-#: ../shell/e-shell.c:257
+#: ../shell/e-shell.c:361
 msgid "Preparing to go offline..."
 msgstr "æåéåéçâ"
 
-#: ../shell/e-shell.c:310
+#: ../shell/e-shell.c:414
 msgid "Preparing to go online..."
 msgstr "æåéåäçâ"
 
-#: ../shell/e-shell.c:372
+#: ../shell/e-shell.c:476
 msgid "Preparing to quit..."
 msgstr "æåçæâ"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18992,7 +18715,7 @@ msgstr ""
 "æååæääååäææïèäæå\n"
 "çååæäæäæèï\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19000,63 +18723,63 @@ msgstr ""
 "èè\n"
 "Evolution åçæä\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:226
 msgid "Do not tell me again"
 msgstr "äèåéçéåèæ"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:365
-msgid "Start Evolution showing the specified component. Available options are 'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+#: ../shell/main.c:308
+msgid ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr "åå Evolution æäæåçåäéçãåççééæãmailãããcalendarãããcontactsãããtasksãåãmemosã"
 
-#: ../shell/main.c:369
+#: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
 msgstr "åæåçåååçåäèç"
 
-# zh_HK: msgstr "äçäæååå"
-#: ../shell/main.c:373
+#: ../shell/main.c:316
 msgid "Start in online mode"
-msgstr "äçäæååå"
+msgstr "äçäæååå"
 
-#: ../shell/main.c:375
+#: ../shell/main.c:318
 msgid "Ignore network availability"
 msgstr "åçäèçæååç"
 
-#: ../shell/main.c:377
+#: ../shell/main.c:320
 msgid "Start in \"express\" mode"
 msgstr "äãåéãæååå"
 
-#: ../shell/main.c:380
+#: ../shell/main.c:323
 msgid "Forcibly shut down Evolution"
 msgstr "ååéé Evoultion"
 
-#: ../shell/main.c:383
+#: ../shell/main.c:326
 msgid "Send the debugging output of all components to a file."
 msgstr "ååéåäçééèåèæåéèäåææã"
 
-#: ../shell/main.c:385
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "åçåääåæçåçèåã"
 
-#: ../shell/main.c:387
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "åçéäãèçäååäçéèçæã"
 
-#: ../shell/main.c:391
+#: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "åæåç URI æææåçååçæääçåæã"
 
-#: ../shell/main.c:393
+#: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "èæåèäç Evolution çåçæ"
 
-#: ../shell/main.c:557
-#: ../shell/main.c:565
+#: ../shell/main.c:511 ../shell/main.c:519
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM èéäåæç"
 
-#: ../shell/main.c:627
+#: ../shell/main.c:582
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19065,7 +18788,7 @@ msgstr ""
 "%sï --online å --offline äèäèäçã\n"
 "  äç '%s --help' ååéäæèèã\n"
 
-#: ../shell/main.c:633
+#: ../shell/main.c:588
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19087,11 +18810,16 @@ msgid "Continue Anyway"
 msgstr "ååçç"
 
 #: ../shell/shell.error.xml.h:4
-msgid "Evolution no longer supports upgrading directly from version {0}. However as a workaround you might try first upgrading to Evolution 2, and then upgrading to Evolution 3."
+msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
 msgstr "Evolution äåææå {0} ççæåçãçèèéçæææäåäåèååçå Evolution 2ïæçååçå Evolution 3ã"
 
 #: ../shell/shell.error.xml.h:5
-msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
 msgstr "éåäçåçæåéææåèæçåçãåäæéèäçåçæåææçäèåã"
 
 #: ../shell/shell.error.xml.h:7
@@ -19110,7 +18838,8 @@ msgstr "éå(_F)"
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
 "{0}\n"
 "\n"
@@ -19169,31 +18898,31 @@ msgstr "äèåéæä URI èãType=Linkãæééç"
 msgid "Not a launchable item"
 msgstr "äæåäååçéç"
 
-#: ../smclient/eggsmclient.c:224
+#: ../smclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
 msgstr "åçåäæéæçççåçéç"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
 msgstr "æååååååçæçææ"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 msgid "FILE"
 msgstr "ææ"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr "æåäæéæçç ID"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:251
+#: ../smclient/eggsmclient.c:253
 msgid "Session management options:"
 msgstr "äæéæççééï"
 
-#: ../smclient/eggsmclient.c:252
+#: ../smclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "éçäæéæççéé"
 
@@ -19209,74 +18938,112 @@ msgstr ""
 "çèääèååï"
 
 #: ../smime/gui/cert-trust-dialog.c:144
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
 msgstr "åçäääçåæèæçèæåäïæäééåææçïååäåääæèæçæææã"
 
 #: ../smime/gui/cert-trust-dialog.c:148
-msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
 msgstr "åçääääçåæèæçèæåäïæäééåææçïååäåäääæèæçæææã"
 
-#: ../smime/gui/certificate-manager.c:148
-#: ../smime/gui/certificate-manager.c:460
-#: ../smime/gui/certificate-manager.c:697
-msgid "Select a certificate to import..."
-msgstr "éåèååçèæâ"
-
-#: ../smime/gui/certificate-manager.c:157
-msgid "All PKCS12 files"
-msgstr "ææç PKCS12 ææ"
-
-#: ../smime/gui/certificate-manager.c:163
-#: ../smime/gui/certificate-manager.c:475
-#: ../smime/gui/certificate-manager.c:711
-msgid "All files"
-msgstr "ææææ"
-
-#: ../smime/gui/certificate-manager.c:182
-msgid "Failed to import user's certificate"
-msgstr "çæååäçèçèæ"
-
-#: ../smime/gui/certificate-manager.c:352
-#: ../smime/gui/certificate-manager.c:574
-#: ../smime/gui/certificate-manager.c:808
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
 msgstr "èæåç"
 
-#: ../smime/gui/certificate-manager.c:361
-#: ../smime/gui/certificate-manager.c:592
-msgid "Purposes"
-msgstr "çé"
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+msgid "Issued To Organization"
+msgstr "çççç"
 
-#: ../smime/gui/certificate-manager.c:370
-#: ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+msgid "Issued To Organizational Unit"
+msgstr "ççççåä"
+
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "åè"
 
-#: ../smime/gui/certificate-manager.c:378
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
+msgid "Purposes"
+msgstr "çé"
+
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "ççè"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+msgid "Issued By Organization"
+msgstr "çççç"
+
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+msgid "Issued By Organizational Unit"
+msgstr "ççççåä"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+msgid "Issued"
+msgstr "çèè"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "åæ"
 
-#: ../smime/gui/certificate-manager.c:469
-msgid "All email certificate files"
-msgstr "ææçéåéäèæææ"
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+msgid "SHA1 Fingerprint"
+msgstr "SHA1 æç"
+
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+msgid "MD5 Fingerprint"
+msgstr "MD5 æç"
+
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+msgid "Email Address"
+msgstr "éåéääå"
+
+#: ../smime/gui/certificate-manager.c:574
+msgid "Select a certificate to import..."
+msgstr "éåèååçèæâ"
+
+#: ../smime/gui/certificate-manager.c:587
+msgid "All files"
+msgstr "ææææ"
 
-#: ../smime/gui/certificate-manager.c:502
-msgid "Failed to import contact's certificate"
-msgstr "çæååèçäçèæ"
+#: ../smime/gui/certificate-manager.c:622
+msgid "Failed to import certificate"
+msgstr "çæååèæ"
 
-#: ../smime/gui/certificate-manager.c:583
-msgid "E-Mail Address"
-msgstr "éåéäåå"
+#: ../smime/gui/certificate-manager.c:990
+msgid "All PKCS12 files"
+msgstr "ææç PKCS12 ææ"
+
+#: ../smime/gui/certificate-manager.c:1008
+msgid "All email certificate files"
+msgstr "ææçéåéäèæææ"
 
-#: ../smime/gui/certificate-manager.c:706
+#: ../smime/gui/certificate-manager.c:1026
 msgid "All CA certificate files"
 msgstr "ææç CA èæææ"
 
-#: ../smime/gui/certificate-manager.c:737
-msgid "Failed to import certificate authority's certificate"
-msgstr "çæååèæäåçèæ"
-
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -19332,11 +19099,12 @@ msgid "Backup _All"
 msgstr "åéåä(_A)"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
 msgstr "ääææèæéäåïåæåäçèïäæèåææåçèæäååçæçåçåã"
 
-#: ../smime/gui/smime-ui.ui.h:5
-#: ../smime/lib/e-cert.c:1086
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1088
 msgid "Certificate"
 msgstr "èæ"
 
@@ -19396,10 +19164,6 @@ msgstr "æäæå"
 msgid "Fingerprints"
 msgstr "æçæç"
 
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "Issued By"
-msgstr "ççè"
-
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "ççææ"
@@ -19408,10 +19172,6 @@ msgstr "ççææ"
 msgid "Issued To"
 msgstr "çç"
 
-#: ../smime/gui/smime-ui.ui.h:26
-msgid "MD5 Fingerprint"
-msgstr "MD5 æç"
-
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "çç (O)"
@@ -19420,17 +19180,11 @@ msgstr "çç (O)"
 msgid "Organizational Unit (OU)"
 msgstr "ççåä (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "SHA1 Fingerprint"
-msgstr "SHA1 æç"
-
-#: ../smime/gui/smime-ui.ui.h:30
-#: ../smime/lib/e-cert.c:824
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "SSL çæçèæ"
 
-#: ../smime/gui/smime-ui.ui.h:31
-#: ../smime/lib/e-cert.c:828
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "SSL äæåèæ"
 
@@ -19463,7 +19217,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "äåçæäèéäçççèæïåäèåäçèå:"
 
 #: ../smime/gui/smime-ui.ui.h:40
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "äåçææææççéèæïåäèåéäæèæé:"
 
 #: ../smime/gui/smime-ui.ui.h:41
@@ -19487,8 +19242,7 @@ msgstr "çèæèæé (CA) ääå(_E)"
 msgid "Certificate already exists"
 msgstr "èæåçåå"
 
-#: ../smime/lib/e-cert.c:228
-#: ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
@@ -19582,13 +19336,11 @@ msgstr "äæåéåçåæçæ"
 msgid "Subject's Public Key"
 msgstr "äæçåéåçå"
 
-#: ../smime/lib/e-cert.c:815
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "éèïçæèçåä"
 
-#: ../smime/lib/e-cert.c:836
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "çäççè"
 
@@ -19632,8 +19384,7 @@ msgstr "CRL ççè"
 msgid "Critical"
 msgstr "éè"
 
-#: ../smime/lib/e-cert.c:946
-#: ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "äéè"
 
@@ -19641,47 +19392,48 @@ msgstr "äéè"
 msgid "Extensions"
 msgstr "åä"
 
-#. Translators: This string is used in Certificate details for fields like Issuer
-#. or Subject, which shows the field name on the left and its respective value
-#. on the right, both as stored in the certificate itself. You probably do not
-#. need to change this string, unless changing the order of name and value.
-#. As a result example: "OU = VeriSign Trust Network"
-#.
-#: ../smime/lib/e-cert.c:1045
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../smime/lib/e-cert.c:1047
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100
-#: ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1102 ../smime/lib/e-cert.c:1225
 msgid "Certificate Signature Algorithm"
 msgstr "èæççæçæ"
 
-#: ../smime/lib/e-cert.c:1109
+#: ../smime/lib/e-cert.c:1111
 msgid "Issuer"
 msgstr "ççè"
 
-#: ../smime/lib/e-cert.c:1164
+#: ../smime/lib/e-cert.c:1166
 msgid "Issuer Unique ID"
 msgstr "ççèçæ ID"
 
-#: ../smime/lib/e-cert.c:1183
+#: ../smime/lib/e-cert.c:1185
 msgid "Subject Unique ID"
 msgstr "äæçæ ID"
 
-#: ../smime/lib/e-cert.c:1229
+#: ../smime/lib/e-cert.c:1231
 msgid "Certificate Signature Value"
 msgstr "èæççå"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ææåç"
 
-#: ../smime/lib/e-pkcs12.c:251
+#: ../smime/lib/e-pkcs12.c:250
 msgid "Enter password for PKCS12 file:"
 msgstr "èå PKCS12 ææçåç:"
 
-#: ../smime/lib/e-pkcs12.c:353
+#: ../smime/lib/e-pkcs12.c:352
 msgid "Imported Certificate"
 msgstr "èåçèæ"
 
@@ -19693,8 +19445,7 @@ msgstr "ææåå(_C)"
 msgid "_Address Cards"
 msgstr "ååå(_A)"
 
-#: ../views/addressbook/galview.xml.h:3
-#: ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "æåæè(_L)"
 
@@ -19763,7 +19514,7 @@ msgstr "èåçæ(_S)"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:780
 msgid "UTC"
 msgstr "UTC"
 
@@ -19781,7 +19532,8 @@ msgstr "æåäæåçåæå"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "äçæéåéæèååçååïçåéåæåã\n"
@@ -19791,14 +19543,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "éæçå(_S) "
 
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-define-views-dialog.c:348
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "åç %s çæè"
 
-#: ../widgets/menus/gal-define-views-dialog.c:354
 #: ../widgets/menus/gal-define-views-dialog.c:356
+#: ../widgets/menus/gal-define-views-dialog.c:358
 msgid "Define Views"
 msgstr "åçæè"
 
@@ -19807,11 +19559,11 @@ msgstr "åçæè"
 msgid "Define Views for \"%s\""
 msgstr "åçã%sãçæè"
 
-#: ../widgets/menus/gal-view-factory-etable.c:109
+#: ../widgets/menus/gal-view-factory-etable.c:111
 msgid "Table"
 msgstr "èæ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:273
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:275
 msgid "Save Current View"
 msgstr "ååçåæè"
 
@@ -19823,7 +19575,7 @@ msgstr "åçæçæè(_C)"
 msgid "_Replace existing view"
 msgstr "çæçåçæè(_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:106
+#: ../widgets/menus/gal-view-new-dialog.c:108
 msgid "Define New View"
 msgstr "åçæçæè"
 
@@ -19839,123 +19591,128 @@ msgstr "æèçéå"
 msgid "Type of view:"
 msgstr "æèçéå:"
 
-#: ../widgets/misc/e-account-manager.c:349
+#: ../widgets/misc/e-account-manager.c:353
 msgid "De_fault"
 msgstr "éèå(_F)"
 
-#: ../widgets/misc/e-account-tree-view.c:270
+#: ../widgets/misc/e-account-tree-view.c:243
+msgid "Account Name"
+msgstr "åèåç"
+
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "éèåå"
 
-#: ../widgets/misc/e-attachment-dialog.c:304
+#: ../widgets/misc/e-attachment-dialog.c:308
 msgid "Attachment Properties"
 msgstr "éäåå"
 
-#: ../widgets/misc/e-attachment-dialog.c:326
+#: ../widgets/misc/e-attachment-dialog.c:330
 msgid "_Filename:"
 msgstr "ææåç(_F):"
 
-#: ../widgets/misc/e-attachment-dialog.c:361
+#: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "MIME éåï"
 
-#: ../widgets/misc/e-attachment-dialog.c:369
-#: ../widgets/misc/e-attachment-store.c:556
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
 msgid "_Suggest automatic display of attachment"
 msgstr "åèèåéçéä(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:96
+#: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "çæèçèæ"
 
-#: ../widgets/misc/e-attachment-handler-image.c:148
+#: ../widgets/misc/e-attachment-handler-image.c:145
 msgid "Set as _Background"
 msgstr "èçèæ(_B)"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:90
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "çæéåéäã"
-msgstr[1] "çæéåéäã"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:132
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
 msgid "_Send To..."
 msgstr "åéè(_S)â"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:134
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
 msgid "Send the selected attachments somewhere"
 msgstr "åééåçéäååè"
 
-#: ../widgets/misc/e-attachment-icon-view.c:158
-#: ../widgets/misc/e-attachment-tree-view.c:543
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Loading"
 msgstr "èåä"
 
-#: ../widgets/misc/e-attachment-icon-view.c:170
-#: ../widgets/misc/e-attachment-tree-view.c:555
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
 msgid "Saving"
 msgstr "ååä"
 
-#: ../widgets/misc/e-attachment-paned.c:93
+#: ../widgets/misc/e-attachment-paned.c:97
 msgid "Hide Attachment _Bar"
 msgstr "éèéäå(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:95
-#: ../widgets/misc/e-attachment-paned.c:635
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
 msgid "Show Attachment _Bar"
 msgstr "éçéäå(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "Add Attachment"
 msgstr "ååéä"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:550
 msgid "A_ttach"
 msgstr "éå(_T)"
 
-#: ../widgets/misc/e-attachment-store.c:610
+#: ../widgets/misc/e-attachment-store.c:613
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "ååéä"
-msgstr[1] "ååéä"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:639
-#: ../widgets/misc/e-attachment.c:1806
-#: ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment.c:1809 ../widgets/misc/e-attachment.c:2351
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr "äåäæççåéåâ"
+
+#: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
 msgstr "åååé(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:375
+#: ../widgets/misc/e-attachment-view.c:437
 msgid "A_dd Attachment..."
 msgstr "ååéä(_A)â"
 
-#: ../widgets/misc/e-attachment-view.c:399
+#: ../widgets/misc/e-attachment-view.c:461
 msgid "_Hide"
 msgstr "éè(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:406
+#: ../widgets/misc/e-attachment-view.c:468
 msgid "Hid_e All"
 msgstr "åééè(_E)"
 
-#: ../widgets/misc/e-attachment-view.c:413
+#: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
 msgstr "æèèå(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:420
+#: ../widgets/misc/e-attachment-view.c:482
 msgid "Vie_w All Inline"
 msgstr "åéäèåæè(_W)"
 
-#: ../widgets/misc/e-attachment-view.c:738
+#: ../widgets/misc/e-attachment-view.c:803
 #, c-format
-msgid "Open with \"%s\""
+msgid "Open With \"%s\""
 msgstr "äã%sãéå"
 
-#: ../widgets/misc/e-attachment-view.c:741
+#: ../widgets/misc/e-attachment-view.c:806
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å %s äéåéåéä"
@@ -19964,80 +19721,82 @@ msgstr "å %s äéåéåéä"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:994
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "éåçéä"
 
-#: ../widgets/misc/e-attachment.c:1849
-#: ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2653
 msgid "A load operation is already in progress"
 msgstr "èåæäååéèä"
 
-#: ../widgets/misc/e-attachment.c:1857
-#: ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2661
 msgid "A save operation is already in progress"
 msgstr "ååæäååéèä"
 
-#: ../widgets/misc/e-attachment.c:1949
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load '%s'"
 msgstr "çæèåã%sã"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1955
 #, c-format
 msgid "Could not load the attachment"
 msgstr "çæèåéä"
 
-#: ../widgets/misc/e-attachment.c:2228
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open '%s'"
 msgstr "çæéåã%sã"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2234
 #, c-format
 msgid "Could not open the attachment"
 msgstr "çæéåéä"
 
-#: ../widgets/misc/e-attachment.c:2666
+#: ../widgets/misc/e-attachment.c:2669
 msgid "Attachment contents not loaded"
 msgstr "çæèåéäåå"
 
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save '%s'"
 msgstr "çæååã%sã"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2748
 #, c-format
 msgid "Could not save the attachment"
 msgstr "çæååéä"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:363
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-ééäéåéç"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1229
+#: ../widgets/misc/e-calendar-item.c:1247
 msgid "%B %Y"
 msgstr "%Yå%mæ"
 
-#: ../widgets/misc/e-calendar.c:225
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "æèäæ"
 
-#: ../widgets/misc/e-charset-combo-box.c:92
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "åççç"
 
-#: ../widgets/misc/e-charset-combo-box.c:115
+#: ../widgets/misc/e-charset-combo-box.c:119
 msgid "Enter the character set to use"
 msgstr "èåèäççåçé"
 
-#: ../widgets/misc/e-charset-combo-box.c:335
+#: ../widgets/misc/e-charset-combo-box.c:339
 msgid "Other..."
 msgstr "ååâ"
 
+#: ../widgets/misc/e-contact-map-window.c:347
+msgid "Contacts Map"
+msgstr "èçäåå"
+
 #: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "ææèæå"
@@ -20070,8 +19829,7 @@ msgstr "ææ(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1686
-#: ../widgets/misc/e-dateedit.c:1918
+#: ../widgets/misc/e-dateedit.c:1686 ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "ææ"
@@ -20084,168 +19842,173 @@ msgstr "çæçæææå"
 msgid "Invalid Time Value"
 msgstr "çæçæåæå"
 
-#: ../widgets/misc/e-import-assistant.c:245
-msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
+#: ../widgets/misc/e-import-assistant.c:249
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
 msgstr "éåèåå Evolution çææïääåæååéåææéåã"
 
-#: ../widgets/misc/e-import-assistant.c:262
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "ææåç(_I):"
 
-#: ../widgets/misc/e-import-assistant.c:272
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "éæäåææ"
 
-#: ../widgets/misc/e-import-assistant.c:286
-#: ../widgets/misc/e-import-assistant.c:461
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "ææéå(_T):"
 
-#: ../widgets/misc/e-import-assistant.c:329
-#: ../widgets/misc/e-import-assistant.c:905
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:910
 msgid "Choose the destination for this import"
 msgstr "éææèåçççå"
 
-#: ../widgets/misc/e-import-assistant.c:354
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "éæååæåèåèçéåï"
 
-#: ../widgets/misc/e-import-assistant.c:362
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "åèçåèåèæåèåå(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:370
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "åååäææ(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:522
-msgid "Evolution checked for settings to import from the following applications: Pine, Netscape, Elm, iCalendar. No importable settings found. If you would like to try again, please click the \"Back\" button."
+#: ../widgets/misc/e-import-assistant.c:526
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
 msgstr "Evolution åçææåääæççåèåçèååïPineãNetscapeãElmãiCalendarãæäååäèåçèååãåæäæåèäæïèæääãååãæéã"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:762
+#: ../widgets/misc/e-import-assistant.c:767
 msgid "_Cancel Import"
 msgstr "åæåå(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:904
+#: ../widgets/misc/e-import-assistant.c:909
 msgid "Preview data to be imported"
 msgstr "éèéèååçèæ"
 
-#: ../widgets/misc/e-import-assistant.c:910
-#: ../widgets/misc/e-import-assistant.c:923
-#: ../widgets/misc/e-import-assistant.c:1270
-#: ../widgets/misc/e-import-assistant.c:1336
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:928
+#: ../widgets/misc/e-import-assistant.c:1273
+#: ../widgets/misc/e-import-assistant.c:1349
+#: ../widgets/misc/e-import-assistant.c:1358
 msgid "Import Data"
 msgstr "ååèæ"
 
-#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:923
 msgid "Select what type of file you want to import from the list."
 msgstr "éæäæèåæåäååçææéåã"
 
-#: ../widgets/misc/e-import-assistant.c:1260
-#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1263
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid "Evolution Import Assistant"
 msgstr "Evolution åååç"
 
-#: ../widgets/misc/e-import-assistant.c:1277
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1336
 msgid "Import Location"
 msgstr "èåäç"
 
-#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1291
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing external files into Evolution."
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
 msgstr ""
 "æèäç Evolution çåååçã\n"
 "éåçéåæéåäåäååéçææååå Evolutionã"
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Importer Type"
 msgstr "èååéå"
 
-#: ../widgets/misc/e-import-assistant.c:1310
+#: ../widgets/misc/e-import-assistant.c:1318
 msgid "Select Information to Import"
 msgstr "éæèååçèè"
 
-#: ../widgets/misc/e-import-assistant.c:1317
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "éåææ"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1344
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æãåçãéååææååå Evolutionã"
 
-#: ../widgets/misc/e-map.c:866
+#: ../widgets/misc/e-map.c:869
 msgid "World Map"
 msgstr "äçåå"
 
-#: ../widgets/misc/e-map.c:869
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
+#: ../widgets/misc/e-map.c:872
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
 msgstr "çäéææåçæéäåååååäãäçéççäçèæèäçäæçäæåçåæåäéææåã"
 
-# zh_HK: msgstr "Evolution çåççäæåãæääææéäéèéçåäã"
-#: ../widgets/misc/e-online-button.c:23
+#: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
-msgstr "Evolution çåççäæåãæääææéäéèéçåäã"
+msgstr "Evolution çåççäæåãæääææéäéèéçåäã"
 
-# zh_HK: msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
-#: ../widgets/misc/e-online-button.c:26
+#: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
-msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
+msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
 
-# zh_HK: msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
-#: ../widgets/misc/e-online-button.c:29
+#: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
-msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
+msgstr "åççççæäçïEvolution çåçéçæåã"
 
-#: ../widgets/misc/e-preferences-window.c:275
+#: ../widgets/misc/e-preferences-window.c:279
 msgid "Evolution Preferences"
 msgstr "Evolution ååèå"
 
-#: ../widgets/misc/e-search-bar.c:75
+#: ../widgets/misc/e-search-bar.c:79
 #, c-format
 msgid "Matches: %d"
 msgstr "çåï%d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:561
 msgid "Close the find bar"
 msgstr "ééæåååå"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:569
 msgid "Fin_d:"
 msgstr "åæ(_D):"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:581
 msgid "Clear the search"
 msgstr "æéææå"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:605
 msgid "_Previous"
 msgstr "ääå(_P)"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:611
 msgid "Find the previous occurrence of the phrase"
 msgstr "åæääååççåè"
 
-#: ../widgets/misc/e-search-bar.c:620
+#: ../widgets/misc/e-search-bar.c:624
 msgid "_Next"
 msgstr "ääå(_N)"
 
-#: ../widgets/misc/e-search-bar.c:626
+#: ../widgets/misc/e-search-bar.c:630
 msgid "Find the next occurrence of the phrase"
 msgstr "åæääååççåè"
 
-#: ../widgets/misc/e-search-bar.c:639
+#: ../widgets/misc/e-search-bar.c:643
 msgid "Mat_ch case"
 msgstr "ååååå(_C)"
 
-#: ../widgets/misc/e-search-bar.c:667
+#: ../widgets/misc/e-search-bar.c:671
 msgid "Reached bottom of page, continued from top"
 msgstr "åéééåéïåéççç"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:693
 msgid "Reached top of page, continued from bottom"
 msgstr "åééééçïååéçç"
 
@@ -20384,38 +20147,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "ææ"
 
-#: ../widgets/misc/e-signature-editor.c:134
-#: ../widgets/misc/e-signature-editor.c:560
-#: ../widgets/misc/e-signature-manager.c:348
-#: ../widgets/misc/e-signature-script-dialog.c:215
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "æååç"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "åååéé(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:427
+#: ../widgets/misc/e-signature-editor.c:431
 msgid "Edit Signature"
 msgstr "çèçåæ"
 
-#: ../widgets/misc/e-signature-editor.c:442
+#: ../widgets/misc/e-signature-editor.c:446
 msgid "_Signature Name:"
 msgstr "çåæåç(_S):"
 
-#: ../widgets/misc/e-signature-manager.c:293
+#: ../widgets/misc/e-signature-manager.c:317
 msgid "Add Signature Script"
 msgstr "æåççåäç"
 
-#: ../widgets/misc/e-signature-manager.c:358
+#: ../widgets/misc/e-signature-manager.c:382
 msgid "Edit Signature Script"
 msgstr "çèççåäç"
 
-#: ../widgets/misc/e-signature-manager.c:577
+#: ../widgets/misc/e-signature-manager.c:602
 msgid "Add _Script"
 msgstr "æååäç(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:264
+#: ../widgets/misc/e-signature-script-dialog.c:268
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -20425,11 +20188,11 @@ msgstr ""
 "çåæãäæåçåçåæäç\n"
 "éçäçã"
 
-#: ../widgets/misc/e-signature-script-dialog.c:309
+#: ../widgets/misc/e-signature-script-dialog.c:313
 msgid "S_cript:"
 msgstr "åäç(_C):"
 
-#: ../widgets/misc/e-signature-script-dialog.c:340
+#: ../widgets/misc/e-signature-script-dialog.c:344
 msgid "Script file must be executable."
 msgstr "åäçåéçååèæã"
 
@@ -20437,80 +20200,86 @@ msgstr "åäçåéçååèæã"
 msgid "Click here to go to URL"
 msgstr "æéèäçè URL"
 
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:408
 msgid "_Copy Link Location"
 msgstr "èèéçäå(_C)"
 
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:410
 msgid "Copy the link to the clipboard"
 msgstr "èèéçååèè"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:418
 msgid "_Open Link in Browser"
 msgstr "åçèååéåéç(_O)"
 
-#: ../widgets/misc/e-web-view.c:387
+#: ../widgets/misc/e-web-view.c:420
 msgid "Open the link in a web browser"
 msgstr "åçéçèåäéåæéç"
 
-#: ../widgets/misc/e-web-view.c:395
+#: ../widgets/misc/e-web-view.c:428
 msgid "_Copy Email Address"
 msgstr "èèéåéääå(_C)"
 
-#: ../widgets/misc/e-web-view.c:424
-#: ../widgets/misc/e-web-view.c:1080
+#: ../widgets/misc/e-web-view.c:445
+msgid "_Copy Image"
+msgstr "èèåç(_C)"
+
+#: ../widgets/misc/e-web-view.c:447
+msgid "Copy the image to the clipboard"
+msgstr "èèåçååèè"
+
+#: ../widgets/misc/e-web-view.c:467 ../widgets/misc/e-web-view.c:1292
 msgid "Select all text and images"
 msgstr "éææææåååç"
 
-#: ../widgets/misc/e-web-view.c:860
-#: ../widgets/misc/e-web-view.c:862
-#: ../widgets/misc/e-web-view.c:864
+#: ../widgets/misc/e-web-view.c:956 ../widgets/misc/e-web-view.c:958
+#: ../widgets/misc/e-web-view.c:960
 #, c-format
 msgid "Click to call %s"
 msgstr "æääæèç %s"
 
-#: ../widgets/misc/e-web-view.c:866
+#: ../widgets/misc/e-web-view.c:962
 msgid "Click to hide/unhide addresses"
 msgstr "æéèéè/èééèäå"
 
-#: ../widgets/misc/e-web-view.c:868
+#: ../widgets/misc/e-web-view.c:964
 #, c-format
 msgid "Click to open %s"
 msgstr "æäääéå %s"
 
-#: ../widgets/misc/ea-calendar-item.c:299
-#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:302
+#: ../widgets/misc/ea-calendar-item.c:311
 msgid "%d %B %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../widgets/misc/ea-calendar-item.c:311
+#: ../widgets/misc/ea-calendar-item.c:314
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "èäæïå %s å %s"
 
-#: ../widgets/misc/ea-calendar-item.c:347
+#: ../widgets/misc/ea-calendar-item.c:350
 msgid "evolution calendar item"
 msgstr "evolution èäæéç"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "åååæå"
 
-#: ../widgets/table/e-cell-date-edit.c:300
+#: ../widgets/table/e-cell-date-edit.c:299
 msgid "Now"
 msgstr "çå"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:317
+#: ../widgets/table/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "ææ"
 
-#: ../widgets/table/e-cell-date-edit.c:325
+#: ../widgets/table/e-cell-date-edit.c:324
 msgid "OK"
 msgstr "çå"
 
-#: ../widgets/table/e-cell-date-edit.c:869
+#: ../widgets/table/e-cell-date-edit.c:868
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "æéåéçææåï%s"
@@ -20519,36 +20288,34 @@ msgstr "æéåéçææåï%s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "æååéæç 0 å 100 çæå"
 
-#: ../widgets/table/e-table-click-to-add.c:592
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
+#: ../widgets/table/e-table-click-to-add.c:594
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:141
 msgid "click to add"
 msgstr "èæéèåå"
 
-#: ../widgets/table/e-table-config.c:385
-#: ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Ascending)"
 msgstr "(éå)"
 
-#: ../widgets/table/e-table-config.c:385
-#: ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Descending)"
 msgstr "(éæ)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:394
 msgid "Not sorted"
 msgstr "ææå"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:435
 msgid "No grouping"
 msgstr "æçæçç"
 
-#: ../widgets/table/e-table-config.c:654
+#: ../widgets/table/e-table-config.c:659
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "éçæä"
 
-#: ../widgets/table/e-table-config.c:674
+#: ../widgets/table/e-table-config.c:679
 msgid "Available Fields"
 msgstr "åççæä"
 
@@ -20557,7 +20324,7 @@ msgid "A_vailable Fields:"
 msgstr "åççæä(_V):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "Ascending"
 msgstr "éå"
 
@@ -20570,7 +20337,7 @@ msgid "Clear _All"
 msgstr "åéæé(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "Descending"
 msgstr "éæ"
 
@@ -20618,6 +20385,10 @@ msgstr "æäéç(_F)â"
 msgid "_Group By..."
 msgstr "ççææ(_G)â"
 
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "çé(_R)"
+
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "éçæèäçæä(_S)"
@@ -20630,11 +20401,11 @@ msgstr "ææåéçéäæä(_S):"
 msgid "_Sort..."
 msgstr "æå(_S)â"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:117
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
 msgid "Add a Column"
 msgstr "ååäæ"
 
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -20649,12 +20420,11 @@ msgstr ""
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:353
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%sï%s (%d åéç)"
-msgstr[1] "%sï%s (%d åéç)"
 
 #. Translators: This text is used as a special row when an ETable
 #. has turned on grouping on a column, which doesn't have set a title.
@@ -20662,418 +20432,105 @@ msgstr[1] "%sï%s (%d åéç)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:365
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d åéç)"
-msgstr[1] "%s (%d åéç)"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1523
 msgid "Customize Current View"
 msgstr "èéçåçæè"
 
-#: ../widgets/table/e-table-header-item.c:1525
+#: ../widgets/table/e-table-header-item.c:1544
 msgid "Sort _Ascending"
 msgstr "éåæå(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1528
+#: ../widgets/table/e-table-header-item.c:1547
 msgid "Sort _Descending"
 msgstr "éææå(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1550
 msgid "_Unsort"
 msgstr "äæå(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1553
 msgid "Group By This _Field"
 msgstr "ææææäåçç(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1556
 msgid "Group By _Box"
 msgstr "æææåççç(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "Remove This _Column"
 msgstr "çéææ(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1544
+#: ../widgets/table/e-table-header-item.c:1563
 msgid "Add a C_olumn..."
 msgstr "ååäæ(_O)â"
 
-#: ../widgets/table/e-table-header-item.c:1548
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "A_lignment"
 msgstr "æå(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1551
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "B_est Fit"
 msgstr "æéåæ(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "Format Column_s..."
 msgstr "æååæ(_S)â"
 
-#: ../widgets/table/e-table-header-item.c:1558
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Custo_mize Current View..."
 msgstr "èéçåçæè(_M)â"
 
-#: ../widgets/table/e-table-header-item.c:1617
+#: ../widgets/table/e-table-header-item.c:1636
 msgid "_Sort By"
 msgstr "æåæå(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1635
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Custom"
 msgstr "èé(_C)"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "åååéå"
 
 #. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
 msgid "toggle the cell"
 msgstr "åæååæ"
 
 #. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
 msgid "expands the row in the ETree containing this cell"
 msgstr "åé ETree äååæååæçå"
 
 #. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "æç ETree äååæååæçå"
 
-#: ../widgets/table/gal-a11y-e-cell.c:119
+#: ../widgets/table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "èæçååæ"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "éé"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+#: ../widgets/table/gal-a11y-e-table-column-header.c:157
 msgid "sort"
 msgstr "æå"
 
-#: ../widgets/text/e-text.c:2283
+#: ../widgets/text/e-text.c:2306
 msgid "Select All"
 msgstr "åééå"
 
-#: ../widgets/text/e-text.c:2295
+#: ../widgets/text/e-text.c:2318
 msgid "Input Methods"
 msgstr "èåæ"
-
-#~ msgid "(map)"
-#~ msgstr "(æå)"
-
-#~ msgid "map"
-#~ msgstr "åæ"
-
-#~ msgid "Accessing LDAP Server anonymously"
-#~ msgstr "æäååæååå LDAP äæå"
-
-#~ msgid "Select folder to import OE folder into"
-#~ msgstr "éååå OE èæåççèæå"
-
-#~ msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
-#~ msgstr "éæäå png ççïæååæ 700 äåçïåå 48*48ï"
-
-#~ msgid "Account Management"
-#~ msgstr "åèçç"
-
-#~ msgid "Migrate local mbox folders to maildir"
-#~ msgstr "åæåç mbox èæåèæç maildir"
-
-#~ msgid "Start Evolution activating the specified component"
-#~ msgstr "åå Evolution æååæåçåä"
-
-#~ msgid "Count of default recurrence for a new event. -1 means forever."
-#~ msgstr "æääçéèéææææã -1 äèæéã"
-
-#~ msgid "Default recurrence count"
-#~ msgstr "éèéæåçææ"
-
-#~ msgid "Event Gradient"
-#~ msgstr "ääæåææ"
-
-#~ msgid "Event Transparency"
-#~ msgstr "ääéæææ"
-
-#~ msgid "Gradient of the events in calendar views."
-#~ msgstr "èäææèäçääæåææã"
-
-#~ msgid ""
-#~ "Transparency of the events in calendar views, a value between 0 "
-#~ "(transparent) and 1 (opaque)."
-#~ msgstr ""
-#~ "èäææèäçääéæåææïæåäæ 0 (ååéæ)å 10 (äéæ)äéã"
-
-#~ msgid "URI of the highlighted (\"primary\") calendar"
-#~ msgstr "çéç(ãäèã)èäæç URI"
-
-#~ msgid "URI of the highlighted (\"primary\") memo list"
-#~ msgstr "çéç(ãäèã)ååéæåç URI"
-
-#~ msgid "URI of the highlighted (\"primary\") task list"
-#~ msgstr "çéç(ãäèã)åäæåç URI"
-
-#~ msgid "Recurring:"
-#~ msgstr "åçæåï"
-
-#~ msgid "Yes. (Complex Recurrence)"
-#~ msgstr "æã(èéåç)"
-
-#~ msgid "Every day"
-
-#~ msgid_plural "Every %d days"
-#~ msgstr[0] "æå"
-#~ msgstr[1] "æ %d å"
-
-#~ msgid "Every week"
-
-#~ msgid_plural "Every %d weeks"
-#~ msgstr[0] "æé"
-#~ msgstr[1] "æ %d é"
-
-#~ msgid "Every week on "
-
-#~ msgid_plural "Every %d weeks on "
-#~ msgstr[0] "æéæ"
-#~ msgstr[1] "æ %d éæ"
-
-#~ msgid " and "
-#~ msgstr " å "
-
-#~ msgid "The %s day of "
-#~ msgstr "%s ææ "
-
-#~ msgid "The %s %s of "
-#~ msgstr "%s %s ææ "
-
-#~ msgid "every month"
-
-#~ msgid_plural "every %d months"
-#~ msgstr[0] "ææ"
-#~ msgstr[1] "æ %d æ"
-
-#~ msgid "Every year"
-
-#~ msgid_plural "Every %d years"
-#~ msgstr[0] "æå"
-#~ msgstr[1] "æ %d å"
-
-#~ msgid "a total of %d time"
-
-#~ msgid_plural "a total of %d times"
-#~ msgstr[0] "çå %d æ"
-#~ msgstr[1] "çå %d æ"
-
-#~ msgid ", ending on "
-#~ msgstr "ïçææ "
-
-#~ msgid "Starts"
-#~ msgstr "éå"
-
-#~ msgid "Ends"
-#~ msgstr "çæ"
-
-#~ msgid "iCalendar Information"
-#~ msgstr "iCalendar èè"
-
-#~ msgid "iCalendar Error"
-#~ msgstr "iCalendar éè"
-
-#~ msgid ""
-#~ "Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr " èæéäåèèïçååäéçéåäéæäååäã"
-
-#~ msgid ""
-#~ "The meeting has been canceled, however it could not be found in your "
-#~ "calendars"
-#~ msgstr "æèåçåæïäæåæçèäæäæäå"
-
-#~ msgid ""
-#~ "The task has been canceled, however it could not be found in your task "
-#~ "lists"
-#~ msgstr "åäåçåæïäæåæçåäæåäæäå"
-
-#~ msgid "%s has published meeting information."
-#~ msgstr "%s åççåæèèèã"
-
-#~ msgid "Meeting Information"
-#~ msgstr "æèèè"
-
-#~ msgid "%s requests the presence of %s at a meeting."
-#~ msgstr "%s éè %s ååæææèã"
-
-#~ msgid "%s requests your presence at a meeting."
-#~ msgstr "%s éèæååæææèã"
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "æèææ"
-
-#~ msgid "%s wishes to be added to an existing meeting."
-#~ msgstr "%s åæååäåæåçæèã"
-
-#~ msgid "Meeting Update"
-#~ msgstr "æèææ"
-
-#~ msgid "%s wishes to receive the latest meeting information."
-#~ msgstr "%s åææåææçæèèèã"
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "æèææèæ"
-
-#~ msgid "%s has replied to a meeting request."
-#~ msgstr "%s åççèäæèèæã"
-
-#~ msgid "Meeting Reply"
-#~ msgstr "æèçè"
-
-#~ msgid "%s has canceled a meeting."
-#~ msgstr "%s åçæåæèã"
-
-#~ msgid "Meeting Cancelation"
-#~ msgstr "æèåæ"
-
-#~ msgid "%s has sent an unintelligible message."
-#~ msgstr "%s åéääåéäçèçèæã"
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "äæççæèèæ"
-
-#~ msgid "%s has published task information."
-#~ msgstr "%s åççåäåäèèã"
-
-#~ msgid "Task Information"
-#~ msgstr "åäèè"
-
-#~ msgid "%s requests %s to perform a task."
-#~ msgstr "%s èæ %s éèåäã"
-
-#~ msgid "%s requests you perform a task."
-#~ msgstr "%s èææéèåäã"
-
-#~ msgid "Task Proposal"
-#~ msgstr "åäèå"
-
-#~ msgid "%s wishes to be added to an existing task."
-#~ msgstr "%s åæååäéæåçåäã"
-
-#~ msgid "Task Update"
-#~ msgstr "åäææ"
-
-#~ msgid "%s wishes to receive the latest task information."
-#~ msgstr "%s åææåææçåäèèã"
-
-#~ msgid "Task Update Request"
-#~ msgstr "åäææèæ"
-
-#~ msgid "%s has replied to a task assignment."
-#~ msgstr "%s åçåèææçåäã"
-
-#~ msgid "Task Reply"
-#~ msgstr "åäåè"
-
-#~ msgid "%s has canceled a task."
-#~ msgstr "%s åçåæåäã"
-
-#~ msgid "Task Cancelation"
-#~ msgstr "åäåæ"
-
-#~ msgid "Bad Task Message"
-#~ msgstr "äæççåäèæ"
-
-#~ msgid "%s has published free/busy information."
-#~ msgstr "%s åççåçé/åçèèã"
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "çé/åçèè"
-
-#~ msgid "%s requests your free/busy information."
-#~ msgstr "%s èææççé/åçèèã"
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "çé/åçèæ"
-
-#~ msgid "%s has replied to a free/busy request."
-#~ msgstr "%s åççèçé/åçèæã"
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "çé/åçåè"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "äæçççé/åçèæ"
-
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "éäääææèéçåçæ"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "éåéäåååäææçèæã"
-
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "éäææåæèçèäæéç"
-
-#~ msgid "Update complete\n"
-#~ msgstr "ææåæ\n"
-
-#~ msgid "Object is invalid and cannot be updated\n"
-#~ msgstr "çäæçæçèääèææ\n"
-
-#~ msgid "This response is not from a current attendee.  Add as an attendee?"
-#~ msgstr "éååèäéäèçåçåæèãåäååçåæèï"
-
-#~ msgid "Attendee status could not be updated because of an invalid status!\n"
-#~ msgstr "çæäåæççæäååæèçæçæææï\n"
-
-#~ msgid "Attendee status updated\n"
-#~ msgstr "åæèçæåææ\n"
-
-#~ msgid "Item sent!\n"
-#~ msgstr "éçåéï\n"
-
-#~ msgid "The item could not be sent!\n"
-#~ msgstr "çæåééåéçï\n"
-
-#~ msgid "Choose an action:"
-#~ msgstr "éæäååä:"
-
-#~ msgid "Update"
-#~ msgstr "ææ"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "æææå"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "éåçé/åçèè"
-
-#~ msgid "Update respondent status"
-#~ msgstr "ææåæçæ"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "éåææèè"
-
-#~ msgid "--to--"
-#~ msgstr "--å--"
-
-#~ msgid "Calendar Message"
-#~ msgstr "èäæèæ"
-
-#~ msgid "Date:"
-#~ msgstr "ææ:"
-
-#~ msgid "Loading Calendar"
-#~ msgstr "èåèäæ"
-
-#~ msgid "Loading calendar..."
-#~ msgstr "èåèäæâ"
-
-#~ msgid "Organizer:"
-#~ msgstr "æèåéä:"
-
-#~ msgid "Server Message:"
-#~ msgstr "äæåèæ:"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b49c3d7..be176f1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,192 +7,253 @@
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
 #
+#: ../shell/main.c:569
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 3.0.0\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N\n";
-"POT-Creation-Date: 2011-04-03 22:48+0000\n"
-"PO-Revision-Date: 2011-04-04 14:15+0800\n"
+"Project-Id-Version: evolution 3.1.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-29 16:02+0800\n"
+"PO-Revision-Date: 2011-07-29 11:57+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
-msgstr "ã{0}ãæäååèçéèéïäèèäæãèåéçäæèçåéæäéæäåçéèéã"
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"ã{0}ãæäååèçéèéïäèèäæãèåéçäæèçåéæäéæäåçéè"
+"éã"
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
 msgstr "æéçäçéåéäåååçååãæçèåäéèåååæäåçæåçåï"
 
 #: ../addressbook/addressbook.error.xml.h:4
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr "äã{0}ãçåçéçäæååçååéåéçäæåäãèååååååï"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "ååéèéç"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "éèéã{0}ãååå"
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "äèååæçéçä"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "çæçåéçäã"
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "åéçèåçæäçã"
 
-#: ../addressbook/addressbook.error.xml.h:8
-msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "èææäçåæçåçæææçïèäæäççæææççåææãèèåèååçæåååååïæåèååäååéåéã"
+#: ../addressbook/addressbook.error.xml.h:10
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"èææäçåæçåçæææçïèäæäççæææççåææãèèåèååçæ"
+"åååååïæåèååäååéåéã"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "çæåå LDAP äæåççèèèã"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "çæçééèéã"
 
-#: ../addressbook/addressbook.error.xml.h:11
-msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr "çåæåèåå Evolution äç GroupWise ççéèéãèäçäæåäç GroupWise éäåæçïäååæç GroupWise åçéçäå Groupwise åäéçäèæåã"
+#: ../addressbook/addressbook.error.xml.h:13
+msgid ""
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+"çåæåèåå Evolution äç GroupWise ççéèéãèäçäæåäç "
+"GroupWise éäåæçïäååæç GroupWise åçéçäå Groupwise åäéçä"
+"èæåã"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "åééèéã{0}ãï"
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34
-#: ../mail/mail.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "äèåé(_N)"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "å {0} ååè {1} ççéèï {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "çæéè LDAP äæåã"
 
-#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
 msgid "Failed to delete contact"
 msgstr "åééçäåæ"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise éèéçåç"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP äæåæåæææççèèèã"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr "æåã{0}ãåçåéåéçäæåäã"
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "çééèéç"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "æääåååéåéçäæåäã"
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
 msgstr "æäåèåèçæåæçåçäæåçæäæåéä"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution éèéåçæåçæã"
 
-#: ../addressbook/addressbook.error.xml.h:21
-msgid "The image you have selected is large. Do you want to resize and store it?"
+#: ../addressbook/addressbook.error.xml.h:26
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr "äæéæçåçååãææåèæèåååæåååï"
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
-msgstr "æ LDAP äæååèäçèç LDAP çæïåäæææåèïæåèèåéèãèæèççåïçèææçæååçã"
+#: ../addressbook/addressbook.error.xml.h:27
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"æ LDAP äæååèäçèç LDAP çæïåäæææåèïæåèèåéèãèæè"
+"ççåïçèææçæååçã"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "çæéåæéèéã"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr "æéèéäæåææääåèçæååçã"
 
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
+#: ../addressbook/addressbook.error.xml.h:30
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr "æéèéäæåçæéçïæäæååçåèæéïææççèéçåçåæã"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "æéèéåèæéçéã"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "æäæåäææ LDAPv3 çèèèã"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "çæéåéèé"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "çæåèæåã"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "çæåå {0}ã"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "èååæåçèæï"
 
-#: ../addressbook/addressbook.error.xml.h:32
-msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
-msgstr "ææååèåæäåéèéïåéçäçèåäåéèéïäæåçæåäæçéãææèååäååæääæåï"
+#: ../addressbook/addressbook.error.xml.h:37
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"ææååèåæäåéèéïåéçäçèåäåéèéïäæåçæåäæçéãæ"
+"æèååäååæääæåï"
 
-#: ../addressbook/addressbook.error.xml.h:33
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
-msgstr "ææéçåäææç GroupWise äæåèäåèéåäç Evolution çåéãæåçèææææåèäæååçèææççå"
+#: ../addressbook/addressbook.error.xml.h:38
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
+"ææéçåäææç GroupWise äæåèäåèéåäç Evolution çåéãæåç"
+"èææææåèäæååçèææççå"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:39
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr "æåèååçäååçæéåæåçäéåãèåååååååï"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "æææèåçæéåééåéèéäçéçäã"
 
-#: ../addressbook/addressbook.error.xml.h:35
-msgid "You have made modifications to this contact. Do you want to save these changes?"
+#: ../addressbook/addressbook.error.xml.h:41
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr "æåçäææéçäãèååéäèæï"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:43
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "éæåå Evolution äåïçæäç {0} çéçäã"
 
-#: ../addressbook/addressbook.error.xml.h:38
-#: ../mail/em-vfolder-rule.c:610
-#: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:604
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "åå(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "ææ(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "äèåå(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "èæåå(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "ååèç(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:706
 #: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "éåçåæ"
@@ -203,10 +264,9 @@ msgstr "éåçåæ"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/e-calendar-view.c:2077
-#: ../capplet/anjal-settings-main.c:116
-#: ../shell/main.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:705
+#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
+#: ../shell/main.c:140
 msgid "Birthday"
 msgstr "çæ"
 
@@ -226,24 +286,23 @@ msgid "Calendar:"
 msgstr "èäæï"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:950
+#: ../addressbook/importers/evolution-vcard-importer.c:979
 msgid "Contact"
 msgstr "éçä"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:623
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:646
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2865
 msgid "Contact Editor"
 msgstr "éçäçèå"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:358
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:502
-#: ../addressbook/gui/widgets/eab-contact-display.c:844
-#: ../plugins/groupwise-features/junk-settings.c:409
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:1000
 #: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "éåéä"
@@ -257,8 +316,10 @@ msgid "Full _Name..."
 msgstr "åå(_N)â"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1302
+#: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "äå"
 
@@ -292,17 +353,14 @@ msgid "Nic_kname:"
 msgstr "æç(_K):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:429
-#: ../plugins/groupwise-features/camel-gw-listener.c:454
-#: ../plugins/groupwise-features/camel-gw-listener.c:570
+#: ../modules/calendar/e-memo-shell-migrate.c:265
 msgid "Notes"
 msgstr "åè"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:403
 #: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "åä"
@@ -328,9 +386,11 @@ msgid "Web addresses"
 msgstr "çå"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:67
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
+#: ../addressbook/gui/widgets/eab-contact-display.c:1299
+#: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "åä"
 
@@ -355,9 +415,9 @@ msgid "_Blog:"
 msgstr "éèæ(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:708
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1922
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "èäæ(_C):"
 
@@ -413,7 +473,6 @@ msgstr "éå(_S):"
 msgid "_State/Province:"
 msgstr "å/ç(_S):"
 
-# (Abel) èçåèåéçäæç Title (Dr., Ms.) æèç
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
@@ -436,74 +495,74 @@ msgstr "éèé(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "ééåè(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:523
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:381
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:447
 msgid "Error adding contact"
 msgstr "æåéçäæççéè"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "äæéçäæççéè"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "çééçäæççéè"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:638
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2649
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2859
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "éçäçèå - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
 msgid "Please select an image for this contact"
 msgstr "èéåäèæéçäçåç"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3302
 msgid "_No image"
 msgstr "ææåç(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3615
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -511,43 +570,43 @@ msgstr ""
 "éçäèæçæï\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3356
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3619
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "ã%sãåæçæçæå"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3363
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3626
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sã%sãåæçæçæå"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3378
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3389
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3638
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3649
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sã%sãæçç"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3404
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3664
 msgid "Invalid contact."
 msgstr "çæçéçäã"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:392
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "Contact Quick-Add"
 msgstr "åéæåéçä"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:395
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:414
 msgid "_Edit Full"
 msgstr "çèåé(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:443
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:462
 msgid "_Full name"
 msgstr "åå(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:473
 msgid "E_mail"
 msgstr "éåéä(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:465
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:484
 msgid "_Select Address Book"
 msgstr "éæéèé(_S)"
 
@@ -617,7 +676,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:652
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:729
 msgid "Contact List Editor"
 msgstr "éçäæåçèå"
 
@@ -634,7 +693,7 @@ msgid "_List name:"
 msgstr "åååç(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "éå(_S)â"
 
@@ -642,27 +701,26 @@ msgstr "éå(_S)â"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "èåéåéäååæææéçäåääæå(_T):"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:852
 msgid "Contact List Members"
 msgstr "éçäæåæå"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1316
-msgid "_Members"
-msgstr "æå(_M)"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1153
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1422
 msgid "Error adding list"
 msgstr "æåæåæççéè"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1437
 msgid "Error modifying list"
 msgstr "çèæåæççéè"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1452
 msgid "Error removing list"
 msgstr "çéæåæççéè"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1583
+msgid "_Members"
+msgstr "æå(_M)"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "èæåçéçä:"
@@ -678,8 +736,10 @@ msgid "Duplicate Contact Detected"
 msgstr "åæåéèçéçä"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
-msgstr "æéçäçåçæéåéäåååçååææèæåãçèåäéèæåååï"
+msgid ""
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
+msgstr "æéçäçåçæéåéäåååçååææèæåãèååååèæåï"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -698,61 +758,53 @@ msgstr ""
 "ææèæåãæçèåäéèæåååï"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:304
 msgid "_Merge"
 msgstr "åä(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
-#: ../calendar/gui/tasktypes.xml.h:7
-#, c-format
-msgid "Cancelled"
-msgstr "ååæ"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:287
 msgid "Merge Contact"
 msgstr "åäéçä"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1693
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Any field contains"
 msgstr "ääæäåå"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Email begins with"
 msgstr "éåéäéåæ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Name contains"
 msgstr "åçåå"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:145
+#: ../addressbook/gui/widgets/e-addressbook-model.c:155
 msgid "No contacts"
 msgstr "ææéçä"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:159
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d åéçä"
-msgstr[1] "%d åéçä"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:342
+#: ../addressbook/gui/widgets/e-addressbook-model.c:340
 msgid "Error getting book view"
 msgstr "ååæææèæççéè"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:756
+#: ../addressbook/gui/widgets/e-addressbook-model.c:751
 msgid "Search Interrupted"
 msgstr "æåèäæ"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
 msgid "Error modifying card"
 msgstr "çèåçæççéè"
 
@@ -769,7 +821,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "ååèçèäéçä"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
 msgstr "åééåçéçä"
 
@@ -777,34 +829,34 @@ msgstr "åééåçéçä"
 msgid "Select all visible contacts"
 msgstr "éæåéåèçéçä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "æçåèåééäéçäæåï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 msgid "Are you sure you want to delete this contact list?"
 msgstr "æçåèåééåéçäæåï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "æçåèåééåéçäæå (%s)ï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
 msgid "Are you sure you want to delete these contacts?"
 msgstr "æçåèåééäéçäï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
 msgid "Are you sure you want to delete this contact?"
 msgstr "æçåèåééåéçäï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "æçåèåééåéçä (%s)ï"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -815,20 +867,17 @@ msgid_plural ""
 msgstr[0] ""
 "éå %d åéçäæåæéå %d åæèçã\n"
 "çåèéçéèææçéçäï"
-msgstr[1] ""
-"éå %d åéçäæåæéå %d åæèçã\n"
-"çåèéçéèææçéçäï"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1496
 msgid "_Don't Display"
 msgstr "äèéç(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1497
 msgid "Display _All Contacts"
 msgstr "éçææçéçä(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:677
 msgid "Assistant"
 msgstr "åç"
 
@@ -865,7 +914,7 @@ msgid "Categories"
 msgstr "åé"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:672
 msgid "Company"
 msgstr "åå"
 
@@ -914,22 +963,22 @@ msgid "Journal"
 msgstr "æè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Manager"
 msgstr "äç"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
 msgid "Mobile Phone"
 msgstr "èåéè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:509
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Nickname"
 msgstr "æç"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:729
 msgid "Note"
 msgstr "åè"
 
@@ -958,13 +1007,13 @@ msgid "Radio"
 msgstr "ççééè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:571
+#: ../calendar/gui/e-meeting-list-view.c:585
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "èè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:707
 msgid "Spouse"
 msgstr "éå"
 
@@ -994,7 +1043,7 @@ msgstr "åä"
 msgid "Web Site"
 msgstr "çå"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1004,7 +1053,7 @@ msgstr ""
 "\n"
 "æåéçä..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1018,7 +1067,7 @@ msgstr ""
 "\n"
 "éæéèäåçæçéçäã"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1032,7 +1081,7 @@ msgstr ""
 "\n"
 "éæéèäåçæçéçäã"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1042,7 +1091,7 @@ msgstr ""
 "\n"
 "åæéçäã"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
 msgid ""
 "\n"
 "\n"
@@ -1052,110 +1101,111 @@ msgstr ""
 "\n"
 "ææéçåäéçæèæåéçã"
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "åäéåéä"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "äåéåéä"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:805
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "ååéåéä"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:184
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
 msgid "evolution address book"
 msgstr "evolution éèé"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact"
 msgstr "æåéçä"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
 msgid "New Contact List"
 msgstr "æåéçäæå"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:167
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "çåçéèéèæå %s æ %d ååç"
-msgstr[1] "çåçéèéèæå %s æ %d ååç"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:31
+#: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "éå"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:153
+#: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
 msgstr "éçäæå: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:154
+#: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
 msgstr "éçä: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:180
+#: ../addressbook/gui/widgets/ea-minicard.c:183
 msgid "evolution minicard"
 msgstr "Evolution èäåç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "èèéåéääå(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../widgets/misc/e-web-view.c:397
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:430
 msgid "Copy the email address to the clipboard"
 msgstr "èèéåéääåååèç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:179
-#: ../widgets/misc/e-web-view.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:435
 msgid "_Send New Message To..."
 msgstr "åéæéäè(_S)â"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:404
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:437
 msgid "Send a mail message to this address"
 msgstr "åééäåéåäå"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:424
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
-msgid "List Members"
-msgstr "æåæå"
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
+msgid "Open map"
+msgstr "éååå"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
+msgid "List Members:"
+msgstr "æåæåï"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:673
 msgid "Department"
 msgstr "éé"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:674
 msgid "Profession"
 msgstr "èæ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/widgets/eab-contact-display.c:675
 msgid "Position"
 msgstr "äç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/widgets/eab-contact-display.c:678
 msgid "Video Chat"
 msgstr "èèäè"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:427
-#: ../plugins/groupwise-features/camel-gw-listener.c:452
-#: ../plugins/groupwise-features/camel-gw-listener.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:679
+#: ../calendar/gui/dialogs/calendar-setup.c:396
+#: ../modules/calendar/e-cal-shell-view-actions.c:222
+#: ../modules/calendar/e-cal-shell-view-actions.c:251
+#: ../modules/calendar/e-cal-shell-view.c:507
+#: ../modules/online-accounts/e-online-accounts-google.c:292
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "èäæ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
@@ -1163,25 +1213,25 @@ msgstr "èäæ"
 msgid "Free/Busy"
 msgstr "çé/åç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
+#: ../addressbook/gui/widgets/eab-contact-display.c:702
 msgid "Phone"
 msgstr "éè"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Fax"
 msgstr "åç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
 msgid "Address"
 msgstr "åå"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:699
 msgid "Home Page"
 msgstr "éé"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:700
 msgid "Web Log"
 msgstr "çè"
 
@@ -1189,59 +1239,77 @@ msgstr "çè"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../capplet/settings/mail-capplet-shell.c:361
-#: ../modules/addressbook/e-book-shell-backend.c:112
-#: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:161
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:128
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
+#: ../capplet/settings/mail-capplet-shell.c:376
+#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/calendar/e-cal-shell-backend.c:134
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:118
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:118
+#: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "åä"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:829
+#: ../addressbook/gui/widgets/eab-contact-display.c:967
+msgid "List Members"
+msgstr "æåæå"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:985
 msgid "Job Title"
 msgstr "èç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:866
+#: ../addressbook/gui/widgets/eab-contact-display.c:1022
 msgid "Home page"
 msgstr "éé"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:875
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
 msgid "Blog"
 msgstr "éèæ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
-#: ../widgets/misc/e-web-view.c:858
+#: ../addressbook/gui/widgets/eab-contact-display.c:1229
+#: ../widgets/misc/e-web-view.c:954
 #, c-format
 msgid "Click to mail %s"
 msgstr "æäääåééä %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
-msgstr "æåçæéåéåçéæåãéåèèçæçéæåææèçéççéæèåæäèääéçäçãèæäçæååæèåçéæåääèåçååã"
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"æåçæéåéåçéæåãéåèèçæçéæåææèçéççéæèåæäèä"
+"äéçäçãèæäçæååæèåçéæåääèåçååã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, c-format
-msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
-msgstr "æåçæéåéåçéæåãèææèå %s æåååèäæéåèååäåååã"
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"æåçæéåéåçéæåãèææèå %s æåååèäæéåèååäåååã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
-msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr "æ Evolution çææå LDAP ææçèéåãåæææå Evolution äç LDAPïåéåèåç LDAP ç Evolution åäã"
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"æ Evolution çææå LDAP ææçèéåãåæææå Evolution äç LDAPïåé"
+"åèåç LDAP ç Evolution åäã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:126
-msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr "æåçæéåéåçéæåãéèçæèåéèçURIïæäæåçæéçã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Detailed error message:"
 msgstr "èççéèèæï"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1253,7 +1321,7 @@ msgstr ""
 "èäçæåæççæèæææéæçéæåççé\n"
 "äæåååèåäççæéåã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:207
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1266,194 +1334,222 @@ msgstr ""
 "æéäéã"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "æçéæåçåççåçæèæéæçæèã%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:220
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "æçéæåçåççåæçåèéæçæèã%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#: ../addressbook/gui/widgets/eab-gui-util.c:232
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "éæçæèäæååæåã%s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:214
+#: ../addressbook/gui/widgets/eab-gui-util.c:254
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:254
+#: ../addressbook/gui/widgets/eab-gui-util.c:294
 msgid "Select Address Book"
 msgstr "éæéèé"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:357
 msgid "list"
 msgstr "æå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:455
+#: ../addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Move contact to"
 msgstr "åéçäçå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:457
+#: ../addressbook/gui/widgets/eab-gui-util.c:527
 msgid "Copy contact to"
 msgstr "èèéçäå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:530
 msgid "Move contacts to"
 msgstr "åéçäçå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:532
 msgid "Copy contacts to"
 msgstr "èèéçäå"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "åçæèæå"
 
-#: ../addressbook/importers/evolution-csv-importer.c:721
-#: ../addressbook/importers/evolution-ldif-importer.c:519
-#: ../addressbook/importers/evolution-vcard-importer.c:278
-#: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764
-#: ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:740
+#: ../addressbook/importers/evolution-ldif-importer.c:539
+#: ../addressbook/importers/evolution-vcard-importer.c:282
+#: ../calendar/importers/icalendar-importer.c:384
+#: ../calendar/importers/icalendar-importer.c:851
+#: ../calendar/importers/icalendar-importer.c:881 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ååâ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1016
+#: ../addressbook/importers/evolution-csv-importer.c:1041
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1042
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV è Tab ååçå"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1025
+#: ../addressbook/importers/evolution-csv-importer.c:1050
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1051
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV è Tab ååçå"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1034
+#: ../addressbook/importers/evolution-csv-importer.c:1059
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1035
+#: ../addressbook/importers/evolution-csv-importer.c:1060
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV è Tab ååçå"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:753
+#: ../addressbook/importers/evolution-ldif-importer.c:779
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP èæäææå (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:780
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF èåå"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:639
+#: ../addressbook/importers/evolution-vcard-importer.c:648
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcfã.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:640
+#: ../addressbook/importers/evolution-vcard-importer.c:649
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard ååçå"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:741
+#: ../addressbook/printing/e-contact-print.c:714
 #, c-format
 msgid "Page %d"
 msgstr "ç %d é"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:645
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:680
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "çæéåææ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
-msgid "Couldn't get list of address books"
-msgstr "çæååéèéæå"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "çæååéèéæåï%s"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
-msgid "failed to open book"
-msgstr "çæéåéèé"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/event-page.c:2893
+#: ../calendar/gui/dialogs/memo-page.c:926
+#: ../calendar/gui/dialogs/task-page.c:1810 ../em-format/em-format.c:2314
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:657
+#: ../plugins/caldav/caldav-browse-server.c:209
+#: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:313
+msgid "Unknown error"
+msgstr "äæçéè"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "çæéååæçã%sãï%s"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "æåèåææèäæææèå"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "OUTPUTFILE"
 msgstr "èåææ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
 msgstr "ååæåéèéèæå"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
 msgstr "ååçéçæ vcard æ csv ææ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:70
+#: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
 msgstr "åéåææååå"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:73
-msgid "The number of cards in one output file in asynchronous mode, default size 100."
+#: ../addressbook/tools/evolution-addressbook-export.c:74
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
 msgstr "éåææåäïäåèåææäçåçæçïéèååæ 100ã"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:75
+#: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
 msgstr "æé"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:137
-msgid "Command line arguments error, please use --help option to see the usage."
+#: ../addressbook/tools/evolution-addressbook-export.c:138
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "æäååæéèïèäç --help ééäæççæã"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:151
+#: ../addressbook/tools/evolution-addressbook-export.c:152
 msgid "Only support csv or vcard format."
 msgstr "åææ csv æ vcard æåã"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:160
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "In async mode, output must be file."
 msgstr "åéåææåäïèååéæææã"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:168
+#: ../addressbook/tools/evolution-addressbook-export.c:169
 msgid "In normal mode, there is no need for the size option."
 msgstr "åäèæåäïäéèååééã"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:199
+#: ../addressbook/tools/evolution-addressbook-export.c:200
 msgid "Unhandled error"
 msgstr "æèççéè"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
-msgstr "ã{0}ãæäååèçèäæäääèèäæãèåèäææèçåéæäéæäåçèäæã"
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+"ã{0}ãæäååèçèäæäääèèäæãèåèäææèçåéæäéæäåçè"
+"äæã"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr "ã{0}ãæäååèçèäæäæãèéåäåèååçæçèäæã"
 
 #: ../calendar/calendar.error.xml.h:5
-msgid "Adding a meaningful summary to your appointment will give you an idea of what your appointment is about."
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr "æåææççæèåæççæåäèæçééåçæåäéäæéã"
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "Adding a meaningful summary to your task will give you an idea of what your task is about."
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr "æåææççæèåæçåäåäèæçééååäåäéäæéã"
 
 #: ../calendar/calendar.error.xml.h:7
@@ -1465,7 +1561,9 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "æåéæååéäçææèèèäçæååã"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on these appointments will be deleted and can not be restored."
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr "æåééäçæçææèèèäçæååã"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -1473,11 +1571,13 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "æåééäåäçææèèèäçæååã"
 
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr "æåéæçæçææèèèäçæååã"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr "æåéææèçææèèèäçæååã"
 
 #: ../calendar/calendar.error.xml.h:13
@@ -1587,11 +1687,14 @@ msgid "Editor could not be loaded."
 msgstr "çæèåçèåã"
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr "éåéäéèæåéçææåèèäèäåæåæåäã"
 
 #: ../calendar/calendar.error.xml.h:40
-msgid "Email invitations will be sent to all participants and allow them to reply."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr "éåéäéèåæåéçææåèèäèäååèã"
 
 #: ../calendar/calendar.error.xml.h:41
@@ -1613,31 +1716,45 @@ msgid "Error on {0}: {1}"
 msgstr "{0} ççéèï{1}"
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr "åæäåéåæéçïåäåèèåèäçéæèåçåæã"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
 msgstr "åææåéåæéçïåäåèèåèäçéèååéåçåéã"
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr "åææåéåæéçïåäåèèåèäçéåäåçåéã"
 
 #: ../calendar/calendar.error.xml.h:50
-msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
 msgstr "åéææçèèåèåäåèèäæææçèäæã"
 
 #: ../calendar/calendar.error.xml.h:51
-msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
 msgstr "åéææçèèèåäåèèäæææçåäæåã"
 
 #: ../calendar/calendar.error.xml.h:52
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr "éèæääéèäèçéäãååæçæåæååéäéäã"
 
 #: ../calendar/calendar.error.xml.h:53
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr "éèæääéèäèçéäãååæåäåæååéäéäã"
 
 #: ../calendar/calendar.error.xml.h:54
@@ -1725,8 +1842,13 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "èåéææçåäèèçåèèï"
 
 #: ../calendar/calendar.error.xml.h:75
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
-msgstr "ææéçåäææç GroupWise äæåèäåèéåäç Evolution çåéãæåçèææææåèäæååçèææççæã"
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"ææéçåäææç GroupWise äæåèäåèéåäç Evolution çåéãæåç"
+"èææææåèäæååçèææççæã"
 
 #: ../calendar/calendar.error.xml.h:76
 msgid "You have changed this appointment, but not yet saved it."
@@ -1761,8 +1883,7 @@ msgstr "éæåå Evolution äåïçæäçæçåäã"
 msgid "_Discard Changes"
 msgstr "ææèæ(_D)"
 
-#: ../calendar/calendar.error.xml.h:84
-#: ../composer/e-composer-actions.c:313
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "åå(_S)"
 
@@ -1771,8 +1892,7 @@ msgid "_Save Changes"
 msgstr "ååèæ(_S)"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34
-#: ../mail/mail.error.xml.h:158
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "åé(_S)"
@@ -1781,48 +1901,30 @@ msgstr "åé(_S)"
 msgid "_Send Notice"
 msgstr "åééç(_S)"
 
-#: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1776
-#: ../plugins/caldav/caldav-browse-server.c:921
-#: ../plugins/google-account-setup/google-source.c:439
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "èååç"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "åé"
-msgstr[1] "åé"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:114
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "åæ"
-msgstr[1] "åæ"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:126
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-#: ../e-util/e-plugin-util.c:425
-#: ../filter/filter.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+msgid "day"
 msgid_plural "days"
 msgstr[0] "å"
-msgstr[1] "å"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
 msgid "Start time"
 msgstr "éåæå"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "çæ"
 
@@ -1832,9 +1934,9 @@ msgstr "åéèé(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1632
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1642
-#: ../plugins/itip-formatter/itip-view.c:1044
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Location:"
 msgstr "äç:"
 
@@ -1842,8 +1944,7 @@ msgstr "äç:"
 msgid "Snooze _time:"
 msgstr "åçæé(_T):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
-#: ../e-util/e-alert.c:896
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:916
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "èé(_D)"
@@ -1852,12 +1953,21 @@ msgstr "èé(_D)"
 msgid "_Snooze"
 msgstr "åæ(_S)"
 
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../plugins/google-account-setup/google-contacts-source.c:379
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "å"
+
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26
-#: ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../plugins/google-account-setup/google-contacts-source.c:378
 msgid "hours"
 msgstr "åæ"
 
@@ -1868,41 +1978,38 @@ msgstr "çæçåé"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../e-util/e-plugin-util.c:423
-#: ../filter/filter.ui.h:17
-#: ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:377
 msgid "minutes"
 msgstr "åé"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1613
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
 msgid "No summary available."
 msgstr "ææåççæèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1495
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
 msgid "No description available."
 msgstr "ææääæèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1545
 msgid "No location information available."
 msgstr "ææåççåéèèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1549
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
 #, c-format
 msgid "You have %d alarm"
 msgid_plural "You have %d alarms"
 msgstr[0] "ææ %d åéé"
-msgstr[1] "ææ %d åéé"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1774
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1813
 msgid "Warning"
 msgstr "èå"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1745
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1784
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1914,10 +2021,11 @@ msgstr ""
 "éåéåéäã  Evolution æéç\n"
 "æéçæéåèçääæã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1819
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -1930,7 +2038,7 @@ msgstr ""
 "\n"
 "æçåèåèéåçåï"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1795
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1834
 msgid "Do not ask me about this program again."
 msgstr "äèåèåæéæéåçåã"
 
@@ -1939,67 +2047,54 @@ msgid "invalid time"
 msgstr "åææé"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69
-#: ../calendar/gui/e-alarm-list.c:393
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:396
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d æ"
-msgstr[1] "%d æ"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75
-#: ../calendar/gui/e-alarm-list.c:399
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:402
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d å"
-msgstr[1] "%d å"
 
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:408
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d ç"
-msgstr[1] "%d ç"
-
-#: ../calendar/gui/cal-editor-utils.c:105
-msgid "Invalid object"
-msgstr "çæççä"
 
-#: ../calendar/gui/calendar-view-factory.c:117
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "ææè"
 
-#: ../calendar/gui/calendar-view-factory.c:120
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Work Week View"
 msgstr "åäéæè"
 
-#: ../calendar/gui/calendar-view-factory.c:123
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Week View"
 msgstr "éæè"
 
-#: ../calendar/gui/calendar-view-factory.c:126
+#: ../calendar/gui/calendar-view-factory.c:125
 msgid "Month View"
 msgstr "ææè"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "ääæä"
 
-#: ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "éä"
 
@@ -2009,85 +2104,66 @@ msgstr "éä"
 msgid "Attendee"
 msgstr "åæè"
 
-#: ../calendar/gui/caltypes.xml.h:5
-#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "åé"
 
-#: ../calendar/gui/caltypes.xml.h:6
-#: ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "æé"
 
-#: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:772
-#: ../calendar/gui/e-task-table.c:494
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "æå"
 
-#: ../calendar/gui/caltypes.xml.h:8
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:522
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
+#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æè:"
 
-#: ../calendar/gui/caltypes.xml.h:9
-#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "æèåå"
 
-#: ../calendar/gui/caltypes.xml.h:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-#: ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "äåå"
 
-#: ../calendar/gui/caltypes.xml.h:11
-#: ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "åå"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Location"
 msgstr "äç"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "æèåéä"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:770
-#: ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
+#: ../calendar/gui/e-cal-model.c:767 ../calendar/gui/e-task-table.c:491
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "çä"
 
-#: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:761
-#: ../calendar/gui/e-cal-model.c:768
-#: ../calendar/gui/e-task-table.c:492
-#: ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
+#: ../calendar/gui/e-cal-model.c:758 ../calendar/gui/e-cal-model.c:765
+#: ../calendar/gui/e-task-table.c:490 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "åé"
 
@@ -2101,44 +2177,34 @@ msgstr "éææ"
 #: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Summary"
 msgstr "æè"
 
-#: ../calendar/gui/caltypes.xml.h:18
-#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "æèåå"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25
-#: ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "åå"
 
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26
-#: ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "äåå"
 
-#: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27
-#: ../mail/em-filter-i18n.h:31
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "æ"
 
-#: ../calendar/gui/caltypes.xml.h:22
-#: ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "äæ"
 
@@ -2147,22 +2213,22 @@ msgid "Edit Alarm"
 msgstr "çèéé"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:435
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Pop up an alert"
 msgstr "éçæç"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:431
+#: ../calendar/gui/e-alarm-list.c:434
 msgid "Play a sound"
 msgstr "ææéæ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:443
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Run a program"
 msgstr "åèåéçå"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:439
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Send an email"
 msgstr "åééåéä"
 
@@ -2187,8 +2253,7 @@ msgstr "èèééèé"
 msgid "Mes_sage:"
 msgstr "èæ(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "éé"
 
@@ -2253,7 +2318,7 @@ msgstr "åé"
 msgid "start of appointment"
 msgstr "çæéå"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "åä/èç"
 
@@ -2267,83 +2332,80 @@ msgstr "åå(_A)"
 msgid "Alarms"
 msgstr "éé"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
 msgstr "éå:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:509
+#: ../calendar/gui/dialogs/calendar-setup.c:180
+#: ../modules/addressbook/addressbook-config.c:516
 msgid "_Type:"
 msgstr "éå(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232
-#: ../mail/mail-config.ui.h:152
+#: ../calendar/gui/dialogs/calendar-setup.c:242 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:280
+#: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "åç(_N):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "èèèäæååèæåääéçäæ(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "èèåäæåååèæåääéçäæ(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:295
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "èèååéæåååèæåääéçäæ(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:352
+#: ../calendar/gui/dialogs/calendar-setup.c:372
 msgid "Colo_r:"
 msgstr "éè(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:200
-#: ../mail/mail-config.ui.h:51
-#: ../modules/addressbook/addressbook-config.c:1010
+#: ../calendar/gui/dialogs/calendar-setup.c:395
+#: ../calendar/gui/dialogs/calendar-setup.c:406
+#: ../calendar/gui/dialogs/calendar-setup.c:417
+#: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
+#: ../modules/addressbook/addressbook-config.c:1052
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../plugins/itip-formatter/itip-formatter.c:2960
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "äè"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../calendar/gui/dialogs/calendar-setup.c:407
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "åäæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:418
 msgid "Memo List"
 msgstr "ååéæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:503
 msgid "Calendar Properties"
 msgstr "iCalendar éè"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:503
 msgid "New Calendar"
 msgstr "æèäæ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:559
 msgid "Task List Properties"
 msgstr "åäæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:559
 msgid "New Task List"
 msgstr "æååäæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:615
 msgid "Memo List Properties"
 msgstr "ååéæååæ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:615
 msgid "New Memo List"
 msgstr "æåååéæå"
 
@@ -2391,271 +2453,263 @@ msgstr "%s  æåçåääèæãææéäèæääææéåç
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  æææåääèæïææéåçèåï"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:445
+#: ../calendar/gui/dialogs/comp-editor-page.c:458
 #, c-format
 msgid "Validation error: %s"
 msgstr "çèäçéèï %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:260
+#: ../calendar/gui/dialogs/comp-editor.c:267
 msgid "Could not save attachments"
 msgstr "çæååéä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:535
+#: ../calendar/gui/dialogs/comp-editor.c:589
 msgid "Could not update object"
 msgstr "çæææçä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:650
+#: ../calendar/gui/dialogs/comp-editor.c:715
 msgid "Edit Appointment"
 msgstr "çèçæ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:657
+#: ../calendar/gui/dialogs/comp-editor.c:722
 #, c-format
 msgid "Meeting - %s"
 msgstr "æè - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:724
 #, c-format
 msgid "Appointment - %s"
 msgstr "çæ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:730
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ææçåä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:667
+#: ../calendar/gui/dialogs/comp-editor.c:732
 #, c-format
 msgid "Task - %s"
 msgstr "åä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:672
+#: ../calendar/gui/dialogs/comp-editor.c:737
 #, c-format
 msgid "Memo - %s"
 msgstr "ååé - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:688
+#: ../calendar/gui/dialogs/comp-editor.c:753
 msgid "No Summary"
 msgstr "æææè"
 
-#: ../calendar/gui/dialogs/comp-editor.c:809
+#: ../calendar/gui/dialogs/comp-editor.c:874
 msgid "Keep original item?"
 msgstr "æåäæååéçï"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
-msgid "Click here to close the current window"
-msgstr "æéèäééçåèç"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1012
-#: ../mail/e-mail-browser.c:132
-#: ../shell/e-shell-window-actions.c:1433
-#: ../widgets/misc/e-focus-tracker.c:114
-#: ../widgets/misc/e-focus-tracker.c:552
-#: ../widgets/misc/e-web-view.c:414
-#: ../widgets/misc/e-web-view.c:1068
+#: ../calendar/gui/dialogs/comp-editor.c:1071
+msgid "Close the current window"
+msgstr "ééçåçèç"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1078 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1474
+#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:457 ../widgets/misc/e-web-view.c:1280
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1019
-#: ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1440
-#: ../widgets/misc/e-focus-tracker.c:107
-#: ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1062
+#: ../calendar/gui/dialogs/comp-editor.c:1085 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1481
+#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:1274
 msgid "Cut the selection"
 msgstr "åäéåçå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1026
-#: ../shell/e-shell-window-actions.c:1447
-#: ../widgets/misc/e-focus-tracker.c:128
-#: ../widgets/misc/e-focus-tracker.c:562
+#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../shell/e-shell-window-actions.c:1488
+#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "åééåçå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1033
-msgid "Click here to view help available"
-msgstr "æéèäæèåççèæ"
+#: ../calendar/gui/dialogs/comp-editor.c:1099
+msgid "View help"
+msgstr "æèæå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1040
-#: ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1482
-#: ../widgets/misc/e-focus-tracker.c:121
-#: ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1523
+#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-web-view.c:1286
 msgid "Paste the clipboard"
 msgstr "èäåèççåå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-msgid "Click here to save the current window"
-msgstr "æéèäååçåèç"
+#: ../calendar/gui/dialogs/comp-editor.c:1127
+msgid "Save current changes"
+msgstr "ååçåçèæ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068
-#: ../mail/e-mail-browser.c:153
-#: ../shell/e-shell-window-actions.c:1552
-#: ../widgets/misc/e-focus-tracker.c:135
-#: ../widgets/misc/e-focus-tracker.c:567
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1600
+#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "éåæææå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1075
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Classification"
 msgstr "æé(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
-#: ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:167
+#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1580
+#: ../shell/e-shell-window-actions.c:1628
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089
-#: ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1587
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1635
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "ææ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
-#: ../shell/e-shell-window-actions.c:1594
+#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Help"
 msgstr "æå(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_Insert"
 msgstr "æå(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1110
-#: ../composer/e-composer-actions.c:336
+#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "éé(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
-#: ../mail/e-mail-browser.c:174
-#: ../shell/e-shell-window-actions.c:1629
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1677 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../composer/e-composer-actions.c:285
+#: ../calendar/gui/dialogs/comp-editor.c:1193
+#: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "éä(_A)â"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-msgid "Click here to attach a file"
-msgstr "æéèäéä"
+#: ../calendar/gui/dialogs/comp-editor.c:1195
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "éåææ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1203
 msgid "_Categories"
 msgstr "åé(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1205
 msgid "Toggles whether to display categories"
 msgstr "åææåéçãåéã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1211
 msgid "Time _Zone"
 msgstr "æå(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Toggles whether the time zone is displayed"
 msgstr "åææåéçãæåã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1156
+#: ../calendar/gui/dialogs/comp-editor.c:1222
 msgid "Pu_blic"
 msgstr "åé(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1224
 msgid "Classify as public"
 msgstr "åéçåé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1229
 msgid "_Private"
 msgstr "çä(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165
+#: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "Classify as private"
 msgstr "æéççä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1236
 msgid "_Confidential"
 msgstr "æå(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172
+#: ../calendar/gui/dialogs/comp-editor.c:1238
 msgid "Classify as confidential"
 msgstr "æéçæå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180
+#: ../calendar/gui/dialogs/comp-editor.c:1246
 msgid "R_ole Field"
 msgstr "èèæä(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1248
 msgid "Toggles whether the Role field is displayed"
 msgstr "åææåéçãèèãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1256
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "åææåéçãRSVPãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1196
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "_Status Field"
 msgstr "çææä(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1264
 msgid "Toggles whether the Status field is displayed"
 msgstr "åææåéçãçæãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1270
 msgid "_Type Field"
 msgstr "éåæä(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1272
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "åææåéçãåæèéåãæä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
-#: ../composer/e-composer-private.c:73
+#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "æèäçæä(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1936
-#: ../composer/e-composer-actions.c:504
+#: ../calendar/gui/dialogs/comp-editor.c:2018
+#: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "éå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2269
-#: ../calendar/gui/dialogs/comp-editor.c:2432
-#: ../calendar/gui/dialogs/comp-editor.c:3407
+#: ../calendar/gui/dialogs/comp-editor.c:2354
+#: ../calendar/gui/dialogs/comp-editor.c:2517
+#: ../calendar/gui/dialogs/comp-editor.c:3495
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "åæææçææïåæææåæéçæåçèæ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3371
+#: ../calendar/gui/dialogs/comp-editor.c:3459
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "éä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3439
+#: ../calendar/gui/dialogs/comp-editor.c:3527
 msgid "Unable to use current version!"
 msgstr "çæäççåççæï"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:92
-msgid "Could not open source"
-msgstr "çæéåäæ"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:100
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Could not open destination"
 msgstr "çæéåççå"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:109
+#: ../calendar/gui/dialogs/copy-source-dialog.c:123
 msgid "Destination is read only"
 msgstr "ççåæåè"
 
+#: ../calendar/gui/dialogs/copy-source-dialog.c:157
+msgid "Cannot create object"
+msgstr "äèåççä"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:183
+msgid "Could not open source"
+msgstr "çæéåäæ"
+
 #: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "æååéåäæææäèäçäçéåéç(_D)ï"
@@ -2745,8 +2799,8 @@ msgid "_Alarms"
 msgstr "éé(_A)"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
-msgstr "æéèäèåæåæéåääçéé"
+msgid "Set or unset alarms for this event"
+msgstr "èåæåæéåääçéé"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2765,14 +2819,12 @@ msgid "Make this a recurring event"
 msgstr "åæéèçéææää"
 
 #: ../calendar/gui/dialogs/event-editor.c:240
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "åééé"
 
 #: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "æåééåééé"
 
@@ -2792,14 +2844,13 @@ msgstr "çé/åç(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "æèæåæèççé/åçèè"
 
-#: ../calendar/gui/dialogs/event-editor.c:314
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3185
 msgid "Appointment"
 msgstr "çæ"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
 #: ../calendar/gui/dialogs/event-page.ui.h:3
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "åæè"
 
@@ -2807,84 +2858,78 @@ msgstr "åæè"
 msgid "Print this event"
 msgstr "ååéåää"
 
-#: ../calendar/gui/dialogs/event-page.c:765
+#: ../calendar/gui/dialogs/event-page.c:556
 msgid "Event's start time is in the past"
 msgstr "ääçéåæååéå"
 
-#: ../calendar/gui/dialogs/event-page.c:806
+#: ../calendar/gui/dialogs/event-page.c:633
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "äèçèääïåçéåçèäææåèç"
 
-#: ../calendar/gui/dialogs/event-page.c:810
+#: ../calendar/gui/dialogs/event-page.c:637
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "äèåæççèääïåçæäæåéä"
 
-#: ../calendar/gui/dialogs/event-page.c:822
-#: ../calendar/gui/dialogs/event-page.c:2780
+#: ../calendar/gui/dialogs/event-page.c:649
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgid "This event has alarms"
 msgstr "éåääåæéé"
 
-#: ../calendar/gui/dialogs/event-page.c:889
+#: ../calendar/gui/dialogs/event-page.c:716
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æèåéä(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:936
-msgid "_Delegatees"
-msgstr "äçè(_D)"
-
-#: ../calendar/gui/dialogs/event-page.c:938
-msgid "Atte_ndees"
-msgstr "åæè(_N)"
-
-#: ../calendar/gui/dialogs/event-page.c:1155
+#: ../calendar/gui/dialogs/event-page.c:1254
 msgid "Event with no start date"
 msgstr "çéåææçää"
 
-#: ../calendar/gui/dialogs/event-page.c:1158
+#: ../calendar/gui/dialogs/event-page.c:1257
 msgid "Event with no end date"
 msgstr "ççæææçää"
 
-#: ../calendar/gui/dialogs/event-page.c:1329
-#: ../calendar/gui/dialogs/memo-page.c:671
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1430
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:843
 msgid "Start date is wrong"
 msgstr "éåææéè"
 
-#: ../calendar/gui/dialogs/event-page.c:1339
+#: ../calendar/gui/dialogs/event-page.c:1440
 msgid "End date is wrong"
 msgstr "çæææéè"
 
-#: ../calendar/gui/dialogs/event-page.c:1362
+#: ../calendar/gui/dialogs/event-page.c:1463
 msgid "Start time is wrong"
 msgstr "éåæééè"
 
-#: ../calendar/gui/dialogs/event-page.c:1369
+#: ../calendar/gui/dialogs/event-page.c:1470
 msgid "End time is wrong"
 msgstr "çææééè"
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/memo-page.c:712
-#: ../calendar/gui/dialogs/task-page.c:967
-msgid "The organizer selected no longer has an account."
-msgstr "éåçåéäåçææåèã"
-
-#: ../calendar/gui/dialogs/event-page.c:1539
-#: ../calendar/gui/dialogs/memo-page.c:718
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1635
+#: ../calendar/gui/dialogs/memo-page.c:736
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "An organizer is required."
 msgstr "éèäååéäã"
 
-#: ../calendar/gui/dialogs/event-page.c:1564
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1669
+#: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "æåéèäååæèã"
 
-#: ../calendar/gui/dialogs/event-page.c:2654
+#: ../calendar/gui/dialogs/event-page.c:1869
+msgid "_Delegatees"
+msgstr "äçè(_D)"
+
+#: ../calendar/gui/dialogs/event-page.c:1871
+msgid "Atte_ndees"
+msgstr "åæè(_N)"
+
+#: ../calendar/gui/dialogs/event-page.c:2891
 #, c-format
-msgid "Unable to open the calendar '%s'."
-msgstr "çæéåèäæ '%s'ã"
+msgid "Unable to open the calendar '%s': %s"
+msgstr "çæéåèäæã%sãï%s"
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -2892,40 +2937,37 @@ msgstr "çæéåèäæ '%s'ã"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2698
-#: ../calendar/gui/dialogs/memo-page.c:931
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/memo-page.c:967
+#: ../calendar/gui/dialogs/task-page.c:1855
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "æææä %s çäçä"
 
-#: ../calendar/gui/dialogs/event-page.c:3009
+#: ../calendar/gui/dialogs/event-page.c:3250
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "åæåçæå %d å"
-msgstr[1] "åæåçæå %d å"
 
-#: ../calendar/gui/dialogs/event-page.c:3015
+#: ../calendar/gui/dialogs/event-page.c:3256
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "çæå %d åæ"
-msgstr[1] "çæå %d åæ"
 
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3262
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "çæå %d åé"
-msgstr[1] "çæå %d åé"
 
-#: ../calendar/gui/dialogs/event-page.c:3040
+#: ../calendar/gui/dialogs/event-page.c:3281
 msgid "Customize"
 msgstr "èè"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3046
+#: ../calendar/gui/dialogs/event-page.c:3287
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "ææ"
@@ -2956,12 +2998,12 @@ msgstr "éé(_A)"
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:343
+#: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "æè(_D):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:362
+#: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "äç(_L):"
 
@@ -3003,40 +3045,92 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "çå"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105
-#: ../calendar/gui/print.c:3176
-msgid "Memo"
-msgstr "ååé"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "åæ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
-msgid "Print this memo"
-msgstr "ååéåååé"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "åæ"
 
-#: ../calendar/gui/dialogs/memo-page.c:337
-msgid "Memo's start date is in the past"
-msgstr "ååéçéåæååéå"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "åäæ"
 
-#: ../calendar/gui/dialogs/memo-page.c:375
-msgid "Memo cannot be edited, because the selected memo list is read only"
-msgstr "äèçèååéïåçéåçååéæåæåèç"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr "äæ"
 
-#: ../calendar/gui/dialogs/memo-page.c:379
-msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr "äèåæççèååéïåçæäæåéä"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr "äæ"
 
-#: ../calendar/gui/dialogs/memo-page.c:892
-#, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "çæåã%sãéåååéã"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "äæ"
 
-#: ../calendar/gui/dialogs/memo-page.c:1063
-#: ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1052
-#: ../mail/em-format-html.c:2396
-#: ../mail/em-format-html.c:2461
-#: ../mail/em-format-html.c:2485
-#: ../mail/message-list.etspec.h:20
-#: ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "åæ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "äæ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "äæ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "åäæ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "åæ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "éæææ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+msgid "Select _Today"
+msgstr "éæäå(_T)"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "äæ"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3189
+msgid "Memo"
+msgstr "ååé"
+
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "ååéåååé"
+
+#: ../calendar/gui/dialogs/memo-page.c:393
+msgid "Memo's start date is in the past"
+msgstr "ååéçéåæååéå"
+
+#: ../calendar/gui/dialogs/memo-page.c:430
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "äèçèååéïåçéåçååéæåæåèç"
+
+#: ../calendar/gui/dialogs/memo-page.c:434
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "äèåæççèååéïåçæäæåéä"
+
+#: ../calendar/gui/dialogs/memo-page.c:924
+#, c-format
+msgid "Unable to open memos in '%s': %s"
+msgstr "çæåã%sãéåååéï%s"
+
+#: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2563
+#: ../mail/em-format-html.c:2628 ../mail/em-format-html.c:2652
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "æäè"
 
@@ -3055,7 +3149,7 @@ msgid "T_o:"
 msgstr "æäè(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:422
+#: ../calendar/gui/dialogs/task-page.c:331
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "çç(_G):"
@@ -3100,17 +3194,17 @@ msgstr "ææäé"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution çæçèéåéææçæã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:895
+#: ../calendar/gui/dialogs/recurrence-page.c:894
 msgid "Recurrence date is invalid"
 msgstr "éææææçæ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:935
+#: ../calendar/gui/dialogs/recurrence-page.c:934
 msgid "End time of the recurrence was before event's start"
 msgstr "éææääççææåææéåæå"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:965
+#: ../calendar/gui/dialogs/recurrence-page.c:964
 msgid "on"
 msgstr "ç"
 
@@ -3118,7 +3212,7 @@ msgstr "ç"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1023
+#: ../calendar/gui/dialogs/recurrence-page.c:1022
 msgid "first"
 msgstr "ä"
 
@@ -3127,7 +3221,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1028
 msgid "second"
 msgstr "ä"
 
@@ -3135,7 +3229,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1033
 msgid "third"
 msgstr "ä"
 
@@ -3143,7 +3237,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "fourth"
 msgstr "å"
 
@@ -3151,7 +3245,7 @@ msgstr "å"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "fifth"
 msgstr "çä"
 
@@ -3159,13 +3253,13 @@ msgstr "çä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 msgid "last"
 msgstr "æå"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "åäææ"
 
@@ -3173,7 +3267,7 @@ msgstr "åäææ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1078
 msgid "1st to 10th"
 msgstr "1æè10æ"
 
@@ -3181,7 +3275,7 @@ msgstr "1æè10æ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 msgid "11th to 20th"
 msgstr "11æè20æ"
 
@@ -3189,48 +3283,41 @@ msgstr "11æè20æ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 msgid "21st to 31st"
 msgstr "21æè31æ"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/gui/dialogs/recurrence-page.c:1116
-msgid "day"
-msgstr "å"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Tuesday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Wednesday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Thursday"
 msgstr "ææå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "ææå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "æææ"
@@ -3238,31 +3325,31 @@ msgstr "æææ"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1245
+#: ../calendar/gui/dialogs/recurrence-page.c:1244
 msgid "on the"
 msgstr "åç"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1418
 msgid "occurrences"
 msgstr "æ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2123
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Add exception"
 msgstr "ååäå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2169
 msgid "Could not get a selection to modify."
 msgstr "çæååèçèçéååã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2170
+#: ../calendar/gui/dialogs/recurrence-page.c:2175
 msgid "Modify exception"
 msgstr "çèäå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2219
 msgid "Could not get a selection to delete."
 msgstr "çæååèåéçéååã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2348
+#: ../calendar/gui/dialogs/recurrence-page.c:2353
 msgid "Date/Time"
 msgstr "ææ/æé"
 
@@ -3274,8 +3361,7 @@ msgstr "æ"
 msgid "Exceptions"
 msgstr "äå"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3
-#: ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
 msgstr "éè"
 
@@ -3333,101 +3419,82 @@ msgstr "åæçééèéåäääèéå"
 msgid "Notify new attendees _only"
 msgstr "åéçæçåæè(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:374
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
 msgid "Completed date is wrong"
 msgstr "åæææéè "
 
-#: ../calendar/gui/dialogs/task-details-page.c:486
+#: ../calendar/gui/dialogs/task-details-page.c:488
 msgid "Web Page"
 msgstr "çé"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-component-preview.c:298
 #: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713
-#: ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225
-#: ../calendar/gui/e-task-table.c:596
-#: ../calendar/gui/print.c:3262
-#: ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180
-#: ../mail/em-sync-stream.c:202
+#: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:3275 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "ååæ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711
-#: ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:595
-#: ../calendar/gui/print.c:3259
-#: ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
+#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3272
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:374
 msgid "Completed"
 msgstr "ååæ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:313
-#: ../calendar/gui/e-task-table.c:516
-#: ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1228
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "é"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:435
 #: ../calendar/gui/e-cal-model-tasks.c:709
-#: ../calendar/gui/e-cal-model-tasks.c:786
-#: ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221
-#: ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3256
+#: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
+#: ../calendar/gui/print.c:3269
 msgid "In Progress"
 msgstr "éèä"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:518
-#: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1226
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1222 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "ä"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model.c:1521
-#: ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/message-list.c:1227
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-cal-model.c:1528 ../calendar/gui/e-task-table.c:515
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "äè"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-component-preview.c:302
 #: ../calendar/gui/e-cal-model-tasks.c:433
-#: ../calendar/gui/e-cal-model-tasks.c:707
-#: ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3253
-#: ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
+#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:591
+#: ../calendar/gui/print.c:3266 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æéå"
 
@@ -3444,18 +3511,16 @@ msgstr "çæ(_U):"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-calendar-view.c:1831
-#: ../calendar/gui/e-meeting-list-view.c:596
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/em-filter-i18n.h:72
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "çæ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:519
-#: ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "ææå"
@@ -3473,62 +3538,60 @@ msgstr "ååéå(_P):"
 msgid "_Web Page:"
 msgstr "çé(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "çæèçèæ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "æéèæè/æèèåäççæèçèæ"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../calendar/gui/dialogs/task-editor.c:126
 msgid "_Send Options"
 msgstr "åééé(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:328
-#: ../calendar/gui/print.c:3174
+#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3187
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "åä"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "Task Details"
 msgstr "åäèçèæ"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:364
 msgid "Print this task"
 msgstr "ååééåä"
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:249
 msgid "Task's start date is in the past"
 msgstr "åäçéåæååéå"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's due date is in the past"
 msgstr "åäççææååéå"
 
-#: ../calendar/gui/dialogs/task-page.c:375
+#: ../calendar/gui/dialogs/task-page.c:284
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "äèçèåäïåçéåçåäæåæåèç"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:288
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "äèåæççèåäïåçæäæåéä"
 
-#: ../calendar/gui/dialogs/task-page.c:430
+#: ../calendar/gui/dialogs/task-page.c:339
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "æèåéä(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:816
 msgid "Due date is wrong"
 msgstr "åææéè"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1808
 #, c-format
-msgid "Unable to open tasks in '%s'."
-msgstr "çæå '%s' éååäã"
+msgid "Unable to open tasks in '%s': %s"
+msgstr "çæåã%sãéååäï%s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -3543,126 +3606,122 @@ msgid "Time zone:"
 msgstr "æåï"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/gui/e-alarm-list.c:384
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d æ"
-msgstr[1] "%d æ"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:387
+#: ../calendar/gui/e-alarm-list.c:390
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d é"
-msgstr[1] "%d é"
 
-#: ../calendar/gui/e-alarm-list.c:449
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Unknown action to be performed"
 msgstr "èåèçæçåä"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:463
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "æçæéåå %2$s%1$s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:468
+#: ../calendar/gui/e-alarm-list.c:471
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "æçæéåå %2$s%1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s æçæéåæ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:489
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "æçæçæå %2$s%1$s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "æçæçæå %2$s%1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:501
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s æçæçææ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:522
+#: ../calendar/gui/e-alarm-list.c:525
 #, c-format
 msgid "%s at %s"
 msgstr "%s å %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:530
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s çæççèçéå"
 
-#: ../calendar/gui/e-cal-component-preview.c:188
-#: ../filter/e-filter-rule.c:667
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:669
 msgid "Untitled"
 msgstr "çæé"
 
-#: ../calendar/gui/e-cal-component-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:198
 msgid "Categories:"
 msgstr "åéï"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:237
 msgid "Summary:"
 msgstr "æèï"
 
-#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-component-preview.c:261
 msgid "Start Date:"
 msgstr "éåææï"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "ææææï"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:284
-#: ../plugins/itip-formatter/itip-view.c:1075
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../plugins/itip-formatter/itip-view.c:1076
 msgid "Status:"
 msgstr "çæï"
 
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Priority:"
 msgstr "ååççï"
 
-#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "æèï"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:371
 msgid "Web Page:"
 msgstr "çéï"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Created"
 msgstr "ååç"
 
@@ -3682,13 +3741,12 @@ msgid "Start Date"
 msgstr "éåææ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:570
+#: ../calendar/gui/e-task-table.c:568
 msgid "Free"
 msgstr "çé"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546
-#: ../calendar/gui/e-task-table.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "åç"
 
@@ -3708,46 +3766,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "ææ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061
-#: ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1027
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "æ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061
-#: ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "å"
 
-#: ../calendar/gui/e-cal-model.c:774
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233
-#: ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:1109
-#: ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2485
+#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
+#: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../plugins/itip-formatter/itip-formatter.c:462
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../calendar/gui/e-cal-model.c:1523
+#: ../calendar/gui/e-cal-model.c:1530
 msgid "Recurring"
 msgstr "éæææå"
 
-#: ../calendar/gui/e-cal-model.c:1525
+#: ../calendar/gui/e-cal-model.c:1532
 msgid "Assigned"
 msgstr "åæå"
 
-#: ../calendar/gui/e-cal-model.c:2643
+#: ../calendar/gui/e-cal-model.c:2714
 #, c-format
 msgid "Opening %s"
 msgstr "æåéå %s"
@@ -3775,7 +3826,7 @@ msgstr "åææ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Priority"
 msgstr "ååçç"
 
@@ -3784,70 +3835,64 @@ msgid "Start date"
 msgstr "éåææ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:559
+#: ../calendar/gui/e-meeting-list-view.c:573
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:580
+#: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "éå"
 
-#: ../calendar/gui/e-calendar-view.c:422
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Cut selected events to the clipboard"
 msgstr "åäéåçääèåèç"
 
-#: ../calendar/gui/e-calendar-view.c:428
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Copy selected events to the clipboard"
 msgstr "èèéåçääèåèç"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Paste events from the clipboard"
 msgstr "ååèçèäää"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Delete selected events"
 msgstr "åééåçää"
 
-#: ../calendar/gui/e-calendar-view.c:459
-#: ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:261
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:260
 msgid "Deleting selected objects"
 msgstr "åééåççä"
 
-#: ../calendar/gui/e-calendar-view.c:653
-#: ../calendar/gui/e-memo-table.c:855
-#: ../calendar/gui/e-task-table.c:1084
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-task-table.c:1082
 msgid "Updating objects"
 msgstr "ææçä"
 
 #: ../calendar/gui/e-calendar-view.c:1778
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220
-#: ../plugins/itip-formatter/itip-formatter.c:2473
+#: ../calendar/gui/e-meeting-list-view.c:213
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2605
 msgid "Accepted"
 msgstr "æå"
 
 #: ../calendar/gui/e-calendar-view.c:1779
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-store.c:222
-#: ../plugins/itip-formatter/itip-formatter.c:2479
+#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2611
 msgid "Declined"
 msgstr "åæ"
 
 #: ../calendar/gui/e-calendar-view.c:1780
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
 #: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Tentative"
 msgstr "æè"
 
 #: ../calendar/gui/e-calendar-view.c:1781
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:226
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2614
 msgid "Delegated"
 msgstr "ååæ"
 
@@ -3856,26 +3901,25 @@ msgid "Needs action"
 msgstr "éèåä"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1926
-#: ../calendar/gui/e-memo-table.c:538
-#: ../calendar/gui/e-task-table.c:759
+#. To Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:537
+#: ../calendar/gui/e-task-table.c:758
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "åéä: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1930
-#: ../calendar/gui/e-memo-table.c:543
+#. With SunOne accounts, there may be no ':' in
+#. * organizer.value.
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:542
 #: ../calendar/gui/e-task-table.c:762
 #, c-format
 msgid "Organizer: %s"
 msgstr "æèåéä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946
-#: ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3221
 #, c-format
 msgid "Location: %s"
 msgstr "äçï%s"
@@ -3909,27 +3953,27 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:745
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "éé %02i åé"
 
-#: ../calendar/gui/e-day-view-time-item.c:766
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 msgstr "éççäæå"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:783
+#: ../calendar/gui/e-day-view-time-item.c:844
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:175
-#: ../modules/calendar/e-calendar-preferences.c:224
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "ææ"
 
-#: ../calendar/gui/e-day-view-time-item.c:810
-#: ../calendar/gui/e-timezone-entry.c:316
-#: ../modules/calendar/e-calendar-preferences.c:251
+#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:255
 msgid "Select..."
 msgstr "éæâ"
 
@@ -3939,10 +3983,8 @@ msgstr "éæâ"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:841
-#: ../calendar/gui/e-day-view.c:1793
-#: ../calendar/gui/e-week-view-main-item.c:208
-#: ../calendar/gui/print.c:1866
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1875
 msgid "%A %d %B"
 msgstr "%mæ%dæ%A"
 
@@ -3952,11 +3994,10 @@ msgstr "%mæ%dæ%A"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:845
-#: ../calendar/gui/e-day-view.c:1810
-#: ../calendar/gui/e-week-view-main-item.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:1005
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-week-view-main-item.c:224
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1015
 msgid "%a %d %b"
 msgstr "%mæ%dæ (%a)"
 
@@ -3965,31 +4006,24 @@ msgstr "%mæ%dæ (%a)"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:849
-#: ../calendar/gui/e-day-view.c:1826
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1041
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-week-view-main-item.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../modules/calendar/e-cal-shell-view-private.c:1051
 msgid "%d %b"
 msgstr "%mæ%dæ"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002
-#: ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:920
-#: ../calendar/gui/print.c:939
-#: ../calendar/gui/print.c:2363
-#: ../calendar/gui/print.c:2383
+#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:756
+#: ../calendar/gui/print.c:926 ../calendar/gui/print.c:945
+#: ../calendar/gui/print.c:2372 ../calendar/gui/print.c:2392
 msgid "am"
 msgstr "äå"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005
-#: ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:925
-#: ../calendar/gui/print.c:941
-#: ../calendar/gui/print.c:2368
-#: ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:759
+#: ../calendar/gui/print.c:931 ../calendar/gui/print.c:947
+#: ../calendar/gui/print.c:2377 ../calendar/gui/print.c:2394
 msgid "pm"
 msgstr "äå"
 
@@ -4015,98 +4049,93 @@ msgstr "ååè"
 msgid "Resources"
 msgstr "èæ"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1021
-#: ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:1022 ../calendar/gui/print.c:1094
 msgid "Individual"
 msgstr "åå"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1089
-#: ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1095 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "çç"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1090
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1096
 msgid "Resource"
 msgstr "èæ"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1091
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1097
 msgid "Room"
 msgstr "æèå"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1105
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/print.c:1111
 msgid "Chair"
 msgstr "äå"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1024
-#: ../calendar/gui/print.c:1106
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:1025 ../calendar/gui/print.c:1112
 msgid "Required Participant"
 msgstr "ååè"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1107
+#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1113
 msgid "Optional Participant"
 msgstr "ååè"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1108
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1114
 msgid "Non-Participant"
 msgstr "çåè"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1034
+#: ../calendar/gui/e-meeting-list-view.c:212
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1035
 msgid "Needs Action"
 msgstr "éèåä"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:539
+#: ../calendar/gui/e-meeting-list-view.c:553
 msgid "Attendee                          "
 msgstr "åæè"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "éèä"
 
-#: ../calendar/gui/e-meeting-store.c:1763
+#: ../calendar/gui/e-meeting-store.c:1834
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "èåäçè %2$s åäæå %1$s äååçé/åçèèçåç "
 
-#: ../calendar/gui/e-meeting-store.c:1772
+#: ../calendar/gui/e-meeting-store.c:1844
 #, c-format
 msgid "Failure reason: %s"
 msgstr "åæååï%s"
 
+#: ../calendar/gui/e-meeting-store.c:1849
+#: ../plugins/caldav/caldav-browse-server.c:920
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:332
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "èååç"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:431
@@ -4213,50 +4242,47 @@ msgstr "èè"
 msgid "Member"
 msgstr "æå"
 
-#: ../calendar/gui/e-memo-table.c:419
-#: ../modules/calendar/e-cal-shell-content.c:469
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:438
+#: ../calendar/gui/e-memo-table.c:418
+#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-memo-shell-view-actions.c:222
+#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../modules/calendar/e-memo-shell-view.c:293
+#: ../plugins/caldav/caldav-browse-server.c:437
 msgid "Memos"
 msgstr "ååé"
 
-#: ../calendar/gui/e-memo-table.c:500
-#: ../calendar/gui/e-task-table.c:723
+#: ../calendar/gui/e-memo-table.c:499 ../calendar/gui/e-task-table.c:721
 msgid "* No Summary *"
 msgstr "* æææè *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:585
-#: ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:584 ../calendar/gui/e-task-table.c:803
 msgid "Start: "
 msgstr "éå:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:604
-#: ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:821
 msgid "Due: "
 msgstr "åæ:"
 
-#: ../calendar/gui/e-memo-table.c:720
+#: ../calendar/gui/e-memo-table.c:717
 msgid "Cut selected memos to the clipboard"
 msgstr "åäéåçååéèåèç"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:723
 msgid "Copy selected memos to the clipboard"
 msgstr "èèéåçååéèåèç"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:729
 msgid "Paste memos from the clipboard"
 msgstr "ååèçèäååé"
 
-#: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../calendar/gui/e-memo-table.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Delete selected memos"
 msgstr "åééåçååé"
 
-#: ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-memo-table.c:741
 msgid "Select all visible memos"
 msgstr "éæåéåèçååé"
 
@@ -4268,132 +4294,124 @@ msgstr "èæéèååæçååé"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:545
+#: ../calendar/gui/e-task-table.c:543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:642
-#: ../calendar/gui/print.c:2159
-#: ../calendar/importers/icalendar-importer.c:81
-#: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:430
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:444
-#: ../plugins/caldav/caldav-browse-server.c:436
-#: ../plugins/groupwise-features/camel-gw-listener.c:428
-#: ../plugins/groupwise-features/camel-gw-listener.c:569
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+#: ../calendar/gui/e-task-table.c:640 ../calendar/gui/print.c:2168
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:975
+#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-task-shell-view-actions.c:245
+#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Tasks"
 msgstr "åä"
 
-#: ../calendar/gui/e-task-table.c:949
+#: ../calendar/gui/e-task-table.c:947
 msgid "Cut selected tasks to the clipboard"
 msgstr "åäéåçåäèåèç"
 
-#: ../calendar/gui/e-task-table.c:955
+#: ../calendar/gui/e-task-table.c:953
 msgid "Copy selected tasks to the clipboard"
 msgstr "èèéåçåäèåèç"
 
-#: ../calendar/gui/e-task-table.c:961
+#: ../calendar/gui/e-task-table.c:959
 msgid "Paste tasks from the clipboard"
 msgstr "ååèçèäåä"
 
-#: ../calendar/gui/e-task-table.c:967
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../calendar/gui/e-task-table.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Delete selected tasks"
 msgstr "åééåçåä"
 
-#: ../calendar/gui/e-task-table.c:973
+#: ../calendar/gui/e-task-table.c:971
 msgid "Select all visible tasks"
 msgstr "éæåéåèçåä"
 
-#: ../calendar/gui/e-timezone-entry.c:327
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "éæäåæå"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:225
-#: ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1856
 msgid "%d %B"
 msgstr "%mæ%dæ"
 
-#: ../calendar/gui/ea-cal-view-event.c:286
+#: ../calendar/gui/ea-cal-view-event.c:290
 msgid "It has alarms."
 msgstr "ååæééã"
 
-#: ../calendar/gui/ea-cal-view-event.c:289
+#: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
 msgstr "åæéææçæã"
 
-#: ../calendar/gui/ea-cal-view-event.c:292
+#: ../calendar/gui/ea-cal-view-event.c:296
 msgid "It is a meeting."
 msgstr "éæäéæèã"
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:303
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "èäæääïæèç %sã"
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:306
 msgid "Calendar Event: It has no summary."
 msgstr "èäæääïæææèã"
 
-#: ../calendar/gui/ea-cal-view-event.c:322
+#: ../calendar/gui/ea-cal-view-event.c:328
 msgid "calendar view event"
 msgstr "èäææèää"
 
-#: ../calendar/gui/ea-cal-view-event.c:551
+#: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
 msgstr "ååçé"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:303
 msgid "New Appointment"
 msgstr "æåçæ"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New All Day Event"
 msgstr "æåååää"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Meeting"
 msgstr "æåæè"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "Go to Today"
 msgstr "çèäæ"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Date"
 msgstr "çèææ"
 
-#: ../calendar/gui/ea-day-view-main-item.c:308
-#: ../calendar/gui/ea-week-view-main-item.c:340
+#: ../calendar/gui/ea-day-view-main-item.c:312
+#: ../calendar/gui/ea-week-view-main-item.c:344
 msgid "a table to view and select the current time range"
 msgstr "çäæèèéææåçåçèæ"
 
-#: ../calendar/gui/ea-day-view.c:148
-#: ../calendar/gui/ea-week-view.c:147
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "åæ %d åääã"
-msgstr[1] "åæ %d åääã"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153
-#: ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
 msgid "It has no events."
 msgstr "åææääã"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "åäéæèï%sã%s"
@@ -4401,168 +4419,106 @@ msgstr "åäéæèï%sã%s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ææèï%sã%s"
 
-#: ../calendar/gui/ea-day-view.c:200
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "åäéçèäææè"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "çæäæåæçèäææè"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:860
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1007
 msgid "Gnome Calendar"
 msgstr "Gnome èäæ"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:1001
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1011
 msgid "%A %d %b %Y"
 msgstr "%Yå%mæ%dæ (%A)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:1008
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1018
+#: ../modules/calendar/e-cal-shell-view-private.c:1024
+#: ../modules/calendar/e-cal-shell-view-private.c:1027
 msgid "%a %d %b %Y"
 msgstr "%Yå%mæ%dæ (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1034
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../modules/calendar/e-cal-shell-view-private.c:1044
 #: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../modules/calendar/e-cal-shell-view-private.c:1062
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
 msgid "%d %b %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../calendar/gui/ea-jump-button.c:147
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "èèæé"
 
-#: ../calendar/gui/ea-jump-button.c:156
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "æéèïæåäæåæåääã"
 
-#: ../calendar/gui/ea-week-view.c:155
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "ææèï%sã%s"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "éæèï%sã%s"
 
-#: ../calendar/gui/ea-week-view.c:193
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for a month"
 msgstr "çææçèäææè"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:199
 msgid "calendar view for one or more weeks"
 msgstr "çæäæåéçèäææè"
 
-#: ../calendar/gui/gnome-cal.c:2198
+#: ../calendar/gui/gnome-cal.c:2209
 msgid "Purging"
 msgstr "æé"
 
-#: ../calendar/gui/goto-dialog.ui.h:1
-msgid "April"
-msgstr "åæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:2
-msgid "August"
-msgstr "åæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:3
-msgid "December"
-msgstr "åäæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:4
-msgid "February"
-msgstr "äæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:5
-msgid "January"
-msgstr "äæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:6
-msgid "July"
-msgstr "äæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:7
-msgid "June"
-msgstr "åæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:8
-msgid "March"
-msgstr "äæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:9
-msgid "May"
-msgstr "äæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:10
-msgid "November"
-msgstr "åäæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:11
-msgid "October"
-msgstr "åæ"
-
-#: ../calendar/gui/goto-dialog.ui.h:12
-msgid "Select Date"
-msgstr "éæææ"
-
-#: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
-msgid "Select _Today"
-msgstr "éæäå(_T)"
-
-#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "September"
-msgstr "äæ"
-
-#: ../calendar/gui/itip-utils.c:422
-#: ../calendar/gui/itip-utils.c:477
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:503 ../calendar/gui/itip-utils.c:558
+#: ../calendar/gui/itip-utils.c:661
 msgid "An organizer must be set."
 msgstr "åéæåäååéäã"
 
-#: ../calendar/gui/itip-utils.c:469
+#: ../calendar/gui/itip-utils.c:550
 msgid "At least one attendee is necessary"
 msgstr "èåéèäååæè"
 
-#: ../calendar/gui/itip-utils.c:657
-#: ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:747 ../calendar/gui/itip-utils.c:908
 msgid "Event information"
 msgstr "ääèè"
 
-#: ../calendar/gui/itip-utils.c:660
-#: ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:750 ../calendar/gui/itip-utils.c:911
 msgid "Task information"
 msgstr "åäèè"
 
-#: ../calendar/gui/itip-utils.c:663
-#: ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:753 ../calendar/gui/itip-utils.c:914
 msgid "Memo information"
 msgstr "ååéèè"
 
-#: ../calendar/gui/itip-utils.c:666
-#: ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:756 ../calendar/gui/itip-utils.c:932
 msgid "Free/Busy information"
 msgstr "çé/åçèè"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:759
 msgid "Calendar information"
 msgstr "èäæèè"
 
@@ -4570,7 +4526,7 @@ msgstr "èäæèè"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:796
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "åæå"
@@ -4579,7 +4535,7 @@ msgstr "åæå"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:803
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æææå"
@@ -4591,8 +4547,7 @@ msgstr "æææå"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
-#: ../calendar/gui/itip-utils.c:768
+#: ../calendar/gui/itip-utils.c:810 ../calendar/gui/itip-utils.c:858
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "åæç"
@@ -4601,7 +4556,7 @@ msgstr "åæç"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:817
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ååæ"
@@ -4609,7 +4564,7 @@ msgstr "ååæ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:830
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "åææ"
@@ -4617,7 +4572,7 @@ msgstr "åææ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "åæ"
@@ -4625,7 +4580,7 @@ msgstr "åæ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "éææç"
@@ -4633,239 +4588,252 @@ msgstr "éææç"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æçèå"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:929
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "çé/åçèè (%s å %s)"
 
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:937
 msgid "iCalendar information"
 msgstr "iCalendar èè"
 
-#: ../calendar/gui/itip-utils.c:865
+#: ../calendar/gui/itip-utils.c:962
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "çæååèæïæçääèåäääææéçã"
 
-#: ../calendar/gui/itip-utils.c:869
+#: ../calendar/gui/itip-utils.c:966
 msgid "Unable to book a resource, error: "
 msgstr "çæååèæïéèçï"
 
-#: ../calendar/gui/itip-utils.c:1032
+#: ../calendar/gui/itip-utils.c:1127
 msgid "You must be an attendee of the event."
 msgstr "æåéææääçåæèã"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "1st"
 msgstr "1æ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "2nd"
 msgstr "2æ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "3rd"
 msgstr "3æ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "4th"
 msgstr "4æ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "5th"
 msgstr "5æ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "6th"
 msgstr "6æ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "7th"
 msgstr "7æ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "8th"
 msgstr "8æ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "9th"
 msgstr "9æ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "10th"
 msgstr "10æ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "11th"
 msgstr "11æ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "12th"
 msgstr "12æ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "13th"
 msgstr "13æ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "14th"
 msgstr "14æ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "15th"
 msgstr "15æ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "16th"
 msgstr "16æ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "17th"
 msgstr "17æ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "18th"
 msgstr "18æ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "19th"
 msgstr "19æ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "20th"
 msgstr "20æ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "21st"
 msgstr "21æ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "22nd"
 msgstr "22æ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "23rd"
 msgstr "23æ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "24th"
 msgstr "24æ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "25th"
 msgstr "25æ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "26th"
 msgstr "26æ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "27th"
 msgstr "27æ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "28th"
 msgstr "28æ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "29th"
 msgstr "29æ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "30th"
 msgstr "30æ"
 
-#: ../calendar/gui/print.c:555
+#: ../calendar/gui/print.c:554
 msgid "31st"
 msgstr "31æ"
 
-#: ../calendar/gui/print.c:612
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:611
 msgid "Su"
 msgstr "æ"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "Mo"
 msgstr "ä"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "Tu"
 msgstr "ä"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "We"
 msgstr "ä"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Th"
 msgstr "å"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Fr"
 msgstr "ä"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Sa"
 msgstr "å"
 
-#: ../calendar/gui/print.c:3001
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:3014
 msgid " to "
 msgstr " å "
 
-#: ../calendar/gui/print.c:3011
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:3024
 msgid " (Completed "
 msgstr " (ååæ) "
 
-#: ../calendar/gui/print.c:3017
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3030
 msgid "Completed "
 msgstr "ååæ "
 
-#: ../calendar/gui/print.c:3027
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3040
 msgid " (Due "
 msgstr "(æé)"
 
-#: ../calendar/gui/print.c:3034
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:3047
 msgid "Due "
 msgstr "æé "
 
-#: ../calendar/gui/print.c:3199
+#: ../calendar/gui/print.c:3212
 #, c-format
 msgid "Summary: %s"
 msgstr "æèï%s"
 
-#: ../calendar/gui/print.c:3226
+#: ../calendar/gui/print.c:3239
 msgid "Attendees: "
 msgstr "åæè:"
 
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/print.c:3282
 #, c-format
 msgid "Status: %s"
 msgstr "çæ(_S): %s"
 
-#: ../calendar/gui/print.c:3284
+#: ../calendar/gui/print.c:3297
 #, c-format
 msgid "Priority: %s"
 msgstr "ååéå(_P): %s"
 
-#: ../calendar/gui/print.c:3302
+#: ../calendar/gui/print.c:3315
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "åæçåæ: %i"
 
-#: ../calendar/gui/print.c:3313
+#: ../calendar/gui/print.c:3326
 #, c-format
 msgid "URL: %s"
 msgstr "çå: %s"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3339
 #, c-format
 msgid "Categories: %s"
 msgstr "åé: %s"
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3350
 msgid "Contacts: "
 msgstr "éçä: "
 
@@ -4874,199 +4842,201 @@ msgstr "éçä: "
 msgid "% Completed"
 msgstr "% ååæ"
 
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "ååæ"
+
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "æåéè"
 
-#: ../calendar/gui/tasktypes.xml.h:28
-#: ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "åæ"
 
-#: ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "åæ"
 
-#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "çæåæè"
 
-#: ../calendar/importers/icalendar-importer.c:350
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1958
+#: ../calendar/importers/icalendar-importer.c:411
+#: ../calendar/importers/icalendar-importer.c:821
+#: ../plugins/itip-formatter/itip-formatter.c:2094
 msgid "Opening calendar"
 msgstr "éåèäæ"
 
-#: ../calendar/importers/icalendar-importer.c:493
+#: ../calendar/importers/icalendar-importer.c:551
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ææ (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:552
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar èåå"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:640
 msgid "Reminder!"
 msgstr "æéï"
 
-#: ../calendar/importers/icalendar-importer.c:662
+#: ../calendar/importers/icalendar-importer.c:720
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar ææ (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:663
+#: ../calendar/importers/icalendar-importer.c:721
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar èåå"
 
-#: ../calendar/importers/icalendar-importer.c:823
+#: ../calendar/importers/icalendar-importer.c:970
 msgid "Calendar Events"
 msgstr "èäæää"
 
-#: ../calendar/importers/icalendar-importer.c:861
+#: ../calendar/importers/icalendar-importer.c:1008
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution èäæææèåå"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1073
+#: ../calendar/importers/icalendar-importer.c:1390
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "æè"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1073
+#: ../calendar/importers/icalendar-importer.c:1390
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "ää"
 
-#: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1076
+#: ../calendar/importers/icalendar-importer.c:1391
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "åä"
 
-#: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1079
+#: ../calendar/importers/icalendar-importer.c:1392
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "ååé"
 
-#: ../calendar/importers/icalendar-importer.c:941
+#: ../calendar/importers/icalendar-importer.c:1088
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "åæéææ"
 
-#: ../calendar/importers/icalendar-importer.c:946
+#: ../calendar/importers/icalendar-importer.c:1093
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "æäååé"
 
-#: ../calendar/importers/icalendar-importer.c:951
+#: ../calendar/importers/icalendar-importer.c:1098
 msgctxt "iCalImp"
 msgid "has alarms"
 msgstr "åæéé"
 
-#: ../calendar/importers/icalendar-importer.c:956
+#: ../calendar/importers/icalendar-importer.c:1103
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "åæéä"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:969
+#: ../calendar/importers/icalendar-importer.c:1116
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "åé"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:972
+#: ../calendar/importers/icalendar-importer.c:1119
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "çä"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:975
+#: ../calendar/importers/icalendar-importer.c:1122
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "æå"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:979
+#: ../calendar/importers/icalendar-importer.c:1126
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "æé"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:984
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1131
+#: ../calendar/importers/icalendar-importer.c:1431
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "æè"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:990
+#: ../calendar/importers/icalendar-importer.c:1137
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "äç"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:998
-#: ../calendar/importers/icalendar-importer.c:1280
+#: ../calendar/importers/icalendar-importer.c:1145
+#: ../calendar/importers/icalendar-importer.c:1427
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "éå"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1009
+#: ../calendar/importers/icalendar-importer.c:1156
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "åæ"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1021
+#: ../calendar/importers/icalendar-importer.c:1168
 msgctxt "iCalImp"
 msgid "End"
 msgstr "çæ"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1031
+#: ../calendar/importers/icalendar-importer.c:1178
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "åé"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../calendar/importers/icalendar-importer.c:1202
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ååæ"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1063
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1074
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1221
+#: ../calendar/importers/icalendar-importer.c:1224
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "æèåéä"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1097
-#: ../calendar/importers/icalendar-importer.c:1100
+#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1247
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "åæè"
 
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/importers/icalendar-importer.c:1261
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "æè"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1276
+#: ../calendar/importers/icalendar-importer.c:1423
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "éå"
@@ -6620,259 +6590,259 @@ msgstr "ååæ/çåæ"
 msgid "Pacific/Yap"
 msgstr "ååæ/éæå"
 
-#: ../composer/e-composer-actions.c:204
+#: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "ååææâ"
 
-#: ../composer/e-composer-actions.c:287
-#: ../widgets/misc/e-attachment-view.c:377
-msgid "Attach a file"
-msgstr "éåææ"
-
-#: ../composer/e-composer-actions.c:292
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "éé(_C)"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
 msgstr "ééçåçææ"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:303
 msgid "New _Message"
 msgstr "æåæéä(_M)"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:305
 msgid "Open New Message window"
 msgstr "éåæçéäèç"
 
-#: ../composer/e-composer-actions.c:308
-#: ../shell/e-shell-window-actions.c:1489
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1537
 msgid "Configure Evolution"
 msgstr "èå Evolution"
 
-#: ../composer/e-composer-actions.c:315
+#: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
 msgstr "ååçåçææ"
 
-#: ../composer/e-composer-actions.c:320
+#: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
 msgstr "ååææ(_A)â"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:326
 msgid "Save the current file with a different name"
 msgstr "äåäååçååçåçææ"
 
-#: ../composer/e-composer-actions.c:329
+#: ../composer/e-composer-actions.c:333
 msgid "Character _Encoding"
 msgstr "ååçç(_E)"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:350
 msgid "_Print..."
 msgstr "åå(_P)â"
 
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:357
 msgid "Print Pre_view"
 msgstr "éèåå(_V)"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:364
 msgid "Save as _Draft"
 msgstr "ååçèç(_D)"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
 msgstr "ååçèç"
 
-#: ../composer/e-composer-actions.c:367
-#: ../composer/e-composer-private.c:347
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
 msgstr "åé(_E)"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:373
 msgid "Send this message"
 msgstr "åééåéä"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
 msgstr "PG_P åå"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
 msgstr "äç PGP åéåéäåå"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
 msgstr "P_GP åç"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
 msgstr "çæç PGP ééçéäåäæäçç"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:397
 msgid "_Picture Gallery"
 msgstr "åçé(_P)"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:399
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "çæåäææåéääçåçé"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
 msgstr "éäååæ(_P)"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:407
 msgid "Set the message priority to high"
 msgstr "åéäååæèçãéã"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:413
 msgid "Re_quest Read Receipt"
 msgstr "èæèäåæ(_Q)"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:415
 msgid "Get delivery notification when your message is read"
 msgstr "åæçéäèéèæååéäéç"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:421
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME åå"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:423
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "äçæç S/MIME ååæèåéåéäåå"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME åç"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "çæç S/MIME çåæèçéäåäæäçç"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
 msgstr "åäåææä(_B)"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
 msgstr "åæåäåææäçéççæ"
 
-#: ../composer/e-composer-actions.c:441
+#: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
 msgstr "åææä(_C)"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:447
 msgid "Toggles whether the CC field is displayed"
 msgstr "åæåææäçéççæ"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
 msgstr "åèæä(_R)"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "åæåèæäçéççæ"
 
-#: ../composer/e-composer-actions.c:510
+#: ../composer/e-composer-actions.c:514
 msgid "Save Draft"
 msgstr "ååèç"
 
-#: ../composer/e-composer-header-table.c:36
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "èåéäçæäè"
 
-#: ../composer/e-composer-header-table.c:38
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "èåéäåæçæäè"
 
-#: ../composer/e-composer-header-table.c:41
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
-msgstr "èåéäåäåæçæäèïäåææåéåéäääæåçåéäçæäèæå"
+#: ../composer/e-composer-header-table.c:45
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+"èåéäåäåæçæäèïäåææåéåéäääæåçåéäçæäèæå"
 
-#: ../composer/e-composer-header-table.c:1004
+#: ../composer/e-composer-header-table.c:1020
 msgid "Fr_om:"
 msgstr "åäè(_O):"
 
-#: ../composer/e-composer-header-table.c:1013
+#: ../composer/e-composer-header-table.c:1029
 msgid "_Reply-To:"
 msgstr "åè(_R):"
 
-#: ../composer/e-composer-header-table.c:1017
+#: ../composer/e-composer-header-table.c:1033
 msgid "_To:"
 msgstr "æäè(_T):"
 
-#: ../composer/e-composer-header-table.c:1022
+#: ../composer/e-composer-header-table.c:1038
 msgid "_Cc:"
 msgstr "åæ(_C):"
 
-#: ../composer/e-composer-header-table.c:1027
+#: ../composer/e-composer-header-table.c:1043
 msgid "_Bcc:"
 msgstr "åäåæ(_B):"
 
-#: ../composer/e-composer-header-table.c:1032
+#: ../composer/e-composer-header-table.c:1048
 msgid "_Post To:"
 msgstr "åèå(_P):"
 
-#: ../composer/e-composer-header-table.c:1036
+#: ../composer/e-composer-header-table.c:1052
 msgid "S_ubject:"
 msgstr "äæ(_U):"
 
-#: ../composer/e-composer-header-table.c:1045
+#: ../composer/e-composer-header-table.c:1061
 msgid "Si_gnature:"
 msgstr "çåæ(_G):"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "æéèæåçéæå"
 
-#: ../composer/e-composer-post-header.c:127
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "æääéèïéåèåèçèæå"
 
-#: ../composer/e-composer-private.c:245
+#: ../composer/e-composer-private.c:249
 msgid "Undo the last action"
 msgstr "ååääæçåä"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:253
 msgid "Redo the last undone action"
 msgstr "åæääæååçåä"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:257
 msgid "Search for text"
 msgstr "æåæå"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:261
 msgid "Search for and replace text"
 msgstr "æåååäæå"
 
-#: ../composer/e-composer-private.c:367
+#: ../composer/e-composer-private.c:372
 msgid "Save draft"
 msgstr "ååèç"
 
-#: ../composer/e-msg-composer.c:784
+#: ../composer/e-msg-composer.c:808
 #, c-format
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "çæççéåçéäïæåèææèåççæè"
 
-#: ../composer/e-msg-composer.c:793
+#: ../composer/e-msg-composer.c:817
 #, c-format
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
 msgstr "çæååéåçéäïææèåååæè(æåè)"
 
-#: ../composer/e-msg-composer.c:1675
-#: ../composer/e-msg-composer.c:2058
+#: ../composer/e-msg-composer.c:1691 ../composer/e-msg-composer.c:2075
 msgid "Compose Message"
 msgstr "çèéä"
 
-#: ../composer/e-msg-composer.c:4116
+#: ../composer/e-msg-composer.c:4155
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "éäçèåååäèçèçéæåçéäåæã"
 
-#: ../composer/e-msg-composer.c:4821
+#: ../composer/e-msg-composer.c:4860
 msgid "Untitled Message"
 msgstr "æååçéä"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 msgstr "éèæääéäèäèãåéæéäåçæääååæääçéä"
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -6892,7 +6862,9 @@ msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "ååäæççéèãæèåäççï"
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr "çåèæææåæåïæéç â{0}â çéäï"
 
 #: ../composer/mail-composer.error.xml.h:7
@@ -6904,12 +6876,22 @@ msgid "Because &quot;{1}&quot;."
 msgstr "åçã{1}ãã"
 
 #: ../composer/mail-composer.error.xml.h:9
-msgid "Because you are working offline, the message will be saved to your local Outbox folder. When you are back online you can send the message by clicking the Send/Receive button in Evolution's toolbar."
-msgstr "åçæåéçåäïéåéäæåååææåççåäèæåèãçæååçäåäïæåäéé Evolution åååçåé/æææéäååéäã"
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+"åçæåéçåäïéåéäæåååææåççåäèæåèãçæååçäåäï"
+"æåäéé Evolution åååçåé/æææéäååéäã"
 
 #: ../composer/mail-composer.error.xml.h:10
-msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
-msgstr "ééæéæååéäèãèçãèæåïååééææåèçææäææéäãååèçåäèæäååççæåéäã"
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+"ééæéæååéäèãèçãèæåïååééææåèçææäææéäãååè"
+"çåäèæäååççæåéäã"
 
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not create message."
@@ -6940,8 +6922,11 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "ååèèåååæççéèïåçã{1}ãã"
 
 #: ../composer/mail-composer.error.xml.h:18
-msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
-msgstr "çææåæéäæïEvolution æåçæãååéäåäèæååääæçåæççã"
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"çææåæéäæïEvolution æåçæãååéäåäèæååääæçåæççã"
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "Saving message to Outbox."
@@ -6951,13 +6936,14 @@ msgstr "ååéäååäåã"
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "ææã{0}ãäæäèææèäçæåéääåéã"
 
-#: ../composer/mail-composer.error.xml.h:21
-#: ../mail/mail.error.xml.h:117
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "ååçéèç &quot;{0}&quot;ã"
 
 #: ../composer/mail-composer.error.xml.h:22
-msgid "The reported error was &quot;{0}&quot;. The message has most likely not been saved."
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
 msgstr "ååçéèç &quot;{0}&quot;ãéäååèææååã"
 
 #: ../composer/mail-composer.error.xml.h:23
@@ -7001,27 +6987,15 @@ msgstr "ååååäå(_S)"
 msgid "_Try Again"
 msgstr "åèäæ(_T)"
 
-#: ../capplet/anjal-settings-main.c:216
-msgid "Run Anjal in a window"
-msgstr "äååèçåè Anjal"
-
-#: ../capplet/anjal-settings-main.c:217
-msgid "Make Anjal the default email client"
-msgstr "ä Anjal åçéèéäåæç"
-
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:153
 msgid "ID of the socket to embed in"
 msgstr "socket ç IDïååæ"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:154
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:238
-msgid "Anjal email client"
-msgstr "Anjal éåéäåæç"
-
 #: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "èèåæçååã"
@@ -7039,229 +7013,247 @@ msgid "Please enter your password."
 msgstr "èèåæçåçã"
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../modules/online-accounts/e-online-accounts-google.c:285
+#: ../modules/online-accounts/e-online-accounts-google.c:357
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:83
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:463
+#: ../capplet/settings/mail-account-view.c:483
 msgid "Personal details:"
 msgstr "åäèçèæï"
 
-#: ../capplet/settings/mail-account-view.c:470
+#: ../capplet/settings/mail-account-view.c:490
 msgid "Name:"
 msgstr "ååçï"
 
-#: ../capplet/settings/mail-account-view.c:479
+#: ../capplet/settings/mail-account-view.c:499
 msgid "Email address:"
 msgstr "Email äåï"
 
-#: ../capplet/settings/mail-account-view.c:489
+#: ../capplet/settings/mail-account-view.c:509
 msgid "Details:"
 msgstr "èçèæï"
 
-#: ../capplet/settings/mail-account-view.c:497
+#: ../capplet/settings/mail-account-view.c:517
 msgid "Receiving"
 msgstr "ææä"
 
-#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:524
 msgid "Server type:"
 msgstr "äæåéåï"
 
-#: ../capplet/settings/mail-account-view.c:513
+#: ../capplet/settings/mail-account-view.c:533
 msgid "Server address:"
 msgstr "äæåäåï"
 
-#: ../capplet/settings/mail-account-view.c:522
+#: ../capplet/settings/mail-account-view.c:542
 msgid "Username:"
 msgstr "äçèåçï"
 
-#: ../capplet/settings/mail-account-view.c:531
+#: ../capplet/settings/mail-account-view.c:551
 msgid "Use encryption:"
 msgstr "äçååï"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
+#: ../capplet/settings/mail-account-view.c:556
+#: ../capplet/settings/mail-account-view.c:591
 msgid "never"
 msgstr "æä"
 
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:568
 msgid "Sending"
 msgstr "åéä"
 
-#: ../capplet/settings/mail-account-view.c:590
-msgid "To use the email application you'll need to setup an account. Put your email address and password in below and we'll try and work out all the settings. If we can't do it automatically you'll need your server details as well."
-msgstr "èäçéåéåéäçåæéèåèåäååèãèåäéæäæçéåéääåååçïæåæåèäæåææçèååãåææåçæèååæéåæéïæåéèäçèååèçäæåèçèæã"
+#: ../capplet/settings/mail-account-view.c:610
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+"èäçéåéåéäçåæéèåèåäååèãèåäéæäæçéåéääååå"
+"çïæåæåèäæåææçèååãåææåçæèååæéåæéïæåéèäç"
+"èååèçäæåèçèæã"
 
-#: ../capplet/settings/mail-account-view.c:592
-msgid "Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried to make a start with the details you just entered but you may need to change them."
-msgstr "ææïæåçæèåæåæçéäèååãèåäéèåååãæåæäæååèåçèçèæèèéåïäææäæåèéèæèååã"
+#: ../capplet/settings/mail-account-view.c:612
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+"ææïæåçæèåæåæçéäèååãèåäéèåååãæåæäæååèåç"
+"èçèæèèéåïäææäæåèéèæèååã"
 
-#: ../capplet/settings/mail-account-view.c:594
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify more options to configure the account."
 msgstr "æåäæåæåçäèåéååèçééã"
 
-#: ../capplet/settings/mail-account-view.c:596
-msgid "Now we need your settings for sending mail. We've tried to make some guesses but you should check them over to make sure."
-msgstr "çåæåéèæçèååæèåééäãæååçèèçæéåèåïäæææèææååäéèçèã"
+#: ../capplet/settings/mail-account-view.c:616
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"çåæåéèæçèååæèåééäãæååçèèçæéåèåïäæææèææ"
+"ååäéèçèã"
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:617
 msgid "You can specify your default settings for your account."
 msgstr "æåäæåèååèçéèèååã"
 
-#: ../capplet/settings/mail-account-view.c:598
-msgid "Time to check things over before we try and connect to the server and fetch your mail."
+#: ../capplet/settings/mail-account-view.c:618
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
 msgstr "åæååèäéçåäæåååéäåææäéçæéã"
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2091
-#: ../mail/em-account-editor.c:2212
+#: ../capplet/settings/mail-account-view.c:633
+#: ../mail/em-account-editor.c:2182 ../mail/em-account-editor.c:2315
 msgid "Identity"
 msgstr "èå"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:633
 msgid "Next - Receiving mail"
 msgstr "ääæ - ææéä"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Receiving mail"
 msgstr "ææéä"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Sending mail"
 msgstr "ääæ - åééä"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Identity"
 msgstr "ääæ - èå"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Receiving options"
 msgstr "ääæ - ææéé"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Receiving options"
 msgstr "ææéé"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Receiving mail"
 msgstr "ääæ - ææéä"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Sending mail"
 msgstr "åééä"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:638
 msgid "Next - Review account"
 msgstr "ääæ - æéåè"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Next - Defaults"
 msgstr "ääæ - èçèæ"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Receiving options"
 msgstr "ääæ - ææéé"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3043
+#: ../capplet/settings/mail-account-view.c:638
+#: ../mail/em-account-editor.c:3202
 msgid "Defaults"
 msgstr "éèå"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:638
 msgid "Back - Sending mail"
 msgstr "ääæ - åééä"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Review account"
 msgstr "æéåè"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Finish"
 msgstr "åæ"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Back - Sending"
 msgstr "ääæ - åé"
 
-#: ../capplet/settings/mail-account-view.c:740
+#: ../capplet/settings/mail-account-view.c:760
 msgid "Setup Google contacts with Evolution"
 msgstr "å Google éçäåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:741
+#: ../capplet/settings/mail-account-view.c:761
 msgid "Setup Google calendar with Evolution"
 msgstr "å Google ææåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:746
+#: ../capplet/settings/mail-account-view.c:766
 msgid "You may need to enable IMAP access."
 msgstr "æåèéèåç IMAP ååã"
 
-#: ../capplet/settings/mail-account-view.c:754
+#: ../capplet/settings/mail-account-view.c:774
 msgid "Google account settings:"
 msgstr "Google åèèååï"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:800
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "å Yahoo èäæåå Evolution"
 
-#: ../capplet/settings/mail-account-view.c:784
-msgid "Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct."
-msgstr "Yahoo èäææååç åå_åæãæåååèçæéåèäæçåçãåæèçèåïåææéèèéæèåèäæçåçã"
+#: ../capplet/settings/mail-account-view.c:804
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+"Yahoo èäææååç åå_åæãæåååèçæéåèäæçåçãåæèçè"
+"åïåææéèèéæèåèäæçåçã"
 
-#: ../capplet/settings/mail-account-view.c:793
+#: ../capplet/settings/mail-account-view.c:813
 msgid "Yahoo account settings:"
 msgstr "Yahoo åèèååï"
 
-#: ../capplet/settings/mail-account-view.c:807
+#: ../capplet/settings/mail-account-view.c:827
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo èäæåçï"
 
-#: ../capplet/settings/mail-account-view.c:1079
+#: ../capplet/settings/mail-account-view.c:1099
 msgid "Password:"
 msgstr "åçï"
 
-#: ../capplet/settings/mail-account-view.c:1130
+#: ../capplet/settings/mail-account-view.c:1150
 #: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "ééåé"
 
-#: ../capplet/settings/mail-account-view.c:1140
+#: ../capplet/settings/mail-account-view.c:1160
 msgid "Account Wizard"
 msgstr "åèçé"
 
-#: ../capplet/settings/mail-capplet-shell.c:209
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "Evolution åèåç"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:353
-#: ../mail/e-mail-migrate.c:680
-#: ../mail/e-mail-store.c:229
-#: ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149
-#: ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163
-#: ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1721
-#: ../modules/addressbook/e-book-shell-backend.c:92
-#: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:103
-#: ../modules/calendar/e-cal-shell-migrate.c:150
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:117
+#: ../capplet/settings/mail-capplet-shell.c:368 ../mail/e-mail-migrate.c:744
+#: ../mail/e-mail-store.c:234 ../mail/em-folder-tree-model.c:146
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:235
+#: ../mail/message-list.c:1714
+#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "æçéè"
 
@@ -7290,10 +7282,9 @@ msgstr "èäæääéç"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution éééç"
 
-#: ../data/evolution.desktop.in.in.h:1
-#: ../mail/e-mail-browser.c:952
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:253
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:996
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7301,8 +7292,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution éäèèäæ"
 
-#: ../data/evolution.desktop.in.in.h:3
-#: ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:657
 msgid "Groupware Suite"
 msgstr "Groupware åèèé"
 
@@ -7319,36 +7309,36 @@ msgid "Email Settings"
 msgstr "éåéäèåå"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:223
+#: ../e-util/e-activity.c:227
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s ïååæï"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:226
+#: ../e-util/e-activity.c:230
 #, c-format
 msgid "%s (completed)"
 msgstr "%s ïååæï "
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:229
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (æåçå)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:237
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (æååæ)"
 
-#: ../e-util/e-activity.c:235
+#: ../e-util/e-activity.c:239
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:240
+#: ../e-util/e-activity.c:244
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% åæ)"
@@ -7410,16 +7400,12 @@ msgid "Western European, New"
 msgstr "èäèæèç"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85
-#: ../e-util/e-charset.c:87
-#: ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "æé"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:91
-#: ../e-util/e-charset.c:93
-#: ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
 #: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "çé"
@@ -7435,27 +7421,26 @@ msgid "Visual"
 msgstr "èè"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../e-util/e-datetime-format.c:199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1823
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:308
+#: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "äå"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:207
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æå"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:212
 msgid "Yesterday"
 msgstr "æå"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:217
+#: ../e-util/e-datetime-format.c:220
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "äéä"
@@ -7463,7 +7448,7 @@ msgstr "äéä"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:223
+#: ../e-util/e-datetime-format.c:226
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "äéä"
@@ -7471,7 +7456,7 @@ msgstr "äéä"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:229
+#: ../e-util/e-datetime-format.c:232
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "äéä"
@@ -7479,7 +7464,7 @@ msgstr "äéä"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:235
+#: ../e-util/e-datetime-format.c:238
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "äéå"
@@ -7487,7 +7472,7 @@ msgstr "äéå"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:241
+#: ../e-util/e-datetime-format.c:244
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "äéä"
@@ -7495,7 +7480,7 @@ msgstr "äéä"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:247
+#: ../e-util/e-datetime-format.c:250
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "äéå"
@@ -7503,55 +7488,54 @@ msgstr "äéå"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:253
+#: ../e-util/e-datetime-format.c:256
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "äéæ"
 
-#: ../e-util/e-datetime-format.c:335
-#: ../e-util/e-datetime-format.c:345
-#: ../e-util/e-datetime-format.c:354
+#: ../e-util/e-datetime-format.c:338 ../e-util/e-datetime-format.c:348
+#: ../e-util/e-datetime-format.c:357
 msgid "Use locale default"
 msgstr "äçååèåéèå"
 
-#: ../e-util/e-datetime-format.c:551
+#: ../e-util/e-datetime-format.c:554
 msgid "Format:"
 msgstr "æåï"
 
-#: ../e-util/e-file-utils.c:152
+#: ../e-util/e-file-utils.c:151
 msgid "(Unknown Filename)"
 msgstr "ïäæçææåçï"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:156
+#: ../e-util/e-file-utils.c:155
 #, c-format
 msgid "Writing \"%s\""
 msgstr "æåååã%sã"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:161
+#: ../e-util/e-file-utils.c:160
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "æåååã%sãè %s"
 
-#: ../e-util/e-plugin-util.c:426
-#: ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:378
+#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:380
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "é"
 
-#: ../e-util/e-print.c:157
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "ååæççéè"
 
-#: ../e-util/e-print.c:164
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "ååççååäåéææéèçèçèèï"
 
-#: ../e-util/e-print.c:170
-msgid "The printing system did not report any additional details about the error."
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr "ååççææååääéææéèçéåèèã"
 
 #: ../e-util/e-signature.c:707
@@ -7578,264 +7562,215 @@ msgstr "èèåå?"
 msgid "File exists \"{0}\"."
 msgstr "ææåååã{0}ãã"
 
-#: ../e-util/e-system.error.xml.h:6
-#: ../mail/mail.error.xml.h:157
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
 msgid "_Overwrite"
 msgstr "èå(_O)"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:117
 msgid "Could not open the link."
 msgstr "çæéåèéçã"
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
 msgstr "çæéç Evolution çæåæäã"
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1318
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf éèï%s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1329
 msgid "All further errors shown only on terminal."
 msgstr "ææéäæçéèèæåæåççæäéçã"
 
-#: ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1050
-#: ../mail/e-mail-tag-editor.c:325
-#: ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1054
+#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "åäè"
 
-#: ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1051
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1055
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "åè"
 
-#: ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2397
-#: ../mail/em-format-html.c:2465
-#: ../mail/em-format-html.c:2488
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
+#: ../mail/em-format-html.c:2564 ../mail/em-format-html.c:2632
+#: ../mail/em-format-html.c:2655 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "åæ"
 
-#: ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2398
-#: ../mail/em-format-html.c:2469
-#: ../mail/em-format-html.c:2491
-#: ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
+#: ../mail/em-format-html.c:2565 ../mail/em-format-html.c:2636
+#: ../mail/em-format-html.c:2658 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "åäåæ"
 
-#: ../em-format/em-format-quote.c:427
-#: ../em-format/em-format.c:1055
-#: ../mail/e-mail-tag-editor.c:330
-#: ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18
-#: ../modules/mail/em-mailer-prefs.c:75
-#: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5
-#: ../smime/lib/e-cert.c:1140
+#: ../em-format/em-format-quote.c:463 ../em-format/em-format.c:1059
+#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../smime/lib/e-cert.c:1142
 msgid "Subject"
 msgstr "äæ"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438
-#: ../mail/em-format-html.c:2585
-#: ../modules/mail/em-mailer-prefs.c:1119
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2757
+#: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "åäè"
 
-#: ../em-format/em-format-quote.c:519
-#: ../mail/em-composer-utils.c:1179
+#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1189
 msgid "-------- Forwarded Message --------"
 msgstr "-------- èéçéä --------"
 
-#: ../em-format/em-format.c:1056
-#: ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76
-#: ../widgets/misc/e-dateedit.c:523
+#: ../em-format/em-format.c:1060 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "ææ"
 
-#: ../em-format/em-format.c:1057
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "æèçç"
 
-#: ../em-format/em-format.c:1058
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "éè"
 
-#: ../em-format/em-format.c:1455
+#: ../em-format/em-format.c:1466
 #, c-format
 msgid "%s attachment"
 msgstr "%s éä"
 
-#: ../em-format/em-format.c:1566
+#: ../em-format/em-format.c:1577
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "çæåæ S/MIME éä:æççéè"
 
-#: ../em-format/em-format.c:1748
-#: ../em-format/em-format.c:1942
+#: ../em-format/em-format.c:1769 ../em-format/em-format.c:1995
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "çæèæ MIME æåçéäãååéçååæã"
 
-#: ../em-format/em-format.c:1758
+#: ../em-format/em-format.c:1780
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "åéä/åååäææçååéå"
 
-#: ../em-format/em-format.c:1778
+#: ../em-format/em-format.c:1800
 msgid "Could not parse PGP/MIME message"
 msgstr "çæåæ PGP/MIME éä"
 
-#: ../em-format/em-format.c:1779
+#: ../em-format/em-format.c:1801
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "çæåæ PGP/MIME éäïæççéè"
 
-#: ../em-format/em-format.c:1967
+#: ../em-format/em-format.c:2020
 msgid "Unsupported signature format"
 msgstr "äææççåæå"
 
-#: ../em-format/em-format.c:1980
-#: ../em-format/em-format.c:2159
+#: ../em-format/em-format.c:2033 ../em-format/em-format.c:2215
 msgid "Error verifying signature"
 msgstr "æéçåççéè"
 
-#: ../em-format/em-format.c:1981
-#: ../em-format/em-format.c:2146
-#: ../em-format/em-format.c:2160
+#: ../em-format/em-format.c:2034 ../em-format/em-format.c:2200
+#: ../em-format/em-format.c:2216
 msgid "Unknown error verifying signature"
 msgstr "æéçåççäæéè"
 
-#: ../em-format/em-format.c:2251
+#: ../em-format/em-format.c:2308
 msgid "Could not parse PGP message: "
 msgstr "çæèæ PGP éäï"
 
-#: ../em-format/em-format.c:2257
-#: ../mail/em-folder-tree.c:656
-#: ../mail/mail-ops.c:624
-#: ../plugins/caldav/caldav-browse-server.c:210
-#: ../plugins/caldav/caldav-browse-server.c:1407
-#: ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:100
-msgid "Unknown error"
-msgstr "äæçéè"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
 #: ../filter/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "1 çå"
-msgstr[1] "%d çå"
+msgstr[0] "%d çå"
 
 #: ../filter/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
-msgstr[0] "1 çå"
-msgstr[1] "%d çå"
+msgstr[0] "%d çå"
 
 #: ../filter/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "1 åéå"
-msgstr[1] "%d åéå"
+msgstr[0] "%d åéå"
 
 #: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] "1 åéå"
-msgstr[1] "%d åéå"
+msgstr[0] "%d åéå"
 
 #: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
-msgstr[0] "1 åæå"
-msgstr[1] "%d åæå"
+msgstr[0] "%d åæå"
 
 #: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
-msgstr[0] "1 åæå"
-msgstr[1] "%d åæå"
+msgstr[0] "%d åæå"
 
 #: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
-msgstr[0] "1 æå"
-msgstr[1] "%d æå"
+msgstr[0] "%d æå"
 
 #: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
-msgstr[0] "1 åå"
-msgstr[1] "%d åå"
+msgstr[0] "%d åå"
 
 #: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] "1 éå"
-msgstr[1] "%d éå"
+msgstr[0] "%d éå"
 
 #: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] "1 éå"
-msgstr[1] "%d éå"
+msgstr[0] "%d éå"
 
 #: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
-msgstr[0] "1 æå"
-msgstr[1] "%d æå"
+msgstr[0] "%d æå"
 
 #: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
-msgstr[0] "1 åæå"
-msgstr[1] "%d åæå"
+msgstr[0] "%d åæå"
 
 #: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
-msgstr[0] "1 åå"
-msgstr[1] "%d åå"
+msgstr[0] "%d åå"
 
 #: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
-msgstr[0] "1 åå"
-msgstr[1] "%d åå"
+msgstr[0] "%d åå"
 
 #: ../filter/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<æéèéæææ>"
 
-#: ../filter/e-filter-datespec.c:132
-#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
 #: ../filter/e-filter-datespec.c:154
 msgid "now"
 msgstr "çå"
@@ -7849,69 +7784,66 @@ msgstr "%Y-%b-%d"
 msgid "Select a time to compare against"
 msgstr "éæèæåçæé"
 
-#: ../filter/e-filter-file.c:188
+#: ../filter/e-filter-file.c:190
 msgid "Choose a File"
 msgstr "éæææ"
 
-#: ../filter/e-filter-rule.c:662
+#: ../filter/e-filter-rule.c:664
 msgid "R_ule name:"
 msgstr "èååç(_U):"
 
-#: ../filter/e-filter-rule.c:692
+#: ../filter/e-filter-rule.c:694
 msgid "Find items that meet the following conditions"
 msgstr "åæçåäåæäçéç"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:719
 msgid "If all conditions are met"
 msgstr "åæåéæäçå"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:720
 msgid "If any conditions are met"
 msgstr "åæääæäçå"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:723
 msgid "_Find items:"
 msgstr "åæéç(_F):"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:750
+#: ../filter/e-filter-rule.c:752
 msgid "None"
 msgstr "ææ"
 
-#: ../filter/e-filter-rule.c:751
+#: ../filter/e-filter-rule.c:753
 msgid "All related"
 msgstr "ææçéç"
 
-#: ../filter/e-filter-rule.c:752
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:754 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "åè"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:755
 msgid "Replies and parents"
 msgstr "åèåçä"
 
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:756
 msgid "No reply or parent"
 msgstr "ææååæååéä"
 
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:759
 msgid "I_nclude threads"
 msgstr "åæéäçç(_N)"
 
-#: ../filter/e-filter-rule.c:782
+#: ../filter/e-filter-rule.c:784
 msgid "A_dd Condition"
 msgstr "ååæä(_D)"
 
-#: ../filter/e-filter-rule.c:1130
-#: ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:316
+#: ../filter/e-filter-rule.c:1133 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:319
 msgid "Incoming"
 msgstr "åé"
 
-#: ../filter/e-filter-rule.c:1130
-#: ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1133 ../mail/em-utils.c:320
 msgid "Outgoing"
 msgstr "åå"
 
@@ -7943,8 +7875,7 @@ msgstr "çåææã"
 msgid "Missing file name."
 msgstr "çåææåçã"
 
-#: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
 msgid "Missing name."
 msgstr "çååçã"
 
@@ -8000,8 +7931,7 @@ msgstr ""
 "éäææåæèéæååèæç\n"
 "æéäæèã"
 
-#: ../filter/filter.ui.h:11
-#: ../mail/em-filter-editor.c:193
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
 msgid "_Filter Rules"
 msgstr "éæåèå(_F)"
 
@@ -8038,98 +7968,296 @@ msgstr "ææåçæå"
 msgid "years"
 msgstr "å"
 
-#: ../mail/e-mail-attachment-bar.c:86
-#: ../mail/e-mail-attachment-bar.c:91
-#: ../mail/em-format-html-display.c:1122
-#: ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:124
-#: ../widgets/misc/e-attachment-paned.c:129
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:569 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "ææåå"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:573 ../mail/mail-config.ui.h:130
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "TLS åå"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:577 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "SSL åå"
+
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:840 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "ææ"
+
+#: ../mail/em-account-editor.c:921
+msgid "Never"
+msgstr "æä"
+
+#: ../mail/em-account-editor.c:922
+msgid "Always"
+msgstr "æé"
+
+#: ../mail/em-account-editor.c:923
+msgid "Ask for each message"
+msgstr "æåéäçèå"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1743 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "ææ"
+
+#: ../mail/em-account-editor.c:2179
+msgid "Mail Configuration"
+msgstr "éäçæ"
+
+#: ../mail/em-account-editor.c:2180
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"æèäç Evolution éäçæåçã\n"
+"\n"
+"æääãççãéåã "
+
+#: ../mail/em-account-editor.c:2183
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"èåäéèåæçåçåééååããéææãçæäääåèåïééæåæåéå"
+"çéäåååéäèèã"
+
+#: ../mail/em-account-editor.c:2185 ../mail/em-account-editor.c:2374
+msgid "Receiving Email"
+msgstr "ææéåéä"
+
+#: ../mail/em-account-editor.c:2186
+msgid "Please configure the following account settings."
+msgstr "èåèåäååèçèååã"
+
+#: ../mail/em-account-editor.c:2188 ../mail/em-account-editor.c:2898
+msgid "Sending Email"
+msgstr "åééåéä"
+
+#: ../mail/em-account-editor.c:2189
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"èèåääéæåééäæåçèèãåææäææïèèçççççåæçèæåä"
+"æåã"
+
+#: ../mail/em-account-editor.c:2191 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "åèèè"
+
+#: ../mail/em-account-editor.c:2192
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"èåäéççéèåæèéååèçåçã\n"
+"éååçåååçéçäçã"
+
+#: ../mail/em-account-editor.c:2196
+msgid "Done"
+msgstr "åæ"
+
+#: ../mail/em-account-editor.c:2197
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"æåæïéäèååçåæã\n"
+"\n"
+"æçååäéåäç Evolution æçéåéäã\n"
+"\n"
+"èæääãåçãååèåã"
+
+#: ../mail/em-account-editor.c:2696
+msgid "Check for _new messages every"
+msgstr "èåæææéäæ(_N)"
+
+#: ../mail/em-account-editor.c:2704
+msgid "minu_tes"
+msgstr "åé(_T)"
+
+#: ../mail/em-account-editor.c:3015
+msgid "Please select a folder from the current account."
+msgstr "èéæçååèçèæåã"
+
+#: ../mail/em-account-editor.c:3341 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "ååæ"
+
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:3395 ../mail/em-account-editor.c:3478
+msgid "Receiving Options"
+msgstr "ææéé"
+
+#: ../mail/em-account-editor.c:3396 ../mail/em-account-editor.c:3479
+msgid "Checking for New Messages"
+msgstr "æææéä"
+
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1217 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "éä"
-msgstr[1] "éä"
 
-#: ../mail/e-mail-attachment-bar.c:604
-#: ../widgets/misc/e-attachment-paned.c:619
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
 msgid "Icon View"
 msgstr "åçæè"
 
-#: ../mail/e-mail-attachment-bar.c:606
-#: ../widgets/misc/e-attachment-paned.c:621
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
 msgstr "æåæè"
 
-#: ../mail/e-mail-browser.c:125
-#: ../shell/e-shell-window-actions.c:1405
-#: ../shell/e-shell-window-actions.c:1412
-#: ../shell/e-shell-window-actions.c:1419
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1460
 msgid "Close this window"
 msgstr "ééæèç"
 
-#: ../mail/e-mail-browser.c:282
+#: ../mail/e-mail-browser.c:291
 msgid "(No Subject)"
 msgstr "(ææäæ)"
 
-#: ../mail/e-mail-display.c:62
+#: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
 msgstr "åååéèé(_A)â"
 
-#: ../mail/e-mail-display.c:69
+#: ../mail/e-mail-display.c:73
 msgid "_To This Address"
 msgstr "åéåäå(_T)"
 
-#: ../mail/e-mail-display.c:76
+#: ../mail/e-mail-display.c:80
 msgid "_From This Address"
 msgstr "åéåäå(_F)"
 
-#: ../mail/e-mail-display.c:85
+#: ../mail/e-mail-display.c:87
+msgid "Send _Reply To..."
+msgstr "åéåèå(_R)â"
+
+#: ../mail/e-mail-display.c:89
+msgid "Send a reply message to this address"
+msgstr "åéåèéäåéåäå"
+
+#: ../mail/e-mail-display.c:96
 msgid "Create Search _Folder"
 msgstr "åçæåèæå(_F)"
 
-#: ../mail/e-mail-folder-utils.c:88
+#: ../mail/e-mail-folder-utils.c:111
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "ååéäåèæåã%sã"
 
-#: ../mail/e-mail-label-dialog.c:219
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "åèåçéä"
+
+#: ../mail/e-mail-folder-utils.c:391
+msgid "Scanning messages for duplicates"
+msgstr "ææéäæåæéè"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "åå %d åéä"
+
+#: ../mail/e-mail-folder-utils.c:824
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "çéèæåã%sã"
+
+#: ../mail/e-mail-folder-utils.c:948
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "ææã%sãåçèçéã"
+
+#: ../mail/e-mail-folder-utils.c:952
+msgid "File has been removed."
+msgstr "ææåçèçéã"
+
+#: ../mail/e-mail-folder-utils.c:1011
+msgid "Removing attachments"
+msgstr "æåçééä"
+
+#: ../mail/e-mail-folder-utils.c:1175
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "åå %d åéä"
+
+#: ../mail/e-mail-folder-utils.c:1519 ../mail/em-folder-utils.c:577
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "çæçèæå URIã%sã"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "ååéäéæèéï"
+
+#: ../mail/e-mail-label-dialog.c:223
 msgid "_Label name:"
 msgstr "æçåç(_L):"
 
-#: ../mail/e-mail-label-list-store.c:37
+#: ../mail/e-mail-label-list-store.c:41
 msgid "I_mportant"
 msgstr "éè(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:38
+#: ../mail/e-mail-label-list-store.c:42
 msgid "_Work"
 msgstr "åä(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:39
+#: ../mail/e-mail-label-list-store.c:43
 msgid "_Personal"
 msgstr "åä(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:40
+#: ../mail/e-mail-label-list-store.c:44
 msgid "_To Do"
 msgstr "åèäé(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:45
 msgid "_Later"
 msgstr "çå(_L)"
 
-#: ../mail/e-mail-label-manager.c:161
-#: ../modules/mail/e-mail-shell-view-actions.c:627
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:676
 msgid "Add Label"
 msgstr "ååæç"
 
-#: ../mail/e-mail-label-manager.c:212
+#: ../mail/e-mail-label-manager.c:216
 msgid "Edit Label"
 msgstr "çèæç"
 
-#: ../mail/e-mail-label-manager.c:346
+#: ../mail/e-mail-label-manager.c:350
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -8137,74 +8265,69 @@ msgstr ""
 "ææïåæçåçäçåçæçä\n"
 "æèéåäçæåéã"
 
-#: ../mail/e-mail-label-tree-view.c:84
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "éè"
 
-#: ../mail/e-mail-label-tree-view.c:94
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1296
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../widgets/menus/gal-define-views-dialog.c:334
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../plugins/caldav/caldav-browse-server.c:1295
+#: ../widgets/menus/gal-define-views-dialog.c:336
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "åç"
 
-#: ../mail/e-mail-local.c:35
-#: ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:738
-#: ../mail/em-folder-tree.c:3138
-#: ../modules/mail/e-mail-shell-view-private.c:1118
-#: ../modules/mail/e-mail-shell-view-private.c:1129
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
+#: ../mail/em-folder-tree-model.c:722
+#: ../modules/mail/e-mail-shell-view-private.c:1065
+#: ../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Inbox"
 msgstr "æäå"
 
-#: ../mail/e-mail-local.c:36
-#: ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1116
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
+#: ../modules/mail/e-mail-shell-view-private.c:1063
 msgid "Drafts"
 msgstr "èç"
 
-#: ../mail/e-mail-local.c:37
-#: ../mail/em-folder-tree-model.c:742
-#: ../modules/mail/e-mail-shell-view-private.c:1120
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
+#: ../modules/mail/e-mail-shell-view-private.c:1067
 msgid "Outbox"
 msgstr "åäå"
 
-#: ../mail/e-mail-local.c:38
-#: ../mail/em-folder-tree-model.c:744
-#: ../modules/mail/e-mail-shell-view-private.c:1122
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
+#: ../modules/mail/e-mail-shell-view-private.c:1069
 msgid "Sent"
 msgstr "ååé"
 
-#: ../mail/e-mail-local.c:39
-#: ../mail/em-folder-tree-model.c:733
-#: ../modules/mail/e-mail-shell-view-private.c:1124
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
+#: ../modules/mail/e-mail-shell-view-private.c:1071
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:581
+#: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
+#: ../plugins/templates/templates.c:1293
 msgid "Templates"
 msgstr "çæ"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:133
 msgid "Migrating..."
 msgstr "æåçèâ"
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:168
 msgid "Migration"
 msgstr "çè"
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:209
 #, c-format
 msgid "Migrating '%s':"
 msgstr "æåçèã%sãï"
 
-#: ../mail/e-mail-migrate.c:660
+#: ../mail/e-mail-migrate.c:722
 msgid "Migrating Folders"
 msgstr "æåèçèæå"
 
-#: ../mail/e-mail-migrate.c:661
+#: ../mail/e-mail-migrate.c:723
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -8212,749 +8335,713 @@ msgstr ""
 "\n"
 "ç Evolution çèæçèæåæïèèåçå..."
 
-#: ../mail/e-mail-migrate.c:1126
+#: ../mail/e-mail-migrate.c:1279
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "çæåã%sãåçæåéäèæåï%s"
 
-#: ../mail/e-mail-notebook-view.c:562
+#: ../mail/e-mail-notebook-view.c:619
 msgid "Please select a folder"
 msgstr "èéæèæå"
 
-#. XXX e-error should provide a widget layout and API suitable
-#. *     for packing additional widgets to the right of the alert
-#. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:111
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-msgid "Do not ask me again"
-msgstr "äèåèåæ"
-
-#: ../mail/e-mail-reader.c:306
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:304 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "èèèèæå"
 
-#: ../mail/e-mail-reader.c:306
-#: ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:480
 msgid "C_opy"
 msgstr "èè(_O)"
 
-#. Translators: %s is replaced with a folder name
-#. %d with count of duplicate messages.
-#: ../mail/e-mail-reader.c:523
-#, c-format
-msgid "Folder '%s' contains %d duplicate message. Are you sure you want to delete it?"
-msgid_plural "Folder '%s' contains %d duplicate messages. Are you sure you want to delete them?"
-msgstr[0] "èæåã%sãåå %d åéèçéäãæçåèåéåï"
-msgstr[1] "èæåã%sãåå %d åéèçéäãæçåèåéååï"
-
-#: ../mail/e-mail-reader.c:986
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:806 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "çèèæå"
 
-#: ../mail/e-mail-reader.c:986
-#: ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:480
 msgid "_Move"
 msgstr "çå(_M)"
 
-#. Check buttons
-#: ../mail/e-mail-reader.c:1265
-#: ../mail/e-mail-reader.c:1423
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1167 ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1395
 msgid "_Do not ask me again."
 msgstr "äèåèåæ(_D)ã"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1401
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æéåçéäèåçåèæä(_A)"
 
-#: ../mail/e-mail-reader.c:1581
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "ååéä"
-msgstr[1] "ååéä"
-
-#. Translators: This is a part of a suggested file name
-#. * used when saving a message or multiple messages to an
-#. * mbox format, when the first message doesn't have a
-#. * Subject. The extension ".mbox" is appended to this
-#. * string, thus it will be something like "Message.mbox"
-#. * at the end.
-#: ../mail/e-mail-reader.c:1602
-#: ../plugins/groupwise-features/notification.ui.h:1
-#: ../plugins/groupwise-features/properties.ui.h:3
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "éä"
-msgstr[1] "éä"
-
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1767
 msgid "A_dd Sender to Address Book"
 msgstr "åååäèåçéæå(_D)"
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1769
 msgid "Add sender to address book"
 msgstr "æååäèèéèé"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1774
 msgid "Check for _Junk"
 msgstr "ææååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1776
 msgid "Filter the selected messages for junk status"
 msgstr "çéæéääçååéäçæ"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1781
 msgid "_Copy to Folder..."
 msgstr "èèèèæå(_C)â"
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1783
 msgid "Copy selected messages to another folder"
 msgstr "èèåéåçéäååäåèæå"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1788
 msgid "_Delete Message"
 msgstr "åééä(_D)"
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1790
 msgid "Mark the selected messages for deletion"
 msgstr "åéåçéäæçæèåé"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1795
 msgid "Filter on Mailing _List..."
 msgstr "éäèåéæå(_L)â"
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1797
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "çéåéäèååçéæåèå"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1802
 msgid "Filter on _Recipients..."
 msgstr "æäèéæå(_R)â"
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1804
 msgid "Create a rule to filter messages to these recipients"
 msgstr "çéäæäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1809
 msgid "Filter on Se_nder..."
 msgstr "åäèéæå(_N)â"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1811
 msgid "Create a rule to filter messages from this sender"
 msgstr "çéååäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1816
 msgid "Filter on _Subject..."
 msgstr "äæéæå(_S)â"
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1818
 msgid "Create a rule to filter messages with this subject"
 msgstr "çéåäæåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1823
 msgid "A_pply Filters"
 msgstr "åçéæå(_P)"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1825
 msgid "Apply filter rules to the selected messages"
 msgstr "åçéæåèåææéåçéä"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1830
 msgid "_Find in Message..."
 msgstr "åéäååæ(_F)â"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1832
 msgid "Search for text in the body of the displayed message"
 msgstr "æåéççéäææäçæå"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1837
 msgid "_Clear Flag"
 msgstr "æéæå(_C)"
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1839
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "çééåéäçèéææ"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1844
 msgid "_Flag Completed"
 msgstr "æèçååæ(_F)"
 
-#: ../mail/e-mail-reader.c:1955
+#: ../mail/e-mail-reader.c:1846
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ååéåéäçèéææèçååæ"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1851
 msgid "Follow _Up..."
 msgstr "èé(_U)â"
 
-#: ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1853
 msgid "Flag the selected messages for follow-up"
 msgstr "åéåçéäåäèéææ"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1858
 msgid "_Attached"
 msgstr "éä(_A)"
 
-#: ../mail/e-mail-reader.c:1969
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1860 ../mail/e-mail-reader.c:1867
 msgid "Forward the selected message to someone as an attachment"
 msgstr "åéåçéääéäååèåçæä"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1865
 msgid "Forward As _Attached"
 msgstr "äéäèå(_A)"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1872
 msgid "_Inline"
 msgstr "èå(_I)"
 
-#: ../mail/e-mail-reader.c:1983
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1874 ../mail/e-mail-reader.c:1881
 msgid "Forward the selected message in the body of a new message"
 msgstr "åéèèåçéäåéææéäçåæä"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1879
 msgid "Forward As _Inline"
 msgstr "äèåèå(_I)"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1886
 msgid "_Quoted"
 msgstr "åæ(_Q)"
 
-#: ../mail/e-mail-reader.c:1997
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
 msgid "Forward the selected message quoted like a reply"
 msgstr "åéèèåçéääåèéäæååå"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:1893
 msgid "Forward As _Quoted"
 msgstr "äåæèå(_Q)"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:1900
 msgid "_Load Images"
 msgstr "èååç(_L)"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:1902
 msgid "Force images in HTML mail to be loaded"
 msgstr "éè HTML æåçéäæåèèååç"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:1907
 msgid "_Important"
 msgstr "éè(_I)"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:1909
 msgid "Mark the selected messages as important"
 msgstr "åéåçéäæçæéè"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:1914
 msgid "_Junk"
 msgstr "ååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:1916
 msgid "Mark the selected messages as junk"
 msgstr "åéåçéäæçæååéä"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:1921
 msgid "_Not Junk"
 msgstr "äæååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:1923
 msgid "Mark the selected messages as not being junk"
 msgstr "åéåçéäæçæäæååéä"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:1928
 msgid "_Read"
 msgstr "åéè(_R)"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:1930
 msgid "Mark the selected messages as having been read"
 msgstr "åéåçéäæçæåçéè"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:1935
 msgid "Uni_mportant"
 msgstr "äéè(_M)"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:1937
 msgid "Mark the selected messages as unimportant"
 msgstr "åéåçéäæçæäéè"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:1942
 msgid "_Unread"
 msgstr "æéè(_U)"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:1944
 msgid "Mark the selected messages as not having been read"
 msgstr "åéåçéäæçææéè"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:1949
 msgid "_Edit as New Message..."
 msgstr "çèçæéä(_E)â"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:1951
 msgid "Open the selected messages in the composer for editing"
 msgstr "åæåèçéåéåçéäääçè"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:1956
 msgid "Compose _New Message"
 msgstr "æåæéä(_N)"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:1958
 msgid "Open a window for composing a mail message"
 msgstr "éåèçääæåéä"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:1963
 msgid "_Open in New Window"
 msgstr "åæèçéå(_O)"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:1965
 msgid "Open the selected messages in a new window"
 msgstr "äçæèçéåéåçéä"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:1970
 msgid "_Move to Folder..."
 msgstr "çèèæå(_M)â"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:1972
 msgid "Move selected messages to another folder"
 msgstr "åéåçéäçèåäåèæå"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:1977
 msgid "_Switch to Folder"
 msgstr "åæèèæå(_S)"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:1979
 msgid "Display the parent folder"
 msgstr "éçäåèæå"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:1984
 msgid "Switch to _next tab"
 msgstr "åæèääååé(_N)"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:1986
 msgid "Switch to the next tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:1991
 msgid "Switch to _previous tab"
 msgstr "åæèääååé(_P)"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:1993
 msgid "Switch to the previous tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:1998
 msgid "Cl_ose current tab"
 msgstr "ééçåçåé(_O)"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2000
 msgid "Close current tab"
 msgstr "ééçåçåé"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2005
 msgid "_Next Message"
 msgstr "ääåéä(_N)"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2007
 msgid "Display the next message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2012
 msgid "Next _Important Message"
 msgstr "ääåéèéä(_I)"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2014
 msgid "Display the next important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2019
 msgid "Next _Thread"
 msgstr "ääåçééä(_T)"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2021
 msgid "Display the next thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2026
 msgid "Next _Unread Message"
 msgstr "ääåæéèçéä(_U)"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2028
 msgid "Display the next unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2033
 msgid "_Previous Message"
 msgstr "ääåéä(_P)"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2035
 msgid "Display the previous message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2040
 msgid "Pr_evious Important Message"
 msgstr "ääåéèéä(_E)"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2042
 msgid "Display the previous important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2047
 msgid "Previous T_hread"
 msgstr "ääåçééä(_H)"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2049
 msgid "Display the previous thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2054
 msgid "P_revious Unread Message"
 msgstr "ääåæéèçéä(_R)"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2056
 msgid "Display the previous unread message"
 msgstr "éçääåæéèçéä"
 
-# zh_HK: msgstr "ååéä"
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2063
 msgid "Print this message"
 msgstr "ååéä"
 
-# zh_HK: msgstr "éèéèååçéä"
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2070
 msgid "Preview the message to be printed"
 msgstr "éèéèååçéä"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2075
 msgid "Re_direct"
 msgstr "éæåå(_D)"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2077
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "åéåçéäéæååçæä"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2082
 msgid "Remo_ve Attachments"
 msgstr "çééä(_V)"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2084
 msgid "Remove attachments"
 msgstr "çééä"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2089
 msgid "Remove Du_plicate Messages"
 msgstr "çééèçéä(_P)"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2091
 msgid "Checks selected messages for duplicates"
 msgstr "ææéåçéäæåæéè"
 
-#: ../mail/e-mail-reader.c:2205
-#: ../mail/mail.error.xml.h:102
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
-#: ../modules/mail/e-mail-attachment-handler.c:179
+#: ../mail/e-mail-reader.c:2096 ../mail/mail.error.xml.h:108
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "åèææä(_A)"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2098
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æååéçåéåéäçåéæäè"
 
-#: ../mail/e-mail-reader.c:2212
-#: ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2103 ../mail/mail.error.xml.h:109
 msgid "Reply to _List"
 msgstr "åèèæå(_L)"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2105
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æååéçæéåéäçéäèå"
 
-#: ../mail/e-mail-reader.c:2219
-#: ../modules/mail/e-mail-attachment-handler.c:186
+#: ../mail/e-mail-reader.c:2110
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "åèåäè(_R)"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2112
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æååéçæéåçéäçåäè"
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2117
 msgid "_Save as mbox..."
 msgstr "ååæ mbox(_S)â"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2119
 msgid "Save selected messages as an mbox file"
 msgstr "åéåçéäååæ mbox ææ"
 
-#: ../mail/e-mail-reader.c:2233
-msgid "Search Folder from Mailing _List..."
-msgstr "éäèåæåèæå(_L)â"
-
-#: ../mail/e-mail-reader.c:2235
-msgid "Create a search folder for this mailing list"
-msgstr "çéåéäèååçäåæåèæå"
-
-#: ../mail/e-mail-reader.c:2240
-msgid "Search Folder from Recipien_ts..."
-msgstr "åæäèæåèæå(_T)â"
-
-#: ../mail/e-mail-reader.c:2242
-msgid "Create a search folder for these recipients"
-msgstr "çéäæäèåçäåæåèæå"
-
-#: ../mail/e-mail-reader.c:2247
-msgid "Search Folder from Sen_der..."
-msgstr "åäèæåèæå(_D)â"
-
-#: ../mail/e-mail-reader.c:2249
-msgid "Create a search folder for this sender"
-msgstr "çéååäèåçäåæåèæå"
-
-#: ../mail/e-mail-reader.c:2254
-msgid "Search Folder from S_ubject..."
-msgstr "äææåèæå(_U)â"
-
-#: ../mail/e-mail-reader.c:2256
-msgid "Create a search folder for this subject"
-msgstr "çéåäæåçäåæåèæå"
-
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2124
 msgid "_Message Source"
 msgstr "éääæ(_M)"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2126
 msgid "Show the raw email source of the message"
 msgstr "éçéäååæ"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2138
 msgid "_Undelete Message"
 msgstr "åååééä(_U)"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2140
 msgid "Undelete the selected messages"
 msgstr "åæåééåçéä"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2145
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2147
 msgid "Reset the text to its original size"
 msgstr "éèæåçåååå"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2152
 msgid "_Zoom In"
 msgstr "æè(_Z)"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2154
 msgid "Increase the text size"
 msgstr "åæåæå"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2159
 msgid "Zoom _Out"
 msgstr "æé(_O)"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2161
 msgid "Decrease the text size"
 msgstr "åæåçå"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2168
 msgid "Create R_ule"
 msgstr "åçèå(_U)"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2175
 msgid "Ch_aracter Encoding"
 msgstr "ååçç(_A)"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2182
 msgid "F_orward As"
 msgstr "èåç(_O)"
 
-#: ../mail/e-mail-reader.c:2326
+#: ../mail/e-mail-reader.c:2189
 msgid "_Group Reply"
 msgstr "ççåè(_G)"
 
-#: ../mail/e-mail-reader.c:2333
+#: ../mail/e-mail-reader.c:2196
 msgid "_Go To"
 msgstr "çè(_G)"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2203
 msgid "Mar_k As"
 msgstr "æçæ(_K)"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2210
 msgid "_Message"
 msgstr "éä(_M)"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2217
 msgid "_Zoom"
 msgstr "çæ(_Z)"
 
-#: ../mail/e-mail-reader.c:2379
+#: ../mail/e-mail-reader.c:2227
+msgid "Search Folder from Mailing _List..."
+msgstr "éäèåæåèæå(_L)â"
+
+#: ../mail/e-mail-reader.c:2229
+msgid "Create a search folder for this mailing list"
+msgstr "çéåéäèååçäåæåèæå"
+
+#: ../mail/e-mail-reader.c:2234
+msgid "Search Folder from Recipien_ts..."
+msgstr "åæäèæåèæå(_T)â"
+
+#: ../mail/e-mail-reader.c:2236
+msgid "Create a search folder for these recipients"
+msgstr "çéäæäèåçäåæåèæå"
+
+#: ../mail/e-mail-reader.c:2241
+msgid "Search Folder from Sen_der..."
+msgstr "åäèæåèæå(_D)â"
+
+#: ../mail/e-mail-reader.c:2243
+msgid "Create a search folder for this sender"
+msgstr "çéååäèåçäåæåèæå"
+
+#: ../mail/e-mail-reader.c:2248
+msgid "Search Folder from S_ubject..."
+msgstr "äææåèæå(_U)â"
+
+#: ../mail/e-mail-reader.c:2250
+msgid "Create a search folder for this subject"
+msgstr "çéåäæåçäåæåèæå"
+
+#: ../mail/e-mail-reader.c:2273
 msgid "Mark for Follo_w Up..."
 msgstr "æççèé(_W)â"
 
-#: ../mail/e-mail-reader.c:2387
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark as _Important"
 msgstr "æçæéè(_I)"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2285
 msgid "Mark as _Junk"
 msgstr "æçæååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2395
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Not Junk"
 msgstr "æçæéååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2293
 msgid "Mar_k as Read"
 msgstr "æçæåéè(_K)"
 
-#: ../mail/e-mail-reader.c:2403
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as Uni_mportant"
 msgstr "æçæäéè(_M)"
 
-#: ../mail/e-mail-reader.c:2407
+#: ../mail/e-mail-reader.c:2301
 msgid "Mark as _Unread"
 msgstr "æçææéè(_U)"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2345
 msgid "_Caret Mode"
 msgstr "æåæå(_C)"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2347
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "åéççéäåæäéçéçææ"
 
-#: ../mail/e-mail-reader.c:2459
+#: ../mail/e-mail-reader.c:2353
 msgid "All Message _Headers"
 msgstr "ææéäæé(_H)"
 
-#: ../mail/e-mail-reader.c:2461
+#: ../mail/e-mail-reader.c:2355
 msgid "Show messages with all email headers"
 msgstr "éçéäåèçæé"
 
-#: ../mail/e-mail-reader.c:2699
-msgid "Unable to retrieve message"
-msgstr "çæææéä"
-
-#: ../mail/e-mail-reader.c:2761
-#: ../mail/mail-ops.c:2068
+#: ../mail/e-mail-reader.c:2651
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æåååéäã%sã"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3379
-#: ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:538
-#: ../plugins/google-account-setup/google-source.c:674
-#: ../widgets/misc/e-account-tree-view.c:249
+#: ../mail/e-mail-reader.c:3229 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:306
+#: ../plugins/google-account-setup/google-source.c:549
+#: ../plugins/google-account-setup/google-source.c:688
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "éèå"
 
-#: ../mail/e-mail-reader.c:3550
-#: ../modules/mail/e-mail-attachment-handler.c:172
+#: ../mail/e-mail-reader.c:3396
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "èå(_F)"
 
-#: ../mail/e-mail-reader.c:3551
+#: ../mail/e-mail-reader.c:3397
 msgid "Forward the selected message to someone"
 msgstr "åéåçéäèåçæä"
 
-#: ../mail/e-mail-reader.c:3570
+#: ../mail/e-mail-reader.c:3416
 msgid "Group Reply"
 msgstr "ççåè"
 
-#: ../mail/e-mail-reader.c:3571
+#: ../mail/e-mail-reader.c:3417
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "åèçéäèåïææçææçæäè"
 
-#: ../mail/e-mail-reader.c:3616
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:746
+#: ../mail/e-mail-reader.c:3470 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "åé"
 
-#: ../mail/e-mail-reader.c:3649
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
-#: ../widgets/misc/e-calendar.c:201
+#: ../mail/e-mail-reader.c:3503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3653
-#: ../modules/calendar/e-cal-shell-view-actions.c:1304
-#: ../widgets/misc/e-calendar.c:177
+#: ../mail/e-mail-reader.c:3507
+#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3663
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3516 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "åè"
 
-#: ../mail/e-mail-reader.c:4298
+#: ../mail/e-mail-reader.c:4186
 #, c-format
 msgid "Folder '%s'"
 msgstr "èæåã%sã"
 
-#: ../mail/e-mail-session.c:643
+#: ../mail/e-mail-reader-utils.c:139
+msgid "Do not warn me again"
+msgstr "äèåèåæ"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:663
+#, c-format
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] "èæåã%sãåå %u åéèçéäãæçåèåéåï"
+
+#: ../mail/e-mail-reader-utils.c:960
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "ååéä"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * 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:981
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "éä"
+
+#: ../mail/e-mail-session.c:833
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "èèå %s æéçåè"
 
-#: ../mail/e-mail-session.c:645
+#: ../mail/e-mail-session.c:837
 msgid "Enter Passphrase"
 msgstr "èååè"
 
-#: ../mail/e-mail-session.c:648
+#: ../mail/e-mail-session.c:841
 #, c-format
 msgid "Enter Password for %s"
 msgstr "èèå %s æéçåç"
 
-#: ../mail/e-mail-session.c:650
+#: ../mail/e-mail-session.c:845
 msgid "Enter Password"
 msgstr "èååç"
 
-#: ../mail/e-mail-session.c:703
+#: ../mail/e-mail-session.c:896
 #, c-format
 msgid "User canceled operation."
 msgstr "äçèååææäã"
 
-#: ../mail/e-mail-session.c:873
+#: ../mail/e-mail-session.c:1009
 #, c-format
-msgid "No destination address provided, forward of the message has been cancelled."
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
 msgstr "æææäççåäåïéäçèååçåæã"
 
-#: ../mail/e-mail-session.c:882
+#: ../mail/e-mail-session.c:1018
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æäååäççåèïéäçèååçåæã"
 
-#: ../mail/e-mail-session.c:1286
-#: ../mail/mail-ops.c:1220
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "éåèæåã%sã"
-
-#: ../mail/e-mail-session.c:1302
+#: ../mail/e-mail-session-utils.c:419
 #, c-format
-msgid "Invalid folder: %s"
-msgstr "çæçèæåï%s"
+msgid "Cannot get transport for account '%s'"
+msgstr "äèåååèã%sãçåè"
 
-#: ../mail/e-mail-session-utils.c:490
-#: ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:506 ../mail/mail-ops.c:633
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "çæåçååéæåï%s"
 
-#: ../mail/e-mail-session-utils.c:514
-#: ../mail/e-mail-session-utils.c:548
-#: ../mail/mail-ops.c:622
-#: ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:530 ../mail/e-mail-session-utils.c:564
+#: ../mail/mail-ops.c:652 ../mail/mail-ops.c:686
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -8963,221 +9050,81 @@ msgstr ""
 "çæéåè %sï%s\n"
 "æéåèæåãåäåãèæåã"
 
-#: ../mail/e-mail-session-utils.c:568
-#: ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:584 ../mail/mail-ops.c:706
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "çæéåèæåãåäåãèæåï%s"
 
-#: ../mail/e-mail-session-utils.c:779
-#: ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/e-mail-session-utils.c:795 ../mail/mail-ops.c:809
+#: ../mail/mail-ops.c:905
 msgid "Sending message"
 msgstr "æååééä"
 
-#: ../mail/e-mail-session-utils.c:850
+#: ../mail/e-mail-session-utils.c:871
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "åæèéèæå ã%sã"
 
-#: ../mail/e-mail-store-utils.c:39
+#: ../mail/e-mail-store-utils.c:167
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "äæèã%sãçéç"
 
-#: ../mail/e-mail-store-utils.c:130
+#: ../mail/e-mail-store-utils.c:258
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "éæéçåã%sã"
 
+#: ../mail/e-mail-store-utils.c:333
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "æååèã%sãéçåä"
+
 #: ../mail/e-mail-tag-editor.c:291
 msgid "Flag to Follow Up"
 msgstr "èèéçæå"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:564
-#: ../mail/mail-config.ui.h:69
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "ææåå"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:568
-#: ../mail/mail-config.ui.h:126
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "TLS åå"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:572
-#: ../mail/mail-config.ui.h:91
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL åå"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:835
-#: ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "ææ"
-
-#: ../mail/em-account-editor.c:916
-msgid "Never"
-msgstr "æä"
-
-#: ../mail/em-account-editor.c:917
-msgid "Always"
-msgstr "æé"
-
-#: ../mail/em-account-editor.c:918
-msgid "Ask for each message"
-msgstr "æåéäçèå"
-
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1701
-#: ../widgets/misc/e-account-tree-view.c:127
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "ææ"
-
-#: ../mail/em-account-editor.c:2088
-msgid "Mail Configuration"
-msgstr "éäçæ"
-
-#: ../mail/em-account-editor.c:2089
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"æèäç Evolution éäçæåçã\n"
-"\n"
-"æääãååãéåã "
-
-#: ../mail/em-account-editor.c:2092
-msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
-msgstr "èåäéèåæçåçåééååããéææãçæäääåèåïééæåæåéåçéäåååéäèèã"
-
-#: ../mail/em-account-editor.c:2094
-#: ../mail/em-account-editor.c:2257
-msgid "Receiving Email"
-msgstr "ææéåéä"
-
-#: ../mail/em-account-editor.c:2095
-msgid "Please configure the following account settings."
-msgstr "èåèåäååèçèååã"
-
-#: ../mail/em-account-editor.c:2097
-#: ../mail/em-account-editor.c:2757
-msgid "Sending Email"
-msgstr "åééåéä"
-
-#: ../mail/em-account-editor.c:2098
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
-msgstr "èèåääéæåééäæåçèèãåææäææïèèçççççåæçèæåäæåã"
-
-#: ../mail/em-account-editor.c:2100
-#: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "åèèè"
-
-#: ../mail/em-account-editor.c:2101
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"èåäéççéèåæèéååèçåçã\n"
-"éååçåååçéçäçã"
-
-#: ../mail/em-account-editor.c:2105
-msgid "Done"
-msgstr "åæ"
-
-#: ../mail/em-account-editor.c:2106
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1183
 msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 msgstr ""
-"æåæïéäèååçåæã\n"
-"\n"
-"æçååäéåäç Evolution æçéåéäã\n"
-"\n"
-"èæääãåçãååèåã"
-
-#: ../mail/em-account-editor.c:2571
-msgid "Check for _new messages every"
-msgstr "èåæææéäæ(_N)"
-
-#: ../mail/em-account-editor.c:2579
-msgid "minu_tes"
-msgstr "åé(_T)"
-
-#: ../mail/em-account-editor.c:2862
-msgid "Please select a folder from the current account."
-msgstr "èéæçååèçèæåã"
-
-#: ../mail/em-account-editor.c:3172
-#: ../mail/mail-config.ui.h:98
-msgid "Security"
-msgstr "ååæ"
-
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3218
-#: ../mail/em-account-editor.c:3286
-msgid "Receiving Options"
-msgstr "ææéé"
+"æ ${AbbrevWeekdayName}ï${Year}-${Month}-${Day} æ ${24Hour}:${Minute} "
+"${TimeZone}ï${Sender} æåï"
 
-#: ../mail/em-account-editor.c:3219
-#: ../mail/em-account-editor.c:3287
-msgid "Checking for New Messages"
-msgstr "æææéä"
-
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1173
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-msgstr "æ ${AbbrevWeekdayName}ï${Year}-${Month}-${Day} æ ${24Hour}:${Minute} ${TimeZone}ï${Sender} æåï"
-
-#: ../mail/em-composer-utils.c:1184
+#: ../mail/em-composer-utils.c:1194
 msgid "-----Original Message-----"
 msgstr "-----ååéä-----"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1851
+#: ../mail/em-composer-utils.c:1975
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "æåç %s äæã%sã (%s) çéäåèéèã"
 
-#: ../mail/em-composer-utils.c:1905
+#: ../mail/em-composer-utils.c:2034
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "éééçïã%sã"
 
-#: ../mail/em-composer-utils.c:2356
+#: ../mail/em-composer-utils.c:2536
 msgid "an unknown sender"
 msgstr "äæçåäè"
 
-#: ../mail/em-composer-utils.c:2787
+#: ../mail/em-composer-utils.c:2937
 msgid "Posting destination"
 msgstr "åèçççç"
 
-#: ../mail/em-composer-utils.c:2788
+#: ../mail/em-composer-utils.c:2938
 msgid "Choose folders to post the message to."
 msgstr "éåèæåäåèéäã"
 
-#: ../mail/em-filter-folder-element.c:339
+#: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
 msgstr "éæèæå"
 
@@ -9294,8 +9241,7 @@ msgstr "æèå"
 msgid "is set"
 msgstr "èå"
 
-#: ../mail/em-filter-i18n.h:41
-#: ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "ååéä"
 
@@ -9344,13 +9290,11 @@ msgid "Play Sound"
 msgstr "ææéæ"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "åè"
 
-#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "æäè"
 
@@ -9378,13 +9322,11 @@ msgstr "åååæ"
 msgid "Run Program"
 msgstr "åèçå"
 
-#: ../mail/em-filter-i18n.h:62
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "åæ"
 
-#: ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "åäè"
 
@@ -9429,40 +9371,35 @@ msgid "Unset Status"
 msgstr "åæèåçæ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:536
+#: ../mail/em-filter-rule.c:538
 msgid "Then"
 msgstr "æèä"
 
-#: ../mail/em-filter-rule.c:567
+#: ../mail/em-filter-rule.c:569
 msgid "Add Ac_tion"
 msgstr "åååä(_T)"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:124
+#: ../mail/em-folder-properties.c:143
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "æèéä:"
-msgstr[1] "æèéä:"
 
-#. TODO: can this be done in a loop?
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:128
+#: ../mail/em-folder-properties.c:154
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ææéä:"
-msgstr[1] "ææéä:"
 
-#: ../mail/em-folder-properties.c:146
+#: ../mail/em-folder-properties.c:175
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "ééäçé (%s):"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage"
 msgstr "éåçé"
 
-#: ../mail/em-folder-properties.c:290
+#: ../mail/em-folder-properties.c:315
 msgid "Folder Properties"
 msgstr "èæååå"
 
@@ -9470,350 +9407,351 @@ msgstr "èæååå"
 msgid "<click here to select a folder>"
 msgstr "<æéèéæèæå>"
 
-#: ../mail/em-folder-selector.c:261
+#: ../mail/em-folder-selector.c:385
 msgid "C_reate"
 msgstr "åç(_R)"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:391
 msgid "Folder _name:"
 msgstr "èæååç(_N):"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147
-#: ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1164
-#: ../mail/mail-vfolder.c:1239
-msgid "Search Folders"
-msgstr "æåèæå"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172
-#: ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr "äçå"
-
-#: ../mail/em-folder-tree-model.c:808
-#: ../mail/em-folder-tree-model.c:1085
-msgid "Loading..."
-msgstr "èåäâ"
-
-#: ../mail/em-folder-tree.c:197
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "ææã%sãåçèæå"
-
-#: ../mail/em-folder-tree.c:625
+#: ../mail/em-folder-tree.c:647
 msgid "Folder names cannot contain '/'"
 msgstr "èæååçäèååæçã"
 
-#: ../mail/em-folder-tree.c:1245
+#: ../mail/em-folder-tree.c:1331
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1482
+#: ../mail/em-folder-tree.c:1568
 msgid "Mail Folder Tree"
 msgstr "éäèæåæ"
 
-#: ../mail/em-folder-tree.c:1938
-#: ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
 msgstr "æåçåèæå %s"
 
-#: ../mail/em-folder-tree.c:1942
-#: ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
 msgstr "æåèèèæå %s"
 
-#: ../mail/em-folder-tree.c:1951
-#: ../mail/message-list.c:2243
+#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2218
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æååéäçèèæå %s"
 
-#: ../mail/em-folder-tree.c:1955
-#: ../mail/message-list.c:2245
+#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2220
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æåèèéäèèæå %s"
 
-#: ../mail/em-folder-tree.c:1974
+#: ../mail/em-folder-tree.c:2101
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "çæåéäææåæäåçååå"
 
-#: ../mail/em-folder-utils.c:422
+#. load store to mail component
+#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
+#: ../mail/mail-vfolder.c:1165 ../mail/mail-vfolder.c:1240
+msgid "Search Folders"
+msgstr "æåèæå"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
+msgid "UNMATCHED"
+msgstr "äçå"
+
+#: ../mail/em-folder-tree-model.c:792 ../mail/em-folder-tree-model.c:1061
+msgid "Loading..."
+msgstr "èåäâ"
+
+#: ../mail/em-folder-utils.c:481
 msgid "Move Folder To"
 msgstr "çåèæåå"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-utils.c:481
 msgid "Copy Folder To"
 msgstr "èèèæåå"
 
-#: ../mail/em-folder-utils.c:571
-#: ../plugins/groupwise-features/share-folder-common.c:138
-#, c-format
-msgid "Creating folder '%s'"
-msgstr "æååçèæåã%sã"
-
-#: ../mail/em-folder-utils.c:741
+#: ../mail/em-folder-utils.c:556
 msgid "Create Folder"
 msgstr "åçèæå"
 
-#: ../mail/em-folder-utils.c:742
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../mail/em-folder-utils.c:557
 msgid "Specify where to create the folder:"
 msgstr "æåèåçèæåçäçï"
 
-#: ../mail/em-format-html-display.c:84
-#: ../mail/em-format-html.c:1601
+#: ../mail/em-format-html.c:165
+msgid "Formatting message"
+msgstr "æååéä"
+
+#: ../mail/em-format-html.c:368
+msgid "Formatting Message..."
+msgstr "æååéäâ"
+
+#: ../mail/em-format-html.c:1541 ../mail/em-format-html.c:1551
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "æåååã%sã"
+
+#: ../mail/em-format-html.c:1697 ../mail/em-format-html-display.c:85
 msgid "Unsigned"
 msgstr "æçå"
 
-#: ../mail/em-format-html-display.c:84
-msgid "This message is not signed. There is no guarantee that this message is authentic."
-msgstr "æéäæçåãääèæéäåéèã"
-
-#: ../mail/em-format-html-display.c:85
-#: ../mail/em-format-html.c:1602
+#: ../mail/em-format-html.c:1698 ../mail/em-format-html-display.c:86
 msgid "Valid signature"
 msgstr "ææççå"
 
-#: ../mail/em-format-html-display.c:85
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
-msgstr "æéäåçåèäææïèçåéåæåèæéèçéäã"
-
-#: ../mail/em-format-html-display.c:86
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1699 ../mail/em-format-html-display.c:87
 msgid "Invalid signature"
 msgstr "çæççå"
 
-#: ../mail/em-format-html-display.c:86
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr "éäççåçææéïåèåååéæèæåäã"
-
-#: ../mail/em-format-html-display.c:87
-#: ../mail/em-format-html.c:1604
+#: ../mail/em-format-html.c:1700 ../mail/em-format-html-display.c:88
 msgid "Valid signature, but cannot verify sender"
 msgstr "çåææïäæçææéåäè"
 
-#: ../mail/em-format-html-display.c:87
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
-msgstr "æéäæäåææççåïäæéäçåäèçææéã"
-
-#: ../mail/em-format-html-display.c:88
-#: ../mail/em-format-html.c:1605
+#: ../mail/em-format-html.c:1701 ../mail/em-format-html-display.c:89
 msgid "Signature exists, but need public key"
 msgstr "ççååïäéèåééé"
 
-#: ../mail/em-format-html-display.c:88
-msgid "This message is signed with a signature, but there is no corresponding public key."
-msgstr "æéäæäåææççåïäæææåæçåéééã"
-
-#: ../mail/em-format-html-display.c:95
-#: ../mail/em-format-html.c:1611
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:96
 msgid "Unencrypted"
 msgstr "æåå"
 
-#: ../mail/em-format-html-display.c:95
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
-msgstr "æéäæååãåçåååééçéçèåéåèæèæéã"
-
-#: ../mail/em-format-html-display.c:96
-#: ../mail/em-format-html.c:1612
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:97
 msgid "Encrypted, weak"
 msgstr "åååïäåå"
 
-#: ../mail/em-format-html-display.c:96
-msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
-msgstr "æéäåååïäæäçäååçååæçæãåéçäåéæéååïäåèääææïääæçææèæéäçååã"
-
-#: ../mail/em-format-html-display.c:97
-#: ../mail/em-format-html.c:1613
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:98
 msgid "Encrypted"
 msgstr "ååå"
 
-#: ../mail/em-format-html-display.c:97
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
-msgstr "æéäåååãåéçäéäæèæéäçååã"
-
-#: ../mail/em-format-html-display.c:98
-#: ../mail/em-format-html.c:1614
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:99
 msgid "Encrypted, strong"
 msgstr "åååïåå"
 
-#: ../mail/em-format-html-display.c:98
-msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
-msgstr "æéäåååïäçååçååæçæãçäçéäææéïåéçäåéæéæéäçååã"
-
-#: ../mail/em-format-html-display.c:236
-#: ../smime/gui/smime-ui.ui.h:47
-msgid "_View Certificate"
-msgstr "æèæè(_V)"
-
-#: ../mail/em-format-html-display.c:249
-msgid "This certificate is not viewable"
-msgstr "ææèçææè"
-
-#: ../mail/em-format-html-display.c:538
-msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
-msgstr "Evolution çæéçæåéåéäïåçååèåèèççååãæåäçäæççæåæäçåéæåçèåäéèåã"
-
-#: ../mail/em-format-html-display.c:804
-msgid "Completed on"
-msgstr "ååææ"
-
-#: ../mail/em-format-html-display.c:812
-msgid "Overdue:"
-msgstr "åææ:"
-
-#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:816
-msgid "by"
-msgstr "æ"
-
-#: ../mail/em-format-html-display.c:1047
-#: ../mail/em-format-html-display.c:1094
-msgid "View _Unformatted"
-msgstr "æéææçç(_U)"
-
-#: ../mail/em-format-html-display.c:1049
-msgid "Hide _Unformatted"
-msgstr "éèææçç(_U)"
-
-#: ../mail/em-format-html-display.c:1114
-msgid "O_pen With"
-msgstr "äâéå(_O)"
-
-#: ../mail/em-format-html-print.c:176
-#, c-format
-msgid "Page %d of %d"
-msgstr "ç %d / %d é"
-
-#: ../mail/em-format-html.c:161
-msgid "Formatting message"
-msgstr "æååéä"
-
-#: ../mail/em-format-html.c:360
-msgid "Formatting Message..."
-msgstr "æååéäâ"
-
-#: ../mail/em-format-html.c:1445
-#: ../mail/em-format-html.c:1455
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "æåååã%sã"
-
-#: ../mail/em-format-html.c:1976
+#: ../mail/em-format-html.c:2110
 msgid "Unknown external-body part."
 msgstr "æççååææéåã"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2120
 msgid "Malformed external-body part."
 msgstr "æåäèçååææéåã"
 
-#: ../mail/em-format-html.c:2014
+#: ../mail/em-format-html.c:2151
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP çæç (%s)"
 
-#: ../mail/em-format-html.c:2025
+#: ../mail/em-format-html.c:2162
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æåçææ (%s) æ ã%sãææçæç"
 
-#: ../mail/em-format-html.c:2027
+#: ../mail/em-format-html.c:2164
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æåæææç (%s)"
 
-#: ../mail/em-format-html.c:2048
+#: ../mail/em-format-html.c:2185
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "éçèææç (%s)"
 
-#: ../mail/em-format-html.c:2059
+#: ../mail/em-format-html.c:2200
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "äæçåéæææç (ã%sãéå)"
 
-#. To translators: This message suggests to the receipients that the sender of the mail is
-#. different from the one listed in From field.
-#: ../mail/em-format-html.c:2763
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2905
+#: ../plugins/mail-notification/mail-notification.c:405
+#, c-format
+msgid "From: %s"
+msgstr "åäèï%s"
+
+#: ../mail/em-format-html.c:2927
+msgid "(no subject)"
+msgstr "(ææäæ)"
+
+#: ../mail/em-format-html.c:3003
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "éåéäæç %s äè %s åå"
 
-#: ../mail/em-html-stream.c:82
-#: ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
-#, c-format
-msgid "No HTML stream available"
-msgstr "ææ HTML äæåç"
+#: ../mail/em-format-html-display.c:85
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "æéäæçåãääèæéäåéèã"
 
-#: ../mail/em-subscription-editor.c:1105
-msgid "Folder Subscriptions"
-msgstr "èæåèé"
+#: ../mail/em-format-html-display.c:86
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "æéäåçåèäææïèçåéåæåèæéèçéäã"
+
+#: ../mail/em-format-html-display.c:87
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr "éäççåçææéïåèåååéæèæåäã"
+
+#: ../mail/em-format-html-display.c:88
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr "æéäæäåææççåïäæéäçåäèçææéã"
+
+#: ../mail/em-format-html-display.c:89
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr "æéäæäåææççåïäæææåæçåéééã"
+
+#: ../mail/em-format-html-display.c:96
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr "æéäæååãåçåååééçéçèåéåèæèæéã"
+
+#: ../mail/em-format-html-display.c:97
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"æéäåååïäæäçäååçååæçæãåéçäåéæéååïäåèääæ"
+"æïääæçææèæéäçååã"
+
+#: ../mail/em-format-html-display.c:98
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr "æéäåååãåéçäéäæèæéäçååã"
+
+#: ../mail/em-format-html-display.c:99
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"æéäåååïäçååçååæçæãçäçéäææéïåéçäåéæéæéä"
+"çååã"
+
+#: ../mail/em-format-html-display.c:237 ../smime/gui/smime-ui.ui.h:47
+msgid "_View Certificate"
+msgstr "æèæè(_V)"
+
+#: ../mail/em-format-html-display.c:250
+msgid "This certificate is not viewable"
+msgstr "ææèçææè"
+
+#: ../mail/em-format-html-display.c:552
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolution çæéçæåéåéäïåçååèåèèççååãæåäçäæççæ"
+"åæäçåéæåçèåäéèåã"
+
+#: ../mail/em-format-html-display.c:848
+msgid "Completed on"
+msgstr "ååææ"
+
+#: ../mail/em-format-html-display.c:860
+msgid "Overdue:"
+msgstr "åææ:"
+
+#: ../mail/em-format-html-display.c:868
+msgid "by"
+msgstr "æ"
+
+#: ../mail/em-format-html-display.c:1142 ../mail/em-format-html-display.c:1189
+msgid "View _Unformatted"
+msgstr "æéææçç(_U)"
+
+#: ../mail/em-format-html-display.c:1144
+msgid "Hide _Unformatted"
+msgstr "éèææçç(_U)"
+
+#: ../mail/em-format-html-display.c:1209
+msgid "O_pen With"
+msgstr "äâéå(_O)"
 
-#: ../mail/em-subscription-editor.c:1144
+#: ../mail/em-format-html-print.c:176
+#, c-format
+msgid "Page %d of %d"
+msgstr "ç %d / %d é"
+
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
+#, c-format
+msgid "No HTML stream available"
+msgstr "ææ HTML äæåç"
+
+#: ../mail/em-subscription-editor.c:1138
+msgid "Folder Subscriptions"
+msgstr "èæåèé"
+
+#: ../mail/em-subscription-editor.c:1177
 msgid "_Account:"
 msgstr "åè(_A):"
 
-#: ../mail/em-subscription-editor.c:1159
+#: ../mail/em-subscription-editor.c:1192
 msgid "Clear Search"
 msgstr "æéæå"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1210
 msgid "Sho_w items that contain:"
 msgstr "éçéçåå(_W):"
 
-#: ../mail/em-subscription-editor.c:1216
+#: ../mail/em-subscription-editor.c:1249
 msgid "Subscribe to the selected folder"
 msgstr "èééåçèæå"
 
-#: ../mail/em-subscription-editor.c:1217
+#: ../mail/em-subscription-editor.c:1250
 msgid "Su_bscribe"
 msgstr "èé(_B)"
 
-#: ../mail/em-subscription-editor.c:1228
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../mail/em-subscription-editor.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Unsubscribe from the selected folder"
 msgstr "åæèééåçèæå"
 
-#: ../mail/em-subscription-editor.c:1229
-#: ../modules/mail/e-mail-shell-view-actions.c:1176
+#: ../mail/em-subscription-editor.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "_Unsubscribe"
 msgstr "åæèé(_U)"
 
-#: ../mail/em-subscription-editor.c:1240
+#: ../mail/em-subscription-editor.c:1273
 msgid "Collapse all folders"
 msgstr "ææææçèæå"
 
-#: ../mail/em-subscription-editor.c:1241
+#: ../mail/em-subscription-editor.c:1274
 msgid "C_ollapse All"
 msgstr "åéææ(_O)"
 
-#: ../mail/em-subscription-editor.c:1251
+#: ../mail/em-subscription-editor.c:1284
 msgid "Expand all folders"
 msgstr "åéææçèæå"
 
-#: ../mail/em-subscription-editor.c:1252
+#: ../mail/em-subscription-editor.c:1285
 msgid "E_xpand All"
 msgstr "åéåé(_X)"
 
-#: ../mail/em-subscription-editor.c:1262
+#: ../mail/em-subscription-editor.c:1295
 msgid "Refresh the folder list"
 msgstr "éææçèæåæå"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1307
 msgid "Stop the current operation"
 msgstr "åæçåçæä"
 
@@ -9821,23 +9759,22 @@ msgstr "åæçåçæä"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:102
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "æçåèäæéå %d åéäï"
-msgstr[1] "æçåèäæéå %d åéäï"
 
-#: ../mail/em-utils.c:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:151
+#: ../mail/em-utils.c:158
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "äèåéçéåèæ(_D)"
 
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:331
 msgid "Message Filters"
 msgstr "éäèå"
 
-#: ../mail/em-utils.c:904
+#: ../mail/em-utils.c:916
 #, c-format
 msgid "Messages from %s"
 msgstr "äè %s çéä"
@@ -9846,7 +9783,7 @@ msgstr "äè %s çéä"
 msgid "Search _Folders"
 msgstr "æåèæå(_F)"
 
-#: ../mail/em-vfolder-rule.c:610
+#: ../mail/em-vfolder-rule.c:604
 msgid "Add Folder"
 msgstr "ååèæå"
 
@@ -9908,7 +9845,9 @@ msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "éèèæåçæåäéççæé(ç)ã"
 
 #: ../mail/evolution-mail.schemas.in.h:15
-msgid "Asks whether to close the message window when the user forwards or replies to the message shown in the window"
+msgid ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
 msgstr "çäçèèåæåèèçäéççéäæèåæåèéééäèç"
 
 #: ../mail/evolution-mail.schemas.in.h:16
@@ -9960,11 +9899,15 @@ msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "åçå TO/CC/BCC ääåçéçæå"
 
 #: ../mail/evolution-mail.schemas.in.h:28
-msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
 msgstr "å TO/CC/BCC ääåçéçæååçç address_count äæåçéåã"
 
 #: ../mail/evolution-mail.schemas.in.h:29
-msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
 msgstr "æåæåçèæèéçéääæååæçéçãééåéèåæ 30 çã"
 
 #: ../mail/evolution-mail.schemas.in.h:30
@@ -9972,8 +9915,11 @@ msgid "Custom headers to use while checking for junk."
 msgstr "ææååéäççèèæéã"
 
 #: ../mail/evolution-mail.schemas.in.h:31
-msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
-msgstr "ææååéäççèèæéãææåäçåçæåçãheadername=valueãåäã"
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"ææååéäççèèæéãææåäçåçæåçãheadername=valueãåäã"
 
 #: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages"
@@ -10024,708 +9970,930 @@ msgid "Default width of the mail browser window."
 msgstr "éäçèåèççéèååã"
 
 #: ../mail/evolution-mail.schemas.in.h:44
-msgid "Determines whether to look up addresses for junk filtering in local address book only"
-msgstr "æåæåååæåçéèéäåæææååéäççéåéääå"
+msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr "æèåçææèäçéäæééèæèæææåéãã0ã= åé ã1ã = ææ"
 
 #: ../mail/evolution-mail.schemas.in.h:45
-msgid "Determines whether to lookup in address book for sender email"
-msgstr "æåæååéèéäåæåäèéåéäåè"
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr "æåæåååæåçéèéäåæææååéäççéåéääå"
 
 #: ../mail/evolution-mail.schemas.in.h:46
-msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
-msgstr "æåæååéèéäåæåäèéåéäåèãåææååïåäåæçååéäãåææåæèçèåèéçéèéãäèæèçèåèéçæéçéèéïå LDAPïïåéååèæåæã"
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "æåæååéèéäåæåäèéåéäåè"
 
 #: ../mail/evolution-mail.schemas.in.h:47
-msgid "Determines whether to use custom headers to check for junk"
-msgstr "æåæåäçèèæéäææååéä"
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"æåæååéèéäåæåäèéåéäåèãåææååïåäåæçååéäãå"
+"ææåæèçèåèéçéèéãäèæèçèåèéçæéçéèéïå LDAPïïå"
+"éååèæåæã"
 
 #: ../mail/evolution-mail.schemas.in.h:48
-msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
-msgstr "æåæåäçèèæéäææååéäãåæåçéåééääæäæéïåææåååéäææçéåã"
+msgid "Determines whether to use custom headers to check for junk"
+msgstr "æåæåäçèèæéäææååéä"
 
 #: ../mail/evolution-mail.schemas.in.h:49
-msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
-msgstr "æåæåååçæèçãéäãèçãåääãåãäæãääçåæçååã"
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+"æåæåäçèèæéäææååéäãåæåçéåééääæäæéïåææåå"
+"åéäææçéåã"
 
 #: ../mail/evolution-mail.schemas.in.h:50
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr "æåæåååçæèçãéäãèçãåääãåãäæãääçåæçååã"
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "çäéäçèåèå/éäççéã"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "çäååéäåäæççéã"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "åçæåçåéåçèæååçççåè"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr "åéçäèéæåååçéäæå"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "çæååçåæåéçè"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "çæèåååæåæåäéçæåéèæçã"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "ééææçååéäèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "çæææçååèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "éé Evolution ææçææååéäèæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "çæ Evolution ææçææååèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:60
-msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
-msgstr "åç HTML éääçåçåçãèåäçèèçåçåçåçäïåèååäéæåçäæã"
-
 #: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"åç HTML éääçåçåçãèåäçèèçåçåçåçäïåèååäéæåç"
+"äæã"
+
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "åçæåèæåïåææåäåéèéäæçåææã"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "åçæåçéèççé"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "åçæåçæèååéäæçæçã"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "åçæåçéæåæåè"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
 msgstr "åçæåèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
 msgstr "åççåéåææåèæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "Enable the side bar search feature to allow interactive searching of folder names."
-msgstr "åçåéåæååèåèäååæåèæååçã"
-
 #: ../mail/evolution-mail.schemas.in.h:68
-msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
-msgstr "åçæééååéäéèãéäæååèæåääçççéæåçéã"
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr "åçåéåæååèåèäååæåèæååçã"
 
 #: ../mail/evolution-mail.schemas.in.h:69
-msgid "Enable to display only message texts not exceeding size defined in 'message_text_part_limit' key."
-msgstr "åçååæéçäèéãmessage_text_part_limitãèåéäæåççååçéäæåã"
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr "åçæééååéäéèãéäæååèæåääçççéæåçéã"
 
 #: ../mail/evolution-mail.schemas.in.h:70
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"åçååæéçäèéãmessage_text_part_limitãèåéäæåççååçéäæ"
+"åã"
+
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "åçäåææèæåäçéäçéäæåæèèåå"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "åçæééæèææçèæåäçéäçéäæåæèèååã"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "åç/åçæåèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:73
-#: ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "åææåçççç Outlook/GMail åå"
 
-#: ../mail/evolution-mail.schemas.in.h:74
-msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
-msgstr "åéäæéäçææåçççç Outlook æ GMail çååïåèååèæçéçç Evolution ååç UTF-8 ååææåçïåçååäæéå RFC 2231 èçïèçääæçç RFC 2047 ææã"
-
 #: ../mail/evolution-mail.schemas.in.h:75
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+"åéäæéäçææåçççç Outlook æ GMail çååïåèååèæçéçç "
+"Evolution ååç UTF-8 ååææåçïåçååäæéå RFC 2231 èçïèçää"
+"æçç RFC 2047 ææã"
+
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr "éæåæçåäå"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Forward message."
 msgstr "èåéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr "ççåèåäåéäèå"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "éäæåçæéå"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "éäæåçæçéåã"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "éèåèæåéèäçééåå"
 
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
-msgstr "åæäçèåèäæéå 10 ææåçéäïèåäçèæåçåèééåã"
-
 #: ../mail/evolution-mail.schemas.in.h:82
-msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
-msgstr "åæææååæèååçæ Evolution èéçæç MIME éåïääéçåææåç  MIME éåäåæè GNOME ç MIME éåèæåä Bonobo åäæèåïæçæéçååã"
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr "åæäçèåèäæéå 10 ææåçéäïèåäçèæåçåèééåã"
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Ignore list Reply-To:"
-msgstr "åçéäèå Reply-To:"
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+"åæææååæèååçæ Evolution èéçæç MIME éåïääéçåææåç  "
+"MIME éåäåæè GNOME ç MIME éåèæåä Bonobo åäæèåïæçæéçå"
+"åã"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Initial height of the \"Filter Editor\" window. The value updates as the user resizes the window vertically."
-msgstr "ãéææäçèåãèççååéåãéåæåæåèçåçæèååæææã"
+msgid "Ignore list Reply-To:"
+msgstr "åçéäèå Reply-To:"
 
 #: ../mail/evolution-mail.schemas.in.h:85
-msgid "Initial height of the \"Folder Subscriptions\" window. The value updates as the user resizes the window vertically."
-msgstr "ãèæåèéãèççååéåãéåæåæåèçåçæèååæææã"
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr "ãéææäçèåãèççååéåãéåæåæåèçåçæèååæææã"
 
 #: ../mail/evolution-mail.schemas.in.h:86
-msgid "Initial height of the \"Search Folder Editor\" window. The value updates as the user resizes the window vertically."
-msgstr "ãæåèæåçèåãèççååéåãéåæåæåèçåçæèååæææã"
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr "ãèæåèéãèççååéåãéåæåæåèçåçæèååæææã"
 
 #: ../mail/evolution-mail.schemas.in.h:87
-msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
-msgstr "ãåéèææéäãèççååéåãéåæåæåèçåçæèååæææã"
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"ãæåèæåçèåãèççååéåãéåæåæåèçåçæèååæææã"
 
 #: ../mail/evolution-mail.schemas.in.h:88
-msgid "Initial maximize state of the \"Filter Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Filter Editor\" window cannot be maximized. This key exists only as an implementation detail."
-msgstr "ãéææäçèåãèççååæååçæãéåæåæåäçèæååæåææååèçæææãææïéåçåçæåäèå Evolution ääçïåçãéææäçèåãèçäèæååãéåéååçäåäéèèååã"
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr "ãåéèææéäãèççååéåãéåæåæåèçåçæèååæææã"
 
 #: ../mail/evolution-mail.schemas.in.h:89
-msgid "Initial maximize state of the \"Folder Subscriptions\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Folder Subscriptions\" window cannot be maximized. This key exists only as an implementation detail."
-msgstr "ãèæåèéãèççååæååçæãéåæåæåäçèæååæåææååèçæææãææïéåçåçæåäèå Evolution ääçïåçãèæåèéãèçäèæååãéåéååçäåäéèèååã"
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"ãéææäçèåãèççååæååçæãéåæåæåäçèæååæåææåå"
+"èçæææãææïéåçåçæåäèå Evolution ääçïåçãéææäçè"
+"åãèçäèæååãéåéååçäåäéèèååã"
 
 #: ../mail/evolution-mail.schemas.in.h:90
-msgid "Initial maximize state of the \"Search Folder Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Search Folder Editor\" window cannot be maximized. This key exists only as an implementation detail."
-msgstr "ãæåèæåçèåãèççååæååçæãéåæåæåäçèæååæåææååèçæææãææïéåçåçæåäèå Evolution ääçïåçãæåèæåçèåãèçäèæååãéåéååçäåäéèèååã"
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"ãèæåèéãèççååæååçæãéåæåæåäçèæååæåææååèç"
+"æææãææïéåçåçæåäèå Evolution ääçïåçãèæåèéãèçä"
+"èæååãéåéååçäåäéèèååã"
 
 #: ../mail/evolution-mail.schemas.in.h:91
-msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
-msgstr "ãåéèææéäãèççååæååçæãéåæåæåäçèæååæåææååèçæææãææïéåçåçæåäèå Evolution ääçïåçãåéèææéäãèçäèæååãéåéååçäåäéèèååã"
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"ãæåèæåçèåãèççååæååçæãéåæåæåäçèæååæåææå"
+"åèçæææãææïéåçåçæåäèå Evolution ääçïåçãæåèæåç"
+"èåãèçäèæååãéåéååçäåäéèèååã"
 
 #: ../mail/evolution-mail.schemas.in.h:92
-msgid "Initial width of the \"Filter Editor\" window. The value updates as the user resizes the window horizontally."
-msgstr "ãéææäçèåãèççååååãéåæåæåèçæåæèååæææã"
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+"ãåéèææéäãèççååæååçæãéåæåæåäçèæååæåææåå"
+"èçæææãææïéåçåçæåäèå Evolution ääçïåçãåéèææé"
+"äãèçäèæååãéåéååçäåäéèèååã"
 
 #: ../mail/evolution-mail.schemas.in.h:93
-msgid "Initial width of the \"Folder Subscriptions\" window. The value updates as the user resizes the window horizontally."
-msgstr "ãèæåèéãèççååååãéåæåæåèçæåæèååæææã"
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr "ãéææäçèåãèççååååãéåæåæåèçæåæèååæææã"
 
 #: ../mail/evolution-mail.schemas.in.h:94
-msgid "Initial width of the \"Search Folder Editor\" window. The value updates as the user resizes the window horizontally."
-msgstr "ãæåèæåçèåãèççååååãéåæåæåèçæåæèååæææã"
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr "ãèæåèéãèççååååãéåæåæåèçæåæèååæææã"
 
 #: ../mail/evolution-mail.schemas.in.h:95
-msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
-msgstr "ãåéèææéäãèççååååãéåæåæåèçæåæèååæææã"
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"ãæåèæåçèåãèççååååãéåæåæåèçæåæèååæææã"
 
 #: ../mail/evolution-mail.schemas.in.h:96
-msgid "Instead of the normal \"Reply to All\" behaviour, this option will make the 'Group Reply' toolbar button try to reply only to the mailing list through which you happened to receive the copy of the message to which you're replying."
-msgstr "æåæäèçãåèåéãèçïéåééæèãççåèãåååæéåèååäåéäèåïäåæææåèåèçéåäçäæã"
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr "ãåéèææéäãèççååååãéåæåæåèçæåæèååæææã"
 
 #: ../mail/evolution-mail.schemas.in.h:97
-msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
-msgstr "ååç/åçååæåèæåäåééäææåéèæçäèåéåææäåééäïèéåæåéäèæåçæäçéã"
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+"æåæäèçãåèåéãèçïéåééæèãççåèãåååæéåèååäå"
+"éäèåïäåæææåèåèçéåäçäæã"
 
 #: ../mail/evolution-mail.schemas.in.h:98
-msgid "It disables/enables the repeated prompts to warn that you are sending a private reply to a message which arrived via a mailing list."
-msgstr "åæåç/åçéèæçèåææèèåèçäääçéééäèåååçäã"
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+"ååç/åçååæåèæåäåééäææåéèæçäèåéåææäåééäïè"
+"éåæåéäèæåçæäçéã"
 
 #: ../mail/evolution-mail.schemas.in.h:99
-msgid "It disables/enables the repeated prompts to warn that you are sending a reply to many people."
-msgstr "åæåç/åçèåæãææåèçååäãçéèæçã"
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr "åæåç/åçéèæçèåææèèåèçäääçéééäèåååçäã"
 
 #: ../mail/evolution-mail.schemas.in.h:100
-msgid "It disables/enables the repeated prompts to warn that you are trying sending a private reply to a message which arrived via a mailing list, but the list sets a Reply-To: header which redirects your reply back to the list"
-msgstr "åæåç/åçéèæçèåææèèåèçäääçéééäèåååçäãèéäèåèåç Reply-To: æéæåæçåäéæååèéäèåäçæææå"
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr "åæåç/åçèåæãææåèçååäãçéèæçã"
 
 #: ../mail/evolution-mail.schemas.in.h:101
-msgid "It disables/enables the repeated prompts to warn that you are trying to send a message to recipients not entered as mail addresses"
-msgstr "åæåç/åçéèæçèåææèèåééäçææèåéääåçæäè"
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+"åæåç/åçéèæçèåææèèåèçäääçéééäèåååçäãèéäè"
+"åèåç Reply-To: æéæåæçåäéæååèéäèåäçæææå"
 
 #: ../mail/evolution-mail.schemas.in.h:102
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr "åæåç/åçéèæçèåææèèåééäçææèåéääåçæäè"
+
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Junk was run"
 msgstr "äææçååéäçæé"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Last time Empty Trash was run"
 msgstr "äææçåæççæé"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Layout style"
 msgstr "éçæå"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "Level beyond which the message should be logged."
 msgstr "æèéçéäççã"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "æçåçéèåçæå"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME éåæåïææ Bonobo åäæèå"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "ææçæææå"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "åèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:110
-msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr "Evolution çéäåäåççåèæåãæåååè /apps/evolution/mail/accounts çéçåäåååçéã"
-
 #: ../mail/evolution-mail.schemas.in.h:111
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"Evolution çéäåäåççåèæåãæåååè /apps/evolution/mail/accounts "
+"çéçåäåååçéã"
+
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr "èèæéäåååæååççæå"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
 msgstr "çææåææçååèèçæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
-msgstr "Evolution çéäåäåççæçæåãæååååäïåäåå name:colorïcolor äç HTML ååéäççã"
-
 #: ../mail/evolution-mail.schemas.in.h:114
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+"Evolution çéäåäåççæçæåãæååååäïåäåå name:colorïcolor "
+"äç HTML ååéäççã"
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "åçæååææçååæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
 msgstr "éé HTTP èå HTML éäçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
-msgstr "éé HTTP(S) èå HTML éäçåçãåèçåçïã0ãâ äåçèèååçãã1ãâ åææåéçäèçåäèæïèååçãã2ã- äååçèèååçã"
-
 #: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
+msgstr ""
+"éé HTTP(S) èå HTML éäçåçãåèçåçïã0ãâ äåçèèååçã"
+"ã1ãâ åææåéçäèçåäèæïèååçãã2ã- äååçèèååçã"
+
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "èééæååä"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "åéæååäèéåæåçèéææã"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
 msgstr "çæèééæååäçèéææ"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
 msgstr "çæèééæååäçèéææã"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser height"
 msgstr "éäçèåéå"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr "éäçèåæåå"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mail browser width"
 msgstr "éäçèååå"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "åæåçæééåïæçæåéè"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "åæåçæééåïæçæåéèã"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "åéäãéèãäæçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "åéäãéèãäæçåçã"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr "éçéäæåéå"
 
-# (pofilter) gconf: do not translate gconf attribute: "normal", "source"
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "èæéçæå (ãnormalã[äè]ããfull headersã[åææé]ããsourceã[äæ])"
+msgstr ""
+"èæéçæå (ãnormalã[äè]ããfull headersã[åææé]ããsourceã[äæ])"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
 msgstr "çæææçååéäæåééåæ"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum days between emptying the trash on exit"
 msgstr "çæææçåæçæåééåæ"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "çæææçååéäæåééåæã"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "çæææçåæçæåééåæã"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "éçæ TO/CC/BCC ääåçéå"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Original message."
 msgstr "ååéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
 msgstr "åçéçäæåååçèå"
 
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Possible values are: never - to never close browser window always - to always close browser window ask - (or any other value) will ask user"
-msgstr "åèçæåæïnever - æäééçèåèç always - çæééçèåèç ask - (æääåäæå) æèåäçè"
-
 #: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
+msgstr ""
+"åèçæåæïnever - æäééçèåèç always - çæééçèåèç ask - "
+"(æääåäæå) æèåäçè"
+
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "åäçææèåææéääåçæäèååæç"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "ææäæææç"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "çäçèåèæçèæåæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "çäçèåéææäæçéäæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "çåéæåèæåäçéäæéçæç"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "çéäèååæçäåèææç"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying privately to list messages"
 msgstr "ççäåèéäèåéäææç"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when replying to many recipients"
 msgstr "çåèçèåæäèææç"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "äçèæçææç"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr "çäçèååååäåæææç"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "çäçèåèäæéå 10 åææåéäææçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 msgstr "çäçèåèåé HTML éäåäææå HTML éäçæäèæïéçæçã"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "çäçèåéäåæäèæåææäèçéäæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "çäçèåèåéäæèç HTML ææç"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "çæèååéäææç"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr "ååäåçåæçæåäéç"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Put the cursor at the bottom of replies"
 msgstr "åèæåææçæåé"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "èèæåäçèæçèäåäæåçã"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "èèæåäçéçäåäåäã"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "ååéçéäåèååéäææã"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "ååçé"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
 msgstr "åæåçéèéæååäèçç"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "éèåé HTML éä"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "éèåé HTML éäã"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
 msgstr "åéäæåçåäèéåéäæä"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "äæååæéé"
 
-#: ../mail/evolution-mail.schemas.in.h:164
-msgid "Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail."
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
 msgstr "èç TRUE èçåææåéäæäæåçåæåååçåæåéçã"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "åééäèææéçãåäåæãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "åééäèææéçãåæãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "åèåæèççæéçãåäèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "åèåæèççæéçãåèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "åééäèææéçãåèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "éçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
 msgstr "éçææéäæé"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
 msgstr "æèéäæéçæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "ææåçåçã"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "åéäæåäéçåéçéä (åäåéè)"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr "åéäæåäéçåéçéä"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
 msgstr "éçåçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr "éçååçãææãæéæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "éçåäèççç"
 
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
-msgstr "åééäèææéçãåäåæãæäãéæåéåéäåèæçæèéåææåã"
-
 #: ../mail/evolution-mail.schemas.in.h:180
-msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
-msgstr "åééäèææéçãåæãæäãéæåéåéäåèæçæèéåææåã"
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"åééäèææéçãåäåæãæäãéæåéåéäåèæçæèéåææåã"
 
 #: ../mail/evolution-mail.schemas.in.h:181
-msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
-msgstr "åèåæèççæéçãåäèãæäãéæåéåéäåèæçæèéåææåã"
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr "åééäèææéçãåæãæäãéæåéåéäåèæçæèéåææåã"
 
 #: ../mail/evolution-mail.schemas.in.h:182
-msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
-msgstr "åèåæèççæéçãåèãæäãéæåéåéäåèæçæèéåææåã"
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"åèåæèççæéçãåäèãæäãéæåéåéäåèæçæèéåææåã"
 
 #: ../mail/evolution-mail.schemas.in.h:183
-msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
-msgstr "åééäèææéçãåèãæäãéæåéåéäåèæçæèéåææåã"
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"åèåæèççæéçãåèãæäãéæåéåéäåèæçæèéåææåã"
 
 #: ../mail/evolution-mail.schemas.in.h:184
-msgid "Show the email-address of the sender in a separate column in the message list."
-msgstr "åéäæåçääåéçæäéçåäèçéåéäã"
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr "åééäèææéçãåèãæäãéæåéåéäåèæçæèéåææåã"
 
 #: ../mail/evolution-mail.schemas.in.h:185
-msgid "Show the original \"Date\" header (with a local time only if the time zone differs). Otherwise always show \"Date\" header value in a user preferred format and local time zone."
-msgstr "éçååçãææãæéïèæåäåææäççåæéïãååæéääçèååçæååæåæåéçãææãæéã"
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr "åéäæåçääåéçæäéçåäèçéåéäã"
 
 #: ../mail/evolution-mail.schemas.in.h:186
-msgid "Show the photo of the sender in the message reading pane."
-msgstr "åéäéèçæäéçåäèçççã"
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+"éçååçãææãæéïèæåäåææäççåæéïãååæéääçèååç"
+"æååæåæåéçãææãæéã"
 
 #: ../mail/evolution-mail.schemas.in.h:187
-msgid "Some mailing lists set a Reply-To: header to trick users into sending replies to the list, even when they ask Evolution to make a private reply. Setting this option to TRUE will attempt to ignore such Reply-To: headers, so that Evolution will do as you ask it. If you use the private reply action, it will reply privately, while if you use the 'Reply to List' action it will do that. It works by comparing the Reply-To: header with a List-Post: header, if there is one."
-msgstr "æäéäèåæèå Reply-To: æéäèåäçèåéåèçääåèåäïåääçèåèæ Evolution éèçäåèääæãåéåééèç TRUE æåèåç Reply-To: æéïåæ Evolution åèäææèæçèåãåææäççäåèåäïååæéèåäçåäçåäïèåææäçãåèåèåãåäïåäæçåãåçéäæåææå Reply-To: æéå List-Post: æéïåææçèã"
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "åéäéèçæäéçåäèçççã"
 
 #: ../mail/evolution-mail.schemas.in.h:188
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+"æäéäèåæèå Reply-To: æéäèåäçèåéåèçääåèåäïåääç"
+"èåèæ Evolution éèçäåèääæãåéåééèç TRUE æåèåç Reply-"
+"To: æéïåæ Evolution åèäææèæçèåãåææäççäåèåäïååæ"
+"éèåäçåäçåäïèåææäçãåèåèåãåäïåäæçåãåçéäæ"
+"åææå Reply-To: æéå List-Post: æéïåææçèã"
+
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "èåæåææ"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "æåææéè"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "æåææèè"
 
-#: ../mail/evolution-mail.schemas.in.h:191
-msgid "Terminal font"
-msgstr "ççæåå"
-
 #: ../mail/evolution-mail.schemas.in.h:192
-msgid "The default plugin for Junk hook"
-msgstr "ååééçéèåæçå"
+msgid "State of message headers in paned view"
+msgstr "çææèäéäæéççæ"
 
 #: ../mail/evolution-mail.schemas.in.h:193
-msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-msgstr "äæåèæçååéäçæéïå 1970 åäæäæ(éèçå)åçèçææã"
+msgid "Terminal font"
+msgstr "ççæåå"
 
 #: ../mail/evolution-mail.schemas.in.h:194
-msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr "äæåèæååæççæéïå 1970 åäæäæ(éèçå)åçèçææã"
+msgid "The default plugin for Junk hook"
+msgstr "ååééçéèåæçå"
 
 #: ../mail/evolution-mail.schemas.in.h:195
-msgid "The layout style determines where to place the preview pane in relation to the message list. \"0\" (Classic View) places the preview pane below the message list. \"1\" (Vertical View) places the preview pane next to the message list."
-msgstr "éçæåæåäåéäæåäéèçæçäçãã0ãïæææèïåéèçææåéäæåäæãã1ãïåçæèïåéèçææåéäæåæéã"
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "äæåèæçååéäçæéïå 1970 åäæäæ(éèçå)åçèçææã"
 
 #: ../mail/evolution-mail.schemas.in.h:196
-msgid "The terminal font for mail display."
-msgstr "çæéçéäçççæååã"
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "äæåèæååæççæéïå 1970 åäæäæ(éèçå)åçèçææã"
 
 #: ../mail/evolution-mail.schemas.in.h:197
-msgid "The text that is inserted when forwarding a message, saying that the forwarded message follows."
-msgstr "åèåéäæèæåçæåïèææääæèåçéäã"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+"éçæåæåäåéäæåäéèçæçäçãã0ãïæææèïåéèçææåéä"
+"æåäæãã1ãïåçæèïåéèçææåéäæåæéã"
 
 #: ../mail/evolution-mail.schemas.in.h:198
-msgid "The text that is inserted when replying to a message (top posting), saying that the original message follows."
-msgstr "ååèéäæèæåçæåïçéåèïïèææääæååéäã"
+msgid "The terminal font for mail display."
+msgstr "çæéçéäçççæååã"
 
 #: ../mail/evolution-mail.schemas.in.h:199
-msgid "The text that is inserted when replying to a message, attributing the message to the original author."
-msgstr "ååèéäæèæåçæåïèæéäçåäèã"
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr "åèåéäæèæåçæåïèææääæèåçéäã"
 
 #: ../mail/evolution-mail.schemas.in.h:200
-msgid "The variable width font for mail display."
-msgstr "çæéçéäçèåååååã"
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr "ååèéäæèæåçæåïçéåèïïèææääæååéäã"
 
 #: ../mail/evolution-mail.schemas.in.h:201
-msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
-msgstr "éèåäçäçæåãã0ãçéèïã1ãçèåïã2ãçééèæã"
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr "ååèéäæèæåçæåïèæéäçåäèã"
 
 #: ../mail/evolution-mail.schemas.in.h:202
-msgid "This decides the max size of the message text that will be displayed under Evolution, specified in terms of KB. The default is 4096 (4MB). This value is used only when 'force_message_limit' key is activated."
-msgstr "éèæåäéäåæå Evolution äåéççæååéïä KB çåäæåãéèåç 4096 (4MB)ãéåæååæåäçãforce_message_limitãèåéæææã"
+msgid "The variable width font for mail display."
+msgstr "çæéçéäçèåååååã"
 
 #: ../mail/evolution-mail.schemas.in.h:203
-msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
-msgstr "éæéèçååéäåæçåïåäååçäåäçåæçåãåæåçéèååçéèåæçåïääæåéåäåççåæçåã"
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr "éèåäçäçæåãã0ãçéèïã1ãçèåïã2ãçééèæã"
 
 #: ../mail/evolution-mail.schemas.in.h:204
-msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
-msgstr "éåéååèèåäæïäæåèååèçãfalseããéææåæåæåäåèéäçéåäçéåèèæåçéèã"
+msgid ""
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
+msgstr ""
+"éèæåäéäåæå Evolution äåéççæååéïä KB çåäæåãéèå"
+"ç 4096 (4MB)ãéåæååæåäçãforce_message_limitãèåéæææã"
 
 #: ../mail/evolution-mail.schemas.in.h:205
-msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
-msgstr "æééæèåå XML æåïåææåèèæéïäåæåéçååãXML çæçæåæ &lt;header enabled&gt; - åææéæéçåéäæèïåèåæ enabledã"
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr ""
+"éæéèçååéäåæçåïåäååçäåäçåæçåãåæåçéèååçé"
+"èåæçåïääæåéåäåççåæçåã"
 
 #: ../mail/evolution-mail.schemas.in.h:206
-msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
-msgstr "éåééçéæéåãlookup_addressbookãïæçäæåæåååæåçéèéäæèéåéääåäçæååéäéææãæéåçéçäååçéäãåèã"
+msgid ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
+msgstr ""
+"éåéååèèåäæïäæåèååèçãfalseããéææåæåæåäåèéäç"
+"éåäçéåèèæåçéèã"
 
 #: ../mail/evolution-mail.schemas.in.h:207
-msgid "This option would help in improving the speed of fetching."
-msgstr "éåééèåååéææçéåã"
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"æééæèåå XML æåïåææåèèæéïäåæåéçååãXML çæçæå"
+"æ &lt;header enabled&gt; - åææéæéçåéäæèïåèåæ enabledã"
 
 #: ../mail/evolution-mail.schemas.in.h:208
-msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
-msgstr "éæèååéèéäæåæèäéçäåçéåïèéçéåæéçãâãã"
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"éåééçéæéåãlookup_addressbookãïæçäæåæåååæåçéèéäæ"
+"èéåéääåäçæååéäéææãæéåçéçäååçéäãåèã"
 
 #: ../mail/evolution-mail.schemas.in.h:209
-msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Requires a restart to apply."
-msgstr "éåèååæåçééäéèçåéæææççæãéèéæååæèåçã"
+msgid "This option would help in improving the speed of fetching."
+msgstr "éåééèåååéææçéåã"
 
 #: ../mail/evolution-mail.schemas.in.h:210
-msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
-msgstr "éåèååæåçééäèäæåéäççææçéäæåïèéäçéäçææãEvolution åéèéæååã"
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr "éæèååéèéäæåæèäéçäåçéåïèéçéåæéçãâãã"
 
 #: ../mail/evolution-mail.schemas.in.h:211
-msgid "This value can be an empty string, which means it'll use the system Picture folder, usually set to ~/Pictures. This folder will be also used when the set path is not pointing to the existent folder."
-msgstr "éåæååäæçåäïäèèäçççåçèæåïéåèåå ~/Picturesãéåèæåäæåèåæåäååçèæåæäçã"
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Requires a restart to apply."
+msgstr "éåèååæåçééäéèçåéæææççæãéèéæååæèåçã"
 
 #: ../mail/evolution-mail.schemas.in.h:212
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
+msgstr ""
+"éåèååæåçééäèäæåéäççææçéäæåïèéäçéäçææã"
+"Evolution åéèéæååã"
+
+#: ../mail/evolution-mail.schemas.in.h:213
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
+msgstr ""
+"éåæååäæçåäïäèèäçççåçèæåïéåèåå ~/Picturesãéåè"
+"æåäæåèåæåäååçèæåæäçã"
+
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "ääæçåçäæéäæå"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "åéäæçæåéèçæé"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "åéäæçæåéèçæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
 msgstr "éèåèç UID åäã"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "äçèåæåæææåæéåçåçéèã"
 
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "Use SpamAssassin daemon and client"
-msgstr "äç SpamAsssassin äæçåååæç"
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "äç SpamAsssassin äæçåååæç (spamc/spamd)ã"
-
 #: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "äçèèåå"
@@ -10735,58 +10903,74 @@ msgid "Use custom fonts for displaying mail."
 msgstr "äçèèååäéçéäã"
 
 #: ../mail/evolution-mail.schemas.in.h:221
-msgid "Use only local spam tests."
-msgstr "åäçæåååéäæèã"
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
+"äçèååèéäæåæææååäèãéææåæææçåéäçéçæåéã"
 
 #: ../mail/evolution-mail.schemas.in.h:222
-msgid "Use only the local spam tests (no DNS)."
-msgstr "åäçæåååéäæè (ææ DNS)ã"
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+"äçèååèéäæåæäåçåææåäèãéææåçåææçåéäçéçæå"
+"éã"
 
 #: ../mail/evolution-mail.schemas.in.h:223
-msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
-msgstr "äçèååèéäæåæææååäèãéææåæææçåéäçéçæåéã"
-
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
-msgstr "äçèååèéäæåæäåçåææåäèãéææåçåææçåéäçéçæåéã"
-
-#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Variable width font"
 msgstr "èååååå"
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æåéèåæåéäååèäåæçèæ"
 
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "Whether check for new messages in all active accounts regardless of the account \"Check for new messages every X minutes\" option when Evolution is started. This option is used only together with 'send_recv_on_start' option."
-msgstr "ç Evolution ååææåææææäçäåèçæéäèäçãæææéäææ X åéãééãéåééåèåãsend_recv_on_startãééäèäçã"
+#: ../mail/evolution-mail.schemas.in.h:225
+msgid ""
+"Whether check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+"ç Evolution ååææåææææäçäåèçæéäèäçãæææéäææ X å"
+"éãééãéåééåèåãsend_recv_on_startãééäèäçã"
 
-#: ../mail/evolution-mail.schemas.in.h:228
-msgid "Whether check for new messages when Evolution is started. This includes also sending messages from Outbox."
+#: ../mail/evolution-mail.schemas.in.h:226
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
 msgstr "ç Evolution ååææåæææéäãéäåååååäåäçéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æååçåéåçèæååçççã"
 
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
-msgstr "çéääåå In-Reply-To æ References æéæïæåæçäææåéäççã"
+#: ../mail/evolution-mail.schemas.in.h:228
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"çéääåå In-Reply-To æ References æéæïæåæçäææåéäççã"
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æåäéäççäææçéääæåçééä"
 
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid "Whether to flush Outbox after filtering is done. Outbox flush will happen only when there was used any 'Forward to' filter action and approximately one minute after the last action invocation."
-msgstr "æååéæååæçåäåãåäåçæçåçåçäçäääãèåèãéæååäïääåéååäååçäåééåéèã"
+#: ../mail/evolution-mail.schemas.in.h:230
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+"æååéæååæçåäåãåäåçæçåçåçäçäääãèåèãéæåå"
+"äïääåéååäååçäåééåéèã"
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "éäæåçæåå"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "éäæåçæçååã"
 
@@ -10794,90 +10978,88 @@ msgstr "éäæåçæçååã"
 msgid "Importing Elm data"
 msgstr "èå Elm èæ"
 
-#: ../mail/importers/elm-importer.c:339
-#: ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1044
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:446
+#: ../modules/mail/e-mail-shell-view.c:1036
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "éä"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm èåå"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:383
 msgid "Import mail from Elm."
 msgstr "å Elm ååéäã"
 
-#: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:242
+#: ../mail/importers/evolution-mbox-importer.c:135
+#: ../plugins/dbx-import/dbx-importer.c:249
 msgid "_Destination folder:"
 msgstr "çççèæå(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:259
 #: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder"
 msgstr "éæèæå"
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/dbx-import/dbx-importer.c:253
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../mail/importers/evolution-mbox-importer.c:143
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:319
 msgid "Select folder to import into"
 msgstr "éåèæåäèå"
 
-#: ../mail/importers/evolution-mbox-importer.c:403
+#: ../mail/importers/evolution-mbox-importer.c:417
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "äæ"
 
-#: ../mail/importers/evolution-mbox-importer.c:408
+#: ../mail/importers/evolution-mbox-importer.c:422
 msgctxt "mboxImp"
 msgid "From"
 msgstr "åäè"
 
-#: ../mail/importers/evolution-mbox-importer.c:452
-#: ../shell/e-shell-utils.c:253
+#: ../mail/importers/evolution-mbox-importer.c:466
+#: ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley éääç (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:453
+#: ../mail/importers/evolution-mbox-importer.c:467
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "åå Berkeley éääçæåèæå"
 
-#: ../mail/importers/mail-importer.c:65
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "æåååäç"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:593
-#: ../plugins/pst-import/pst-importer.c:480
-#: ../plugins/pst-import/pst-importer.c:589
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:603
+#: ../plugins/pst-import/pst-importer.c:500
+#: ../plugins/pst-import/pst-importer.c:609
 #, c-format
 msgid "Importing '%s'"
 msgstr "æåååã%sã"
 
-#: ../mail/importers/mail-importer.c:308
+#: ../mail/importers/mail-importer.c:315
 #, c-format
 msgid "Scanning %s"
 msgstr "ææ %s"
 
-#: ../mail/importers/pine-importer.c:223
+#: ../mail/importers/pine-importer.c:250
 msgid "Importing Pine data"
 msgstr "èåçéèæ"
 
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../mail/importers/pine-importer.c:451
+#: ../modules/addressbook/addressbook-config.c:1053
 msgid "Address Book"
 msgstr "éèé"
 
-#: ../mail/importers/pine-importer.c:462
+#: ../mail/importers/pine-importer.c:493
 msgid "Evolution Pine importer"
 msgstr "Evolution çéèåå"
 
-#: ../mail/importers/pine-importer.c:463
+#: ../mail/importers/pine-importer.c:494
 msgid "Import mail from Pine."
 msgstr "å Pine ååéäã"
 
@@ -10886,8 +11068,7 @@ msgstr "å Pine ååéäã"
 msgid "Mail to %s"
 msgstr "éäéå %s"
 
-#: ../mail/mail-autofilter.c:238
-#: ../mail/mail-autofilter.c:280
+#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "éääè %s "
@@ -10897,12 +11078,12 @@ msgstr "éääè %s "
 msgid "Subject is %s"
 msgstr "äææ %s"
 
-#: ../mail/mail-autofilter.c:303
+#: ../mail/mail-autofilter.c:305
 #, c-format
 msgid "%s mailing list"
 msgstr "%s éäåè"
 
-#: ../mail/mail-autofilter.c:394
+#: ../mail/mail-autofilter.c:414
 msgid "Add Filter Rule"
 msgstr "æåéæåèå"
 
@@ -10911,7 +11092,7 @@ msgstr "æåéæåèå"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:492
+#: ../mail/mail-autofilter.c:517
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -10923,10 +11104,6 @@ msgid_plural ""
 msgstr[0] ""
 "éæåèåã%sãåçäæïåçååçååååéçèæå\n"
 "ã%sãã"
-msgstr[1] ""
-"äåéæåèå\n"
-"%s åçææïåçåååçååååéçèæå\n"
-"ã%sãã"
 
 #: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
@@ -10936,448 +11113,467 @@ msgstr "ååæççåæ(_W)â"
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "äçæåèæäåååéçéäçå(_W)"
 
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr "æææéäçæéçåæåéçäçéæèåéæçååéä"
+
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "åèçéäèååçäåèååèå(_M)"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "çåéååéäæäååæè(_F)"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "äååéåæ (cc) ç(_S):"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "äååéåäåæ (bcc) ç(_B):"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ååææéääæçéååèçéé(_T)"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "çåéååéäææéèæåå(_M)"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "æéèæèäåæ(_D)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr "åææèæååççåçæèèåå(_V)"
 
-#: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1060
 msgid "Authentication"
 msgstr "éè"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "èåæåèæçè(_E)"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "ååé(_H):"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "ææææçéå(_E) "
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "äèèæéææååéä(_S)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new _messages on start"
 msgstr "ååææææéä(_M)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check for new messa_ges in all active accounts"
 msgstr "ææææäçäåèçæéä(_G)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "ææåééäæåçååéä(_M)"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "çæèåææææå(_T)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "æé(_A)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "æé(_R)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "æéåçéè(_M):"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "æåçèéä"
 
-#: ../mail/mail-config.ui.h:27
-#: ../modules/plugin-manager/evolution-plugin-manager.c:157
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
 msgid "Configuration"
 msgstr "çæ"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "åéèæåæçè(_W)"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Confirmations"
 msgstr "çè"
 
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:155
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:159
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Date/Time Format"
 msgstr "ææ/æåæå"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Default Behavior"
 msgstr "éèèç"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "éèååçç(_N):"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "åééä"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "ééæåéååéä(_X)"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "çåéçéäåäæäçç [éèå](_U)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "éççéäæé"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "èåäèåæçéèéäåäèåéäæèçååéä(_K)"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "ääçåæ"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "èçå(_F):"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "éåéääå(_A):"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "ééææçåæçèæå(_X)"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "ååæè(_P):"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "åååéçéä (éèå)(_E)"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "F_all back to threading messages by subject"
 msgstr "éååääæççééä(_A)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed Width Font:"
 msgstr "åååååå(_E):"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "åéäæååç _HTML"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "åå(_E):"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "åæåèïççåèåçæéäèå"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML éä"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP äçäæå:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
+msgid "Header content"
+msgstr "æéåå"
+
+#: ../mail/mail-config.ui.h:57
+msgid "Header name"
+msgstr "æéåç"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "æé"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "åèåæç(_Q)"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "åçéäèåç Reply-To:"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "èå"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "èåïOutlook éæï"
 
-#: ../mail/mail-config.ui.h:61
-#: ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æç"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "èèè"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "æåèååç"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "éäæéè"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "äçäç"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "éäéç"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "éäåæ"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "ææäçäæåç(_P):"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "åææåçåçèèååéäæééåééåæèåçã"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "éææçèè"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "åé(_G):"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG éé ID:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "åç(_W):"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:79
 #: ../modules/calendar/e-calendar-preferences.ui.h:23
 msgid "Pick a color"
 msgstr "æééè"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "éæå:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "ååéçæ (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "Proxy Settings"
 msgstr "äçäæåèåå"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Quoted"
 msgstr "åæ"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "èäåç(_M)"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "åèåå(_P):"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "èäåç(_P)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
 msgid "Replies and Forwards"
 msgstr "åèåèå"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Required Information"
 msgstr "åèçèè"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "æ Evolution çæäææ SSL"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "åæåæåçéèéäçåäèçç(_E)"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "éå(_E)â"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "åééäåæ(_E):"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "ææåå(_T):"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "ååå MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "éæ HTML åååååå"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "éæ HTML åèåååå"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "åäèçç"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:106
 msgid "Sending a _private reply to a mailing list message"
 msgstr "åéçäåèåéäèå(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:108
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "åéçææèåææéääåçæäè(_R)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:110
 msgid "Sending a message with an _empty subject line"
 msgstr "åéææäæçéä(_E)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:112
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "åéåææååäåææäèçéä(_B)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr "åéæåéæäèçéä(_N)"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "åééäèæå(_M):"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "äæåèæéè(_V)"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
 msgstr "äæåçæ"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
 msgstr "äæåéå(_T):"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:119
+msgid "Set custom junk header"
+msgstr "èåèèååéäæé"
+
+#: ../mail/mail-config.ui.h:120
 msgid "Si_gning algorithm:"
 msgstr "ççæçæ(_G):"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "çåæ(_N)"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "çåæè(_N):"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "çåæ(_U):"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "çåæ"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:125
 msgid "Signing _algorithm:"
 msgstr "ççæçæ(_A):"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:126
 msgid "Special Folders"
 msgstr "çæèæå"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "æåææ"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "åèæååééåèå(_T)"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:129
 msgid "Start up"
 msgstr "åå"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "éå(_Y):"
 
-#: ../mail/mail-config.ui.h:128
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+#: ../mail/mail-config.ui.h:132
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr "éèçèèæåååæååçåèååçèèã"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11387,11 +11583,15 @@ msgstr ""
 "çåæãææåçåçåæäç\n"
 "éçäçã"
 
-#: ../mail/mail-config.ui.h:132
-msgid "To help avoid email accidents and embarrassments, ask for confirmation before taking the following checkmarked actions:"
-msgstr "èéåéåéäåçæåæääéåçææïåéèäååæååäæèåäçèäååçèï"
+#: ../mail/mail-config.ui.h:136
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr ""
+"èéåéåéäåçæåæääéåçææïåéèäååæååäæèåäçèäå"
+"åçèï"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11399,144 +11599,141 @@ msgstr ""
 "èåæçääèéååèçåçã\n"
 "äåïãåäãæãåäã"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "äçèåç(_E):"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "äçéè(_N)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:141
 msgid "User _Name:"
 msgstr "äçèåç(_N):"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "ååçåæ(_A)"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "äåèçèäèåç(_A)"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "éèéå(_A)"
 
-#: ../mail/mail-config.ui.h:141
-msgid "_Default junk plugin:"
-msgstr "éèååéäåæçå(_D):"
-
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:145
 msgid "_Direct connection to the Internet"
 msgstr "çæéçåçéçè(_D)"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "äççæèéè (çåæ _Outlook)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "èåæå(_F):"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
 msgstr "ååéäèæå(_J):"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr "åäæäçååéäççå(_K)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "èè(_L)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
 msgstr "åèåçéçäååéääçåç(_L)"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "ååæåéèéæè(_L)"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "èçæçéèåè(_M)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "æåäçäæåçæ(_M):"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "äåäèçèäèåç(_N)"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:157
 msgid "_Path:"
 msgstr "èå(_P):"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "éæå(_P):"
+
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "çåé HTML éäçäææåéééäçéçäæéçæç(_P)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "åèæå(_R):"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "åäç(_S):"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "åå HTTP äçäæå(_S):"
 
-#: ../mail/mail-config.ui.h:160
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "äæå(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
 msgstr "ææåçåç(_S)"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "åéäéèéçåäèçç(_S)"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
 msgstr "åæçèæå(_T):"
 
-#: ../mail/mail-config.ui.h:165
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
 msgstr "äçååéç(_U):"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "äçççéèå(_U)"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "äçèåäæççåçåçåå(_U)"
 
-#: ../mail/mail-config.ui.h:168
-#: ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:169
-#: ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "èå"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "æè"
 
@@ -11556,63 +11753,64 @@ msgstr "æææåçèæå"
 msgid "Call"
 msgstr "ååäç"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "ååæ(_M)"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "æäçç"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "äèèå"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
 msgstr "åå"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "èé"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "çæçèè"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "èå"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "ææåç"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "äéèåæ"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "åèåé"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "æé"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "æåèæåäæ"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "äåæèè"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "æåçèæå"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -11620,23 +11818,23 @@ msgstr ""
 "æéæèèéçéäååäéååã\n"
 "èåãæåãéåäéæèéçåäã"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "æåææ(_A)"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "åææ(_D):"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "æå(_F):"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "éåæéäæåææåç(_T)"
 
-#: ../mail/mail-folder-cache.c:789
+#: ../mail/mail-folder-cache.c:767
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -11645,210 +11843,141 @@ msgstr "Pinging %s"
 msgid "Filtering Selected Messages"
 msgstr "éæéæçéä"
 
-#: ../mail/mail-ops.c:226
+#: ../mail/mail-ops.c:205
 msgid "Fetching Mail"
 msgstr "ææéä"
 
-#: ../mail/mail-ops.c:785
+#: ../mail/mail-ops.c:820
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æååééä %d / %d"
 
-#: ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:868
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "çæåéç %d åéä (å %d å)"
 
-#: ../mail/mail-ops.c:833
-#: ../mail/mail-send-recv.c:788
+#: ../mail/mail-ops.c:872 ../mail/mail-send-recv.c:824
 msgid "Canceled."
 msgstr "ååæã"
 
-#: ../mail/mail-ops.c:835
-#: ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:874 ../mail/mail-send-recv.c:826
 msgid "Complete."
 msgstr "åæã"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:984
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "åéäçåã%sã"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "åéäèèåã%sã"
 
-#: ../mail/mail-ops.c:1062
-#, c-format
-msgid "Scanning folders in '%s'"
-msgstr "ææã%sãåçèæå"
-
-#: ../mail/mail-ops.c:1178
-msgid "Forwarded messages"
-msgstr "åèåçéä"
-
-#: ../mail/mail-ops.c:1295
-#, c-format
-msgid "Retrieving quota information for folder '%s'"
-msgstr "ååèæåã%sãççéééèè"
-
-#: ../mail/mail-ops.c:1370
-#, c-format
-msgid "Opening store '%s'"
-msgstr "éåèèã%sã"
-
-#: ../mail/mail-ops.c:1446
-#, c-format
-msgid "Removing folder '%s'"
-msgstr "çéèæåã%sã"
-
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1102
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æåèèèæåã%sã"
 
-#: ../mail/mail-ops.c:1678
+#: ../mail/mail-ops.c:1176
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æçååååè '%s'"
 
-#: ../mail/mail-ops.c:1679
+#: ../mail/mail-ops.c:1177
 #, c-format
 msgid "Storing account '%s'"
 msgstr "åååè '%s'"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1239
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "éææçèæåã%sã"
 
-#: ../mail/mail-ops.c:1901
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "æåååèæåã%sã"
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æçã%sãçåæç"
 
-#: ../mail/mail-ops.c:1974
+#: ../mail/mail-ops.c:1491
 msgid "Local Folders"
 msgstr "ææèæå"
 
-#: ../mail/mail-ops.c:2147
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "åå %d åéä"
-msgstr[1] "åå %d åéä"
-
-#: ../mail/mail-ops.c:2240
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "åå %d åéä"
-msgstr[1] "åå %d åéä"
-
-#: ../mail/mail-ops.c:2336
-#, c-format
-msgid "Error saving messages to: %s:\n"
-msgstr "ååéäåï%s æççéèï\n"
-
-#: ../mail/mail-ops.c:2411
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "æååèã%sãéçåä"
-
-#: ../mail/mail-ops.c:2502
-msgid "Checking Service"
-msgstr "æææå"
-
-#: ../mail/mail-ops.c:2582
+#: ../mail/mail-ops.c:1589
 #, c-format
 msgid "Disconnecting %s"
 msgstr "æåäæ %s"
 
-#: ../mail/mail-ops.c:2639
-#, c-format
-msgid "Removing attachments"
-msgstr "æåçééä"
-
-#: ../mail/mail-ops.c:2686
-#, c-format
-msgid "File \"%s\" has been removed."
-msgstr "ææã%sãåçèçéã"
-
-#: ../mail/mail-send-recv.c:191
+#: ../mail/mail-send-recv.c:197
 msgid "Canceling..."
 msgstr "æååæâ"
 
-#: ../mail/mail-send-recv.c:436
+#: ../mail/mail-send-recv.c:443
 msgid "Send & Receive Mail"
 msgstr "åéèææéä"
 
-#: ../mail/mail-send-recv.c:452
+#: ../mail/mail-send-recv.c:459
 msgid "Cancel _All"
 msgstr "åéåæ(_A)"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:963
 msgid "Updating..."
 msgstr "ææäâ"
 
-#: ../mail/mail-send-recv.c:569
-#: ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:680
 msgid "Waiting..."
 msgstr "æåçåâ"
 
-#: ../mail/mail-send-recv.c:903
+#: ../mail/mail-send-recv.c:943
 #, c-format
 msgid "Checking for new mail"
 msgstr "æææéä"
 
-#: ../mail/mail-tools.c:69
+#: ../mail/mail-tools.c:72
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "çæåçæåååçéã%sãï%s"
 
-#: ../mail/mail-tools.c:102
+#: ../mail/mail-tools.c:106
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "æååèçåé mbox äæã%sãçéä"
 
-#: ../mail/mail-tools.c:214
+#: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "èåçéä - %s"
 
-#: ../mail/mail-tools.c:216
+#: ../mail/mail-tools.c:217
 msgid "Forwarded message"
 msgstr "èåçéä"
 
-#: ../mail/mail-vfolder.c:86
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "èåæåèæåï %s"
 
-#: ../mail/mail-vfolder.c:235
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
-msgstr "ææ '%s:%s' çæåèæå"
-
-#: ../mail/mail-vfolder.c:242
+#: ../mail/mail-vfolder.c:238
 #, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "ææ '%s' çæåèæå"
+msgid "Updating Search Folders for '%s' : %s"
+msgstr "ææã%sãçæåèæåï%s"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
 #. * 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.
-#: ../mail/mail-vfolder.c:718
+#: ../mail/mail-vfolder.c:681
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted folder\n"
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
@@ -11857,12 +11986,8 @@ msgid_plural ""
 msgstr[0] ""
 "æåèæåã%sãåçäæïåçååçååååéçèæå\n"
 "ã%sãã"
-msgstr[1] ""
-"äåæåèæå\n"
-"%s åçææïåçåååçååååéçèæå\n"
-"ã%sãã"
 
-#: ../mail/mail-vfolder.c:1297
+#: ../mail/mail-vfolder.c:1294
 msgid "Edit Search Folder"
 msgstr "çèæåèæå"
 
@@ -11894,22 +12019,29 @@ msgstr "åçæåççã{1}ãçèæåååãèäçäåçåç
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit."
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
 msgstr ""
 "äæã{1}ãçéççèæååçååã\n"
 "\n"
 "æåäéæåçæèæåãèåæéååçååæèçæã"
 
 #: ../mail/mail.error.xml.h:9
-msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr "ã{1}ãåèæåéèäåæãæååéèäåæç {0}ï"
 
 #: ../mail/mail.error.xml.h:10
-msgid "A signature already exists with the name \"{0}\". Please specify a different name."
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr "åçæåççã{0}ãççåæååãèäçäåçåçã"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr "çéäåäææççäæïåäèæäèçéæçéäåäéäæéã"
 
 #: ../mail/mail.error.xml.h:12
@@ -11921,15 +12053,20 @@ msgid "Are you sure you want to delete this account?"
 msgstr "çåèåééååèï"
 
 #: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr "çåèåééååèäååææçäçäæåï"
 
 #: ../mail/mail.error.xml.h:15
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr "èæäçéææèæåäææåéçéäï"
 
 #: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
 msgstr "çåèæäçéèæåã{0}ãäææåéçéäï"
 
 #: ../mail/mail.error.xml.h:17
@@ -12005,8 +12142,12 @@ msgid "Cannot open target \"{2}\"."
 msgstr "äèéåçæã{2}ãã"
 
 #: ../mail/mail.error.xml.h:35
-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}ãïæèæåèåééæçãåæåæééææäååçæäçåã"
+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:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
@@ -12032,10 +12173,12 @@ msgstr "äèååèææã{0}ãã"
 msgid "Cannot set signature script \"{0}\"."
 msgstr "äèèåçåæåäçã{0}ãã"
 
-# (Abel) éççéæåäèä
 #: ../mail/mail.error.xml.h:42
-msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "èææåçæåæåæçãèææïåååçåååååïæåèæä Caps Lockã"
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"èææåçæåæåæçãèææïåååçåååååïæåèæä Caps Lockã"
 
 #: ../mail/mail.error.xml.h:43
 msgid "Close message window."
@@ -12045,101 +12188,132 @@ msgstr "éééäèçã"
 msgid "Could not save signature file."
 msgstr "çæååççææã"
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "æååéæåèæåã{0}ãäçéäï"
-
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Disable"
 msgstr "äèåç(_N)"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Send"
 msgstr "äèåé(_N)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Synchronize"
 msgstr "äèåæ(_N)"
 
-#: ../mail/mail.error.xml.h:50
-msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
+#: ../mail/mail.error.xml.h:49
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
 msgstr "æåèåæåçåæéäæèçéçäççèæåï"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "æåèååéçéäæçæåéèï"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "èååæåçèæï"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "èååçã"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "èåéæååçæççéèã"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "åèäææïççéèã"
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "ç {0} æççéèã"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 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 want to migrate now?\n"
+"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 "
+"want to migrate now?\n"
 "\n"
-"An mbox account will be created to preserve the old mbox folders. You can delete the account after ensuring the data is safely migrated. Please make sure there is enough disk space if you choose to migrate now."
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
 msgstr ""
-"éèçæåçååååçå mbox æèç Maildir æåãå Evolution ççåæçæåçéäåéèæçæçæåãæçåæåèèæï\n"
+"éèçæåçååååçå mbox æèç Maildir æåãå Evolution ççåæçæ"
+"åçéäåéèæçæçæåãæçåæåèèæï\n"
 "\n"
-"çåæåçäå mbox åèääçèç mbox èæåãæåäåçèèæéååèæåååååéãåææéæèæïèçåæèåççéã"
+"çåæåçäå mbox åèääçèç mbox èæåãæåäåçèèæéååèæå"
+"ååååéãåææéæèæïèçåæèåççéã"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid "Evolution's local mail format has changed."
 msgstr "Evolution çæåçéäæååçæèäã"
 
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to download messages for offline viewing."
+msgstr "äèéçäççéäåæã"
+
 #: ../mail/mail.error.xml.h:64
+msgid "Failed to find duplicate messages."
+msgstr "æäåéèçéäã"
+
+#: ../mail/mail.error.xml.h:65
+msgid "Failed to open folder."
+msgstr "çæéåèæåã"
+
+#: ../mail/mail.error.xml.h:66
+msgid "Failed to remove attachments from messages."
+msgstr "çæçééääçéäã"
+
+#: ../mail/mail.error.xml.h:67
+msgid "Failed to retrieve messages."
+msgstr "çæååéäã"
+
+#: ../mail/mail.error.xml.h:68
+msgid "Failed to save messages to disk."
+msgstr "çæåéåçéäååèççã"
+
+#: ../mail/mail.error.xml.h:69
 msgid "Failed to unsubscribe from folder."
 msgstr "çæåæèéèæåã"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:70
 msgid "File exists but cannot overwrite it."
 msgstr "ææååäçæèåã"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but is not a regular file."
 msgstr "ææååääæäèææã"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:73
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "èæåã{0}ãäæååääéèçéäã"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:74
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "åææéæççïåçæååéäéäã"
 
-#: ../mail/mail.error.xml.h:70
-msgid "If you delete the folder, all of its contents and its subfolders' contents will be deleted permanently."
+#: ../mail/mail.error.xml.h:75
+msgid ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
 msgstr "åææåéèæåïåçææååååèæåååææéåéã"
 
-#: ../mail/mail.error.xml.h:71
-msgid "If you delete the folder, all of its contents will be deleted permanently."
+#: ../mail/mail.error.xml.h:76
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
 msgstr "åææéæåéèæåïåçææååææéæåã"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:77
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "åæççïææçäçäæååèææäåéã"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12147,145 +12321,177 @@ msgstr ""
 "åæççïèåèçèèäå\n"
 "åææçäçäæåææéåéã"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:80
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "åæççïåèèèææäåéã"
 
-#: ../mail/mail.error.xml.h:76
-msgid "If you quit, these messages will not be sent until Evolution is started again."
+#: ../mail/mail.error.xml.h:81
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr "åææéæçæïåæåå Evolution äåïäæåééäéäã"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:82
 msgid "Ignore"
 msgstr "åç"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:83
 msgid "Invalid authentication"
 msgstr "çæçéè"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:84
 msgid "Mail Deletion Failed"
 msgstr "åééäåæ"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:85
 msgid "Mail filters automatically updated."
 msgstr "éäéæåèåææã"
 
-#: ../mail/mail.error.xml.h:81
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
-msgstr "ååéåéäççææå Apparently-To æéèåæåäåææäèçéäãåæååäææéïææéåçéääææçæäèãèéåæææïæèèåæåäåãæäèïãæãåæïãæäèã"
+#: ../mail/mail.error.xml.h:86
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"ååéåéäççææå Apparently-To æéèåæåäåææäèçéäãåæåå"
+"äææéïææéåçéääææçæäèãèéåæææïæèèåæåäåãæä"
+"èïãæãåæïãæäèã"
+
+#: ../mail/mail.error.xml.h:87
+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:82
+#: ../mail/mail.error.xml.h:88
 msgid "Missing folder."
 msgstr "éæèæåã"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:90
 msgid "N_ever"
 msgstr "æä(_E)"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:91
 msgid "No duplicate messages found."
 msgstr "æäåéèçéäã"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:92
 msgid "No sources selected."
 msgstr "æéåäæã"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:93
 msgid "Opening too many messages at once may take a long time."
 msgstr "äæéåéåéäåèæèèèåæéã"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:94
 msgid "Please check your account settings and try again."
 msgstr "èææåèèåäåèäæã"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:95
 msgid "Please enable the account or send using another account."
 msgstr "èåçèåèæäçåäåèåéã"
 
-#: ../mail/mail.error.xml.h:90
-msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
-msgstr "èåãæäèïãæäèåäåææçéåéäååãæåäæääèåæåæéçãæäèïãæéïæåéåéäååã"
+#: ../mail/mail.error.xml.h:96
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"èåãæäèïãæäèåäåææçéåéäååãæåäæääèåæåæéç"
+"ãæäèïãæéïæåéåéäååã"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:97
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}"
 msgstr ""
 "èçåääæäèåæääåäææ HTML éåéäï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:99
 msgid "Please provide an unique name to identify this signature."
 msgstr "èèååäèèéåçåæçççåçã"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:100
 msgid "Please wait."
 msgstr "èçåã"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:101
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "èçèéäèæåã{0}ãççåéã"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:102
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "åäæåæèææçéèæçææåã"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:103
 msgid "Read receipt requested."
 msgstr "èæèäåæã"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:104
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "çåèåéèæåã{0}ãäååææçåèæå?"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\"?"
 msgstr "çåèåéèæåã{0}ãï"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:106
 msgid "Remove duplicate messages?"
 msgstr "æåçééèçéäï"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:107
 msgid "Reply _Privately"
 msgstr "çäåè(_P)"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:110
 msgid "Search Folders automatically updated."
 msgstr "æåèæåèåææã"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:111
 msgid "Send private reply?"
 msgstr "æååéçäåèï"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:112
 msgid "Send reply to all recipients?"
 msgstr "æååèçææçæäèï"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:113
 msgid "Signature Already Exists"
 msgstr "çåæåçåå"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:114
 msgid "Synchronize folders locally for offline usage?"
 msgstr "æååæèæåääéçäçï"
 
-#: ../mail/mail.error.xml.h:109
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "Evolution éèççèæåæèæåäæïèäèèæåäåäéæååãçåæåéã"
+#: ../mail/mail.error.xml.h:115
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"Evolution éèççèæåæèæåäæïèäèèæåäåäéæååãçåæå"
+"éã"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 "åéçéçäæåæèåæéèæåæäèã\n"
 "\n"
-"ååéåéäççææå Apparently-To æéèåæåäåææäèçéäãåææåææéïæåçéääææçæäèãèéåæææïææèèåæåäåãæäèïãæãåæïãæäèã "
+"ååéåéäççææå Apparently-To æéèåæåäåææäèçéäãåææå"
+"ææéïæåçéääææçæäèãèéåæææïææèèåæåäåãæä"
+"èïãæãåæïãæäèã "
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12293,7 +12499,7 @@ msgstr ""
 "äåæäèçæèèçææçéääåï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12301,11 +12507,15 @@ msgstr ""
 "äåæäèçæèèçææçéääåï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:124
 msgid "The script file must exist and be executable."
 msgstr "åäçææåéååèäåäåèã"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:125
+msgid "These messages are not copies."
+msgstr "éäéääæèæã"
+
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12313,253 +12523,278 @@ msgstr ""
 "æèæååèåçèåæåã\n"
 "éèæïèçèæåèæåçèåïäæåæåæååã"
 
-#: ../mail/mail.error.xml.h:121
-msgid "This message cannot be sent because the account you chose to send with is not enabled"
+#: ../mail/mail.error.xml.h:128
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr "åçæææåçéæçäåéçåèïæäçæåéæéäã"
 
-#: ../mail/mail.error.xml.h:122
-msgid "This message cannot be sent because you have not specified any recipients"
+#: ../mail/mail.error.xml.h:129
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
 msgstr "åçææææåääæäèïæäçæåéæéä"
 
-#: ../mail/mail.error.xml.h:123
-msgid "This server does not support this type of authentication and may not support authentication at all."
+#: ../mail/mail.error.xml.h:130
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr "æäæåäæææéèéåèäææäææéèã"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:131
 msgid "This signature has been changed, but has not been saved."
 msgstr "æççåçèæïäåæååã"
 
-#: ../mail/mail.error.xml.h:125
-msgid "This will mark all messages as read in the selected folder and its subfolders."
+#: ../mail/mail.error.xml.h:132
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
 msgstr "éæåæçéåçèæååååèæåäææéäçåéèã"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:133
 msgid "This will mark all messages as read in the selected folder."
 msgstr "éæåæçéåçèæåäææéäçåéèã"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:134
 msgid "Unable to connect to the GroupWise server."
 msgstr "çæéçè GroupWise äæåã"
 
-#: ../mail/mail.error.xml.h:128
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+#: ../mail/mail.error.xml.h:135
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
 msgstr "çæéåæåèçèçèæåãæåäçççèçèæåäæï"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:136
 msgid "Unable to read license file."
 msgstr "çæèåææææã"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:137
+msgid "Unable to retrieve message."
+msgstr "çæææéäã"
+
+#: ../mail/mail.error.xml.h:138
 msgid "Use _Default"
 msgstr "äçéèå(_D)"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:139
 msgid "Use default drafts folder?"
 msgstr "äçéèçèçèæåï"
 
-#: ../mail/mail.error.xml.h:132
-msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
-"Do you really want to do this?"
-msgstr ""
-"èåïåæåèæåäåééäåæèæçæåæéçèæååéåéçéäã\n"
-"æåçåèééåï"
-
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:140
 msgid "Would you like to close the message window?"
 msgstr "ææèéééäèçåï"
 
-#: ../mail/mail.error.xml.h:135
-msgid "You are replying privately to a message which arrived via a mailing list, but the list is trying to redirect your reply to go back to the list. Are you sure you want to proceed?"
-msgstr "ææäçäåèäèéäèåçéäïäæéåéäèååèåæçåäååèåãæçåèççåï"
+#: ../mail/mail.error.xml.h:141
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
+"ææäçäåèäèéäèåçéäïäæéåéäèååèåæçåäååèåãæ"
+"çåèççåï"
 
-#: ../mail/mail.error.xml.h:136
-msgid "You are replying to a message which arrived via a mailing list, but you are replying privately to the sender; not to the list. Are you sure you want to proceed?"
-msgstr "ææååèäèéäèåçéäïäææäçäåèæååçååäèïèéååéäèåãæçåèççåï"
+#: ../mail/mail.error.xml.h:142
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+"ææååèäèéäèåçéäïäææäçäåèæååçååäèïèéååéä"
+"èåãæçåèççåï"
 
-#: ../mail/mail.error.xml.h:137
-msgid "You are replying to a message which was sent to many recipients. Are you sure you want to reply to ALL of them?"
+#: ../mail/mail.error.xml.h:143
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
 msgstr "ææååèçääæåéçèåæäèãæçååäçäååéï"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:144
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "æææèåçæéåéæåéäã"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:145
 msgid "You have not filled in all of the required information."
 msgstr "æææååææåéçèèã"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:146
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "æææååçéäïæçèåäéèééåï"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:147
 msgid "You may not create two accounts with the same name."
 msgstr "æäèççåçåçåçåååèã"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:148
 msgid "You must name this Search Folder."
 msgstr "æåéååææåèæåã"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:149
 msgid "You must specify a folder."
 msgstr "æåéæåäåèæåã"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:150
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
 "æåéèåæåäåèæåçæäæã\n"
 "ååéåèæåïçå/æéåæææåèæåãææéçèæåæäèçéã"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:152
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "æçåäæåã{0}ãçåèçã{0}ãïäåæäã"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:153
 msgid "_Always"
 msgstr "çæ(_A)"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:154
 msgid "_Append"
 msgstr "æå(_A)"
 
-#: ../mail/mail.error.xml.h:149
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../mail/mail.error.xml.h:155
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "åç(_D)"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:156
 msgid "_Discard changes"
 msgstr "ææèæ(_D)"
 
-#: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../mail/mail.error.xml.h:157
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "_Empty Trash"
 msgstr "æçåæç(_E)"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:158
 msgid "_Exit Evolution"
 msgstr "çæ _Evolution "
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:159
 msgid "_Expunge"
 msgstr "æé(_E)"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:160
 msgid "_Migrate Now"
 msgstr "çåèç(_M)"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:161
 msgid "_No"
 msgstr "å(_N)"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:162
 msgid "_Open Messages"
 msgstr "éåéä(_O)"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:165
 msgid "_Send Receipt"
 msgstr "åéåæ(_S)"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:166
 msgid "_Synchronize"
 msgstr "åæå(_S)"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:167
 msgid "_Yes"
 msgstr "æ(_Y)"
 
-#: ../mail/message-list.c:1215
+#: ../mail/mail.error.xml.h:168
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1211
 msgid "Unseen"
 msgstr "æéè"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1212
 msgid "Seen"
 msgstr "åéè"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1213
 msgid "Answered"
 msgstr "ååè"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1214
 msgid "Forwarded"
 msgstr "èå"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1215
 msgid "Multiple Unseen Messages"
 msgstr "ååæéèçéä"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1216
 msgid "Multiple Messages"
 msgstr "ååéä"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1220
 msgid "Lowest"
 msgstr "æä"
 
-#: ../mail/message-list.c:1225
+#: ../mail/message-list.c:1221
 msgid "Lower"
 msgstr "ä"
 
-#: ../mail/message-list.c:1229
+#: ../mail/message-list.c:1225
 msgid "Higher"
 msgstr "é"
 
-#: ../mail/message-list.c:1230
+#: ../mail/message-list.c:1226
 msgid "Highest"
 msgstr "æé"
 
-#: ../mail/message-list.c:1849
-#: ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1838 ../widgets/table/e-cell-date.c:48
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1856
-#: ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1845 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "äå %p %l:%M"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1854
 msgid "Yesterday %l:%M %p"
 msgstr "æå %p %l:%M"
 
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:1866
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../mail/message-list.c:1885
+#: ../mail/message-list.c:1874
 msgid "%b %d %l:%M %p"
 msgstr "%mæ%dæ %p %l:%M"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1876
 msgid "%b %d %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../mail/message-list.c:2672
+#: ../mail/message-list.c:2644
 msgid "Select all visible messages"
 msgstr "éæåéåèçéä"
 
-#: ../mail/message-list.c:2830
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2802 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "éä"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:3997
+msgid "Follow-up"
+msgstr "èé"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4506
-#: ../mail/message-list.c:4930
+#: ../mail/message-list.c:4501 ../mail/message-list.c:4920
 msgid "Generating message list"
 msgstr "ççéäæå"
 
-#: ../mail/message-list.c:4745
-msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
-msgstr "ææéäçåæçæåæäãåääçãæå->æéãéåéçäæéæåææèåã"
+#: ../mail/message-list.c:4738
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"ææéäçåæçæåæäãåääçãæå->æéãéåéçäæéæåææèåã"
 
-#: ../mail/message-list.c:4747
+#: ../mail/message-list.c:4740
 msgid "There are no messages in this folder."
 msgstr "éåèæåäææéäã"
 
@@ -12588,7 +12823,7 @@ msgid "Sent Messages"
 msgstr "åééä"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:568
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Size"
 msgstr "åå"
 
@@ -12597,27 +12832,27 @@ msgid "Subject - Trimmed"
 msgstr "äæ - åæç"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../modules/mail/e-mail-shell-view-actions.c:1564
 msgid "Body contains"
 msgstr "åæåå"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1571
 msgid "Message contains"
 msgstr "éäåå"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1522
+#: ../modules/mail/e-mail-shell-view-actions.c:1578
 msgid "Recipients contain"
 msgstr "æäèåå"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1585
 msgid "Sender contains"
 msgstr "åäèåå"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1592
 msgid "Subject contains"
 msgstr "äæåå"
 
@@ -12625,61 +12860,90 @@ msgstr "äæåå"
 msgid "Subject or Addresses contains"
 msgstr "äææéåéääååå"
 
-#: ../modules/addressbook/addressbook-config.c:205
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
-msgstr "éåæééèçïEvolution åæéçåæç LDAP äæå (åææç LDAP äæåææ SSL)ã"
-
 #: ../modules/addressbook/addressbook-config.c:207
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
-msgstr "éåæééèçïEvolution åæéçåæç LDAP äæå (åææç LDAP äæåææ TLS)ã"
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"éåæééèçïEvolution åæéçåæç LDAP äæå (åææç LDAP äæåæ"
+"æ SSL)ã"
 
 #: ../modules/addressbook/addressbook-config.c:209
-msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
-msgstr "éåæééèçïæçäæåäææ SSL æ TLSãéèçæçéçåäååïèäæçååæææã "
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"éåæééèçïEvolution åæéçåæç LDAP äæå (åææç LDAP äæåæ"
+"æ TLS)ã"
+
+#: ../modules/addressbook/addressbook-config.c:211
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"éåæééèçïæçäæåäææ SSL æ TLSãéèçæçéçåäååïèäæç"
+"ååæææã "
 
-#: ../modules/addressbook/addressbook-config.c:608
+#: ../modules/addressbook/addressbook-config.c:625
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "çæçæåéåçåæèäæ(_S)"
 
-#: ../modules/addressbook/addressbook-config.c:644
+#: ../modules/addressbook/addressbook-config.c:666
 msgid "Copy _book content locally for offline operation"
 msgstr "èèéèéååèæåçæéçäæ(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:751
-msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
-msgstr "éæ LDAP äæåäçåïEvolution æåèéçåéååæãåæäææåæåãèæèæçççççåïçèææèæåçåã"
+#: ../modules/addressbook/addressbook-config.c:778
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"éæ LDAP äæåäçåïEvolution æåèéçåéååæãåæäææåæåãè"
+"æèæçççççåïçèææèæåçåã"
 
-#: ../modules/addressbook/addressbook-config.c:825
-msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
-msgstr "éæ Evolution åèçäéèæçææãææèèåæéèãéåéääåãéèèååååæç LDAP äæåã"
+#: ../modules/addressbook/addressbook-config.c:857
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"éæ Evolution åèçäéèæçææãææèèåæéèãéåéääåãéèèå"
+"åååæç LDAP äæåã"
 
-#: ../modules/addressbook/addressbook-config.c:900
-msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
-msgstr "æåçåæåçææåçèçéæåäåäæåçæåããsubã(åé)çæåçåæåææååçåäææçéçããoneã(åä)çæåçååæåæåçåäçäååçã"
+#: ../modules/addressbook/addressbook-config.c:937
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"æåçåæåçææåçèçéæåäåäæåçæåããsubã(åé)çæåçåæå"
+"ææååçåäææçéçããoneã(åä)çæåçååæåæåçåäçäååçã"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1058
 msgid "Server Information"
 msgstr "äæåèè"
 
-#: ../modules/addressbook/addressbook-config.c:1021
+#: ../modules/addressbook/addressbook-config.c:1063
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "èçèæ"
 
-#: ../modules/addressbook/addressbook-config.c:1022
-#: ../modules/mail/e-mail-shell-view.c:54
+#: ../modules/addressbook/addressbook-config.c:1064
+#: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "æåæå"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1066
 msgid "Downloading"
 msgstr "äèä"
 
-#: ../modules/addressbook/addressbook-config.c:1230
+#: ../modules/addressbook/addressbook-config.c:1272
 msgid "Address Book Properties"
 msgstr "éèéåå"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1274
 msgid "New Address Book"
 msgstr "æéèé"
 
@@ -12724,363 +12988,401 @@ msgid "Show autocompleted name with an address"
 msgstr "éçèåèéçååèäå"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid "Show preview pane"
-msgstr "éçéèçæ"
+msgid "Show maps"
+msgstr "éçåå"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "The UID of the selected (or \"primary\") address book in the sidebar of the \"Contacts\" view."
-msgstr "ãéçäãæèåéæäåéåïæãäèãïéèéç UIDã"
+msgid "Show preview pane"
+msgstr "éçéèçæ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
-msgid "The layout style determines where to place the preview pane in relation to the contact list. \"0\" (Classic View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview pane next to the contact list."
-msgstr "éçæåæåäåéçäæåäéèçæçäçãã0ãïæææèïåéèçææåéçäæåäæãã1ãïåçæèïåéèçææåéçäæåæéã"
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr "ãéçäãæèåéæäåéåïæãäèãïéèéç UIDã"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
-msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
-msgstr "å Evolution åèèååæäåïåéèåçååæçã"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+"éçæåæåäåéçäæåäéèçæçäçãã0ãïæææèïåéèçææåé"
+"çäæåäæãã1ãïåçæèïåéèçææåéçäæåæéã"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "å Evolution åèèååæäåïåéèåçååæçã"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog"
 msgstr "äæçæéååçåèççèæå URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
 msgstr "äæçæéååçåèççèæå URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
 msgstr "æåååéçåéçäèåèéçéçäååèéåéääåã"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Whether to show maps in preview pane."
+msgstr "æååéèçæäéçååã"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
 msgstr "æåéçéèçæã"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:161
-#: ../modules/mail/em-mailer-prefs.c:1140
+#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
 msgstr "èææ(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:164
+#: ../modules/addressbook/autocompletion-config.c:168
 msgid "Autocompletion"
 msgstr "èååæ"
 
-#: ../modules/addressbook/autocompletion-config.c:167
+#: ../modules/addressbook/autocompletion-config.c:171
 msgid "Always _show address of the autocompleted contact"
 msgstr "æééçèåèéçéçääå(_S)"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:94
-#: ../modules/addressbook/e-book-shell-migrate.c:153
+#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "å LDAP äæå"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "_Contact"
 msgstr "éçä(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "åçæçéçä"
 
-#: ../modules/addressbook/e-book-shell-backend.c:283
+#: ../modules/addressbook/e-book-shell-backend.c:291
 msgctxt "New"
 msgid "Contact _List"
 msgstr "éçäæå(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
-#: ../modules/addressbook/e-book-shell-view-actions.c:780
+#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "åçæçéçäæå"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:301
 msgctxt "New"
 msgid "Address _Book"
 msgstr "éèé(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:295
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "åçæéèé"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:312
-#: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:105
-#: ../modules/calendar/e-cal-shell-migrate.c:59
+#: ../modules/addressbook/e-book-shell-backend.c:320
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:364
 msgid "Contacts"
 msgstr "éçä"
 
-#: ../modules/addressbook/e-book-shell-backend.c:322
+#: ../modules/addressbook/e-book-shell-backend.c:330
 msgid "Certificates"
 msgstr "æè"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:549
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
 msgstr "ååç vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
 msgstr "èèææçéçäå(_P)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Copy the contacts of the selected address book to another"
 msgstr "ååéåéèéäçéçäèèååäåéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "D_elete Address Book"
 msgstr "åééèé(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Delete the selected address book"
 msgstr "åééåçéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
 msgstr "åææçéçäçå(_V)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Move the contacts of the selected address book to another"
 msgstr "ååéåéèéäçéçäçåååäåéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
 msgstr "æåéèé(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address _Book Properties"
 msgstr "éèéåæ(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show properties of the selected address book"
 msgstr "éçéåéèéçåæ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
-#: ../modules/calendar/e-task-shell-view-actions.c:750
-#: ../modules/mail/e-mail-shell-view-actions.c:1155
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+msgid "Address Book _Map"
+msgstr "éèéåå(_M)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+msgid "Show map with all contacts from selected address book"
+msgstr "éçåéåéèéäææéçäçåå"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
+#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "_Rename..."
 msgstr "éæåå(_R)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Rename the selected address book"
 msgstr "éæååéåçéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-msgid "S_ave Address Book as vCard"
-msgstr "åéèéååç vC_ard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "ååéåéèéäçéçäååç vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Stop loading"
 msgstr "åæèå"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 msgid "_Copy Contact To..."
 msgstr "èèéçäå(_C)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Copy selected contacts to another address book"
 msgstr "åéåçéçäèèååäåéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
 msgstr "åééçä(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "_Find in Contact..."
 msgstr "åéçäååæ(_F)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Search for text in the displayed contact"
 msgstr "æåéççéçääçæå"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
 msgstr "èåéçä(_F)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Send selected contacts to another person"
 msgstr "åééåéçäçåääçèã"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_Move Contact To..."
 msgstr "åéçäçå(_M)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:766
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move selected contacts to another address book"
 msgstr "åéåçéçäçèåäåéèé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
 msgstr "æåéçä(_N)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
 msgstr "æåéçäæå(_L)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Open Contact"
 msgstr "éåéçä(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:787
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
 msgstr "æèçåçéçä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
 msgstr "åééäçéçä(_S)â"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Send a message to the selected contacts"
 msgstr "åééäèéåçéçä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1502
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "_Actions"
 msgstr "åä(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
-#: ../modules/calendar/e-task-shell-view-actions.c:815
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "_Preview"
 msgstr "éè(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
-#: ../modules/calendar/e-memo-shell-view-actions.c:676
-#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-memo-shell-view-actions.c:677
+#: ../modules/calendar/e-task-shell-view-actions.c:829
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "_Properties"
 msgstr "åæ(_P)"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-msgid "_Save as vCard..."
-msgstr "ååæ _vCardâ"
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+msgid "Address Book Map"
+msgstr "éèéåå"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
 msgstr "éçäéè(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
 msgstr "éçéçäéèèç"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+msgid "Show _Maps"
+msgstr "éçåå(_M)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+msgid "Show maps in contact preview window"
+msgstr "åéçäéèèçéçåå"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "_Classic View"
 msgstr "åçæè(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview below the contact list"
 msgstr "åéçäæåäæéçéçäéè"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:904
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
 msgid "_Vertical View"
 msgstr "åçæè(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
 msgid "Show contact preview alongside the contact list"
 msgstr "åéçäæåæééçéçäéè"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1662
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Any Category"
 msgstr "ääåé"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1676
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1677
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Unmatched"
 msgstr "ææççèæ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:966
-#: ../modules/mail/e-mail-shell-view-actions.c:1501
-#: ../shell/e-shell-content.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "ééæå"
 
-# zh_HK: msgstr "ååéåçéçä"
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "Print all shown contacts"
 msgstr "ååææéççéçä"
 
-# zh_HK: msgstr "éèåèååçéçä"
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 msgid "Preview the contacts to be printed"
 msgstr "éèåèååçéçä"
 
-# zh_HK: msgstr "ååéåçéçä"
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "Print selected contacts"
 msgstr "åååéåçéçä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+msgid "S_ave Address Book as vCard"
+msgstr "åéèéååç vC_ard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "ååéåéèéäçéçäååç vCard"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "ååæ _vCardâ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
 msgid "Save selected contacts as a vCard"
 msgstr "åéåçéçäååç vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Forward Contacts"
 msgstr "èåéçä(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contact"
 msgstr "èåéçä(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contacts"
 msgstr "åééäçéçä(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:380
+#: ../modules/addressbook/e-book-shell-view.c:384
 msgid "_Send Message to List"
 msgstr "åééäçæå(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:386
 msgid "_Send Message to Contact"
 msgstr "åééäçéçä(_S)"
 
-#: ../modules/addressbook/eab-composer-util.c:143
+#: ../modules/addressbook/eab-composer-util.c:147
 msgid "Multiple vCards"
 msgstr "åé vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:151
+#: ../modules/addressbook/eab-composer-util.c:155
 #, c-format
 msgid "vCard for %s"
 msgstr "%s ç vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:163
-#: ../modules/addressbook/eab-composer-util.c:190
+#: ../modules/addressbook/eab-composer-util.c:167
+#: ../modules/addressbook/eab-composer-util.c:194
 #, c-format
 msgid "Contact information"
 msgstr "éçäèè"
 
-#: ../modules/addressbook/eab-composer-util.c:192
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s çéçäèè"
@@ -13126,8 +13428,12 @@ msgid "Search _filter:"
 msgstr "æåéæå(_F):"
 
 #: ../modules/addressbook/ldap-config.ui.h:16
-msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
-msgstr "æåéæåæåéèæåæäçççäéåãåææéææèäæïéèçæåçææãpersonãçäéåã"
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"æåéæåæåéèæåæäçççäéåãåææéææèäæïéèçæåçææ"
+"ãpersonãçäéåã"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:18
@@ -13158,10 +13464,6 @@ msgstr "åæåèçæååç(_F)"
 msgid "_Login method:"
 msgstr "çåææ(_L):"
 
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "éæå(_P):"
-
 #: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "æåçå(_S):"
@@ -13170,14 +13472,45 @@ msgstr "æåçå(_S):"
 msgid "_Timeout:"
 msgstr "æé(_T):"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "äçååéç(_U):"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "åç"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "çæçç Bogofilter (%s):ï"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr "çæåéäèæçååäæåè Bogofilterï"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr "Bogofilter åèçææçæèçéäèæ"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Bogofilter éé"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "åéäæåèæç _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "åéäèæç Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr "åéäæåèæç Unicode UTF-8 äçääèäååéç spam/ham çåã"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -13306,7 +13639,7 @@ msgid "Wee_k starts on:"
 msgstr "äééåæ(_K):"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Work Week"
 msgstr "åäé"
 
@@ -13418,7 +13751,8 @@ msgid "Calendars to run alarms for"
 msgstr "åèééçèäæ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "åæååäçäçè Marcus Bains ççèå(ççèçäçéèå)ã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
@@ -13522,7 +13856,9 @@ msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains çèåâæåå"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
-msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
 msgstr "åãday_second_zonesãæåäèèäçæèäçæåæççæååã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
@@ -13574,12 +13910,18 @@ msgid "Overdue tasks color"
 msgstr "éæçåäèå"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
-msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
-msgstr "æåçæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçèã"
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+"æåçæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçèã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "æåçæçäçïåææèäçèçèææåèèäæãåäæåäéïäåçèã"
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"æåçæçäçïåææèäçèçèææåèèäæãåäæåäéïäåçèã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the memo preview pane when oriented vertically."
@@ -13594,16 +13936,24 @@ msgid "Position of the task preview pane when oriented vertically."
 msgstr "æåçåçæåäéèçæçäçã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
 msgstr "åççæçäçïåèäææåèææåèèäæäéã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "åççæçäçïåææèäçèçèææåèèäæãåäæåäéïäåçèã"
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"åççæçäçïåææèäçèçèææåèèäæãåäæåäéïäåçèã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
-msgstr "åççæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçèã"
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"åççæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçèã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary calendar"
@@ -13686,8 +14036,11 @@ msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "åææèãåäéæèåææåèéçéæ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
-msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
-msgstr "åæèååæåææèäéççäæåãæåéäæãtimezoneãèåéççæã"
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"åæèååæåææèäéççäæåãæåéäæãtimezoneãèåéççæã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
@@ -13706,40 +14059,66 @@ msgid "Tasks due today color"
 msgstr "äååæåäçèå"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
-msgid "The UID of the selected (or \"primary\") calendar in the sidebar of the \"Calendar\" view."
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
 msgstr "ãèäæãæèåéæäåéåïæãäèãïéèéç UIDã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid "The UID of the selected (or \"primary\") memo list in the sidebar of the \"Memos\" view."
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
 msgstr "ãååéãæèåéæäåéåïæãäèãïéèéç UIDã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
-msgid "The UID of the selected (or \"primary\") task list in the sidebar of the \"Tasks\" view."
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
 msgstr "ãåäãæèåéæäåéåïæãäèãïéèéç UIDã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-msgstr "äççé/åçèæåéäçççåçæï%u èäéåéääåçäçèåçéåäåäïè %d èææççååçã"
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"äççé/åçèæåéäçççåçæï%u èäéåéääåçäçèåçéåäå"
+"äïè %d èææççååçã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
-msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
-msgstr "çæèäæäææèæåçéèæåïæçèç Olsen æåèæåäçåå \"America/New York\"ã"
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"çæèäæäææèæåçéèæåïæçèç Olsen æåèæåäçåå "
+"\"America/New York\"ã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
-msgid "The layout style determines where to place the preview pane in relation to the memo list. \"0\" (Classic View) places the preview pane below the memo list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr "éçæåæåäåååéæåäéèçæçäçãã0ãïæææèïåéèçææåååéæåäæãã1ãïåçæèïåéèçææåååéæåæéã"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"éçæåæåäåååéæåäéèçæçäçãã0ãïæææèïåéèçææåå"
+"åéæåäæãã1ãïåçæèïåéèçææåååéæåæéã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid "The layout style determines where to place the preview pane in relation to the task list. \"0\" (Classic View) places the preview pane below the task list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr "éçæåæåäååäæåäéèçæçäçãã0ãïæææèïåéèçææååäæåäæãã1ãïåçæèïåéèçææååäæåæéã"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"éçæåæåäååäæåäéèçæçäçãã0ãïæææèïåéèçææååä"
+"æåäæãã1ãïåçæèïåéèçææååäæåæéã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
 msgid "The second timezone for a Day View"
 msgstr "çæææèççäæå"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
 msgstr "éèåäçäçæåãã0ãçéèãã1ãçèåãã2ãçééèæã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
@@ -13758,20 +14137,23 @@ msgstr "æå"
 msgid "Twenty four hour time format"
 msgstr "24 åæåæå"
 
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "çæåéåçåææéçåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)ã"
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr ""
+"çæåéåçåææéçåäïãminutesã(åé)ããhoursã(åæ)æãdaysã"
+"(æ)ã"
 
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "éèæéåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)ã"
 
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "æåäæéèåäçåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)ã"
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"æåäæéèåäçåäïãminutesã(åé)ããhoursã(åæ)æãdaysã(æ)ã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
@@ -13806,7 +14188,9 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "æéçææåäææåèæçèã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
 msgstr "æååçææèäçéæïéæåäéäçéåèéæçæäåçääã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
@@ -13814,7 +14198,8 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "æååéåæçæèåéççæççææéã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "æååèäæäçå Marcus Bains çïäèçåæåçççïã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
@@ -13850,7 +14235,8 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "æååää/åä/æèçèåäéç çæ æä"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "æåäç 24 åæåæéèäæäçäå/äåã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
@@ -13885,422 +14271,435 @@ msgstr "åäæéååæ"
 msgid "Workday start minute"
 msgstr "åäæéååé"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:267
+#: ../modules/calendar/e-cal-attachment-handler.c:286
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "åå(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:348
+#: ../modules/calendar/e-cal-attachment-handler.c:367
 msgid "Select a Calendar"
 msgstr "éæèäæ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:375
+#: ../modules/calendar/e-cal-attachment-handler.c:394
 msgid "Select a Task List"
 msgstr "éæåäæå"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:404
 msgid "I_mport to Calendar"
 msgstr "ååèèäæ(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:392
+#: ../modules/calendar/e-cal-attachment-handler.c:411
 msgid "I_mport to Tasks"
 msgstr "ååèåä(_M)"
 
+#: ../modules/calendar/e-calendar-preferences.c:441
+msgid "Selected Calendars for Alarms"
+msgstr "éæééèäæ"
+
+#: ../modules/calendar/e-calendar-preferences.c:840
+msgid "Ti_me and date:"
+msgstr "æååææ(_M):"
+
+#: ../modules/calendar/e-calendar-preferences.c:841
+msgid "_Date only:"
+msgstr "åæææ(_D):"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:107
-#: ../modules/calendar/e-cal-shell-migrate.c:194
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:160
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:100
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:100
+#: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "åççä"
 
-#: ../modules/calendar/e-cal-shell-backend.c:109
-#: ../plugins/calendar-weather/calendar-weather.c:121
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../plugins/calendar-weather/calendar-weather.c:125
 msgid "Weather"
 msgstr "åæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:196
-#: ../modules/calendar/e-cal-shell-migrate.c:62
+#: ../modules/calendar/e-cal-shell-backend.c:202
+#: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "çæåéåçåæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:421
+#: ../modules/calendar/e-cal-shell-backend.c:423
 msgctxt "New"
 msgid "_Appointment"
 msgstr "çæ(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-backend.c:425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Create a new appointment"
 msgstr "åçäåæççæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:428
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "åæçæ(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:432
 msgid "Create a new all-day appointment"
 msgstr "åçæçåæçæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:435
+#: ../modules/calendar/e-cal-shell-backend.c:437
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æè(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgid "Create a new meeting request"
 msgstr "åçææèèæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-cal-shell-backend.c:447
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "èäæ(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-backend.c:449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Create a new calendar"
 msgstr "åçæèäæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:750
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../modules/calendar/e-cal-shell-backend.c:755
+#: ../plugins/itip-formatter/itip-formatter.c:2951
 msgid "Calendar and Tasks"
 msgstr "èäæèåä"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:221
+#: ../modules/calendar/e-cal-shell-sidebar.c:180
 msgid "Loading calendars"
 msgstr "æåèåèäæ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:636
+#: ../modules/calendar/e-cal-shell-sidebar.c:721
 msgid "_New Calendar..."
 msgstr "æåèäæ(_N)â"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:653
+#: ../modules/calendar/e-cal-shell-sidebar.c:738
 msgid "Calendar Selector"
 msgstr "èäæéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:998
+#: ../modules/calendar/e-cal-shell-sidebar.c:1087
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "éåå %s çèäæ"
 
-# zh_HK: msgstr "åå"
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view-actions.c:222
+#: ../modules/calendar/e-cal-shell-view-actions.c:251
 msgid "Print"
 msgstr "åå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:306
-msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
-msgstr "æäæææäæåéæéåæééèçææääãåææççïåçæååéäääã"
+#: ../modules/calendar/e-cal-shell-view-actions.c:310
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"æäæææäæåéæéåæééèçææääãåææççïåçæååéäääã"
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:327
 msgid "Purge events older than"
 msgstr "æéææéææéçää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#: ../modules/calendar/e-cal-shell-view-actions.c:541
 msgid "Copying Items"
 msgstr "èèéç"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:816
 msgid "Moving Items"
 msgstr "çåéç"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1131
+#: ../modules/calendar/e-cal-shell-view-actions.c:1143
 msgid "event"
 msgstr "ää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1133
-#: ../modules/calendar/e-cal-shell-view-memopad.c:216
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:510
-#: ../modules/calendar/e-task-shell-view-actions.c:627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1145
+#: ../modules/calendar/e-cal-shell-view-memopad.c:220
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:511
+#: ../modules/calendar/e-task-shell-view-actions.c:628
 msgid "Save as iCalendar"
 msgstr "ååç iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1290
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "_Copy..."
 msgstr "èè(_C)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
 msgid "D_elete Calendar"
 msgstr "åéèäæ(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Delete the selected calendar"
 msgstr "åééåçèäæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Go Back"
 msgstr "åå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Go Forward"
 msgstr "åå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Select today"
 msgstr "éåäæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
 msgid "Select _Date"
 msgstr "éæææ(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1339
 msgid "Select a specific date"
 msgstr "éåçåææ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "_New Calendar"
 msgstr "æåèäæ(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-task-shell-view-actions.c:800
 msgid "Purg_e"
 msgstr "æé(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Purge old appointments and meetings"
 msgstr "åéèçæåæè"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1353
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
 msgid "Re_fresh"
 msgstr "éææç(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Refresh the selected calendar"
 msgstr "éææçéåçèäæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Rename the selected calendar"
 msgstr "éæååéåçèäæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Show _Only This Calendar"
 msgstr "åéçéåèäæ(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Cop_y to Calendar..."
 msgstr "èèèèäæ(_Y)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_Delegate Meeting..."
 msgstr "åææè(_D)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "_Delete Appointment"
 msgstr "åéçæ(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete selected appointments"
 msgstr "åééåççæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Delete This _Occurrence"
 msgstr "åééæçççää(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Delete this occurrence"
 msgstr "åéæéæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Delete All Occ_urrences"
 msgstr "åéææçççää(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "Delete all occurrences"
 msgstr "åéåééæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New All Day _Event..."
 msgstr "æåååää(_E)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new all day event"
 msgstr "åçæçååää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "_Forward as iCalendar..."
 msgstr "ä iCale_ndar èåâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "New _Meeting..."
 msgstr "æåæè(_M)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new meeting"
 msgstr "åçæçæè"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Mo_ve to Calendar..."
 msgstr "çèèäæ(_V)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "New _Appointment..."
 msgstr "æåçæ(_A)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Make this Occurrence _Movable"
 msgstr "åéåääæçæåçå(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Open Appointment"
 msgstr "éåçæ(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../modules/calendar/e-cal-shell-view-actions.c:1465
 msgid "View the current appointment"
 msgstr "æèçåççæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1458
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Reply"
 msgstr "åè(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-msgid "Save as iCalendar..."
-msgstr "ååç iCalendarâ"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "_Schedule Meeting..."
 msgstr "æèæç(_S)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts an appointment to a meeting"
 msgstr "åçæèæçæè"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Conv_ert to Appointment..."
 msgstr "èæççæ(_E)â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Converts a meeting to an appointment"
 msgstr "åæèèæççæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Quit"
 msgstr "çæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Day"
 msgstr "å"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show one day"
 msgstr "éçäå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "List"
 msgstr "æå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show as list"
 msgstr "éçææå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Month"
 msgstr "æ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one month"
 msgstr "éçäåæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Week"
 msgstr "é"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one week"
 msgstr "éçäé"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-cal-shell-view-actions.c:1648
 msgid "Show one work week"
 msgstr "éçäååäé"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
 msgid "Active Appointments"
 msgstr "éèäççæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
 msgid "Next 7 Days' Appointments"
 msgstr "æä 7 åççæ(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1700
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Description contains"
 msgstr "æèåå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1707
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Summary contains"
 msgstr "äæåå"
 
-# zh_HK: msgstr "ååéåèäæ"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Print this calendar"
 msgstr "ååéåèäæ"
 
-# zh_HK: msgstr "éèåèååçèäæåå"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 msgid "Preview the calendar to be printed"
 msgstr "éèåèååçèäæ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1749
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+msgid "Save as iCalendar..."
+msgstr "ååç iCalendarâ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1826
 msgid "Go To"
 msgstr "çè"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:214
-#: ../modules/calendar/e-memo-shell-view-actions.c:508
+#: ../modules/calendar/e-cal-shell-view-memopad.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:509
 msgid "memo"
 msgstr "ååé"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-memopad.c:261
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "New _Memo"
 msgstr "æåååé(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "Create a new memo"
 msgstr "åçæçååé"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-memopad.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
 msgid "_Open Memo"
 msgstr "éåååé(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:266
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:270
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 msgid "View the selected memo"
 msgstr "æèéåçååé"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Open _Web Page"
 msgstr "éåçé(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:290
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-cal-shell-view-memopad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the selected memo"
 msgstr "ååéåçååé"
 
@@ -14308,867 +14707,809 @@ msgstr "ååéåçååé"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
-#: ../modules/calendar/e-task-shell-view-actions.c:625
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:285
+#: ../modules/calendar/e-task-shell-view-actions.c:626
 msgid "task"
 msgstr "åä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:320
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Assign Task"
 msgstr "ææåä(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "_Mark as Complete"
 msgstr "æççåæ(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:336
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as complete"
 msgstr "åéåçåäæçæåæ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:341
 msgid "_Mark as Incomplete"
 msgstr "æççæåæ(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:343
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Mark selected tasks as incomplete"
 msgstr "åéåçåäæçææåæ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "New _Task"
 msgstr "æååä(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:282
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:350
+#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Create a new task"
 msgstr "åçäåæçåä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "_Open Task"
 msgstr "éååä(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:357
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "View the selected task"
 msgstr "æèéåçåä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
-msgid "_Save as iCalendar..."
-msgstr "ååç iCalendar[_S]â"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
+#: ../modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Print the selected task"
 msgstr "ååéåçåä"
 
-#: ../modules/calendar/e-calendar-preferences.c:437
-msgid "Selected Calendars for Alarms"
-msgstr "éæééèäæ"
-
-#: ../modules/calendar/e-calendar-preferences.c:836
-msgid "Ti_me and date:"
-msgstr "æååææ(_M):"
-
-#: ../modules/calendar/e-calendar-preferences.c:837
-msgid "_Date only:"
-msgstr "åæææ(_D):"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-task-shell-view-actions.c:1029
+msgid "_Save as iCalendar..."
+msgstr "ååç iCalendar[_S]â"
 
-#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-backend.c:285
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ååé(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:288
+#: ../modules/calendar/e-memo-shell-backend.c:292
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "åçååé(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:290
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgid "Create a new shared memo"
 msgstr "åçæçåçååé"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-backend.c:302
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ååéæå(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "Create a new memo list"
 msgstr "åçæååéæå"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:216
+#: ../modules/calendar/e-memo-shell-sidebar.c:175
 msgid "Loading memos"
 msgstr "æåèåååé"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:578
+#: ../modules/calendar/e-memo-shell-sidebar.c:662
 msgid "Memo List Selector"
 msgstr "ååéæåéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:885
+#: ../modules/calendar/e-memo-shell-sidebar.c:973
 #, c-format
 msgid "Opening memos at %s"
 msgstr "éåå %s çååé"
 
-# zh_HK: msgstr "ååååé"
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:222
+#: ../modules/calendar/e-memo-shell-view-actions.c:237
 msgid "Print Memos"
 msgstr "ååååé"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Delete Memo"
 msgstr "åéååé(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
 msgid "_Find in Memo..."
 msgstr "åååéååæ(_F)â"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Search for text in the displayed memo"
 msgstr "æåéççååéäçæå"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "D_elete Memo List"
 msgstr "åéååéæå(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Delete the selected memo list"
 msgstr "åééåçååéæå"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_New Memo List"
 msgstr "æåååéæå(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Refresh the selected memo list"
 msgstr "éææçéåçååéæå"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:629
 msgid "Rename the selected memo list"
 msgstr "éæååéåçååéæå"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "Show _Only This Memo List"
 msgstr "åéçæååéæå(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:712
+#: ../modules/calendar/e-memo-shell-view-actions.c:713
 msgid "Memo _Preview"
 msgstr "ååééè(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-memo-shell-view-actions.c:715
 msgid "Show memo preview pane"
 msgstr "éçååééèçæ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview below the memo list"
 msgstr "åååéæåäæéçååééè"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
 msgid "Show memo preview alongside the memo list"
 msgstr "åååéæåæééçååééè"
 
-# zh_HK: msgstr "ååååéæå"
-#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Print the list of memos"
 msgstr "ååååéæå"
 
-# zh_HK: msgstr "éèåèååçååéæå"
-#: ../modules/calendar/e-memo-shell-view-actions.c:807
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Preview the list of memos to be printed"
 msgstr "éèåèååçååéæå"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "åéååé"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "åéååé"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d éååé"
-msgstr[1] "%d éååé"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
-#: ../modules/calendar/e-task-shell-view-private.c:575
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:573
 #, c-format
 msgid "%d selected"
 msgstr "åéæ %d å"
 
-#: ../modules/calendar/e-memo-shell-view.c:223
-msgid "Delete Memos"
-msgstr "åéååé"
-
-#: ../modules/calendar/e-memo-shell-view.c:225
-msgid "Delete Memo"
-msgstr "åéååé"
-
-#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgctxt "New"
 msgid "_Task"
 msgstr "åä(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:287
+#: ../modules/calendar/e-task-shell-backend.c:291
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ææçåä(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:289
+#: ../modules/calendar/e-task-shell-backend.c:293
 msgid "Create a new assigned task"
 msgstr "åçææåçåä"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-backend.c:301
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "åäæå(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:299
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "Create a new task list"
 msgstr "åçæåäæå"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:216
+#: ../modules/calendar/e-task-shell-sidebar.c:175
 msgid "Loading tasks"
 msgstr "æåèååä"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:578
+#: ../modules/calendar/e-task-shell-sidebar.c:662
 msgid "Task List Selector"
 msgstr "åäæåéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:885
+#: ../modules/calendar/e-task-shell-sidebar.c:973
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "éåå %s çåä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:245
+#: ../modules/calendar/e-task-shell-view-actions.c:260
 msgid "Print Tasks"
 msgstr "åååä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:569
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"éååäææäåæéæææççååæçåäãåææèççïæåäèååéäåäã\n"
+"éååäææäåæéæææççååæçåäãåææèççïæåäèååéäå"
+"äã\n"
 "\n"
 "çåæééäåäï"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:577
+msgid "Do not ask me again"
+msgstr "äèåèåæ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Delete Task"
 msgstr "åéåä(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Find in Task..."
 msgstr "ååäååæ(_F)â"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-task-shell-view-actions.c:704
 msgid "Search for text in the displayed task"
 msgstr "æåéççåääçæå"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Copy..."
 msgstr "èèâ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "D_elete Task List"
 msgstr "åéåäæå(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Delete the selected task list"
 msgstr "åééåçåäæå"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "_New Task List"
 msgstr "æååäæå(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Refresh the selected task list"
 msgstr "éææçéåçåäæå"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/calendar/e-task-shell-view-actions.c:753
 msgid "Rename the selected task list"
 msgstr "éæååéåçåäæå"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Show _Only This Task List"
 msgstr "åéçæåäæå(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "Mar_k as Incomplete"
 msgstr "æççæåæ(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "Delete completed tasks"
 msgstr "åéååæçåä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:876
+#: ../modules/calendar/e-task-shell-view-actions.c:877
 msgid "Task _Preview"
 msgstr "åäéè(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:878
+#: ../modules/calendar/e-task-shell-view-actions.c:879
 msgid "Show task preview pane"
 msgstr "éçåäéèçæ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview below the task list"
 msgstr "ååäæåäæéçåäéè"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:906
+#: ../modules/calendar/e-task-shell-view-actions.c:907
 msgid "Show task preview alongside the task list"
 msgstr "ååäæåæééçåäéè"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Active Tasks"
 msgstr "éèäçåä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Completed Tasks"
 msgstr "ååæçåä "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Next 7 Days' Tasks"
 msgstr "æä 7 åçåä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Overdue Tasks"
 msgstr "éæçåä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Tasks with Attachments"
 msgstr "æéäçåä"
 
-# zh_HK: msgstr "åååäæå"
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Print the list of tasks"
 msgstr "åååäæå"
 
-# zh_HK: msgstr "éèåèååçåäæå"
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Preview the list of tasks to be printed"
 msgstr "éèåèååçåäæå"
 
-#: ../modules/calendar/e-task-shell-view-private.c:468
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "åéåä"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "åéåä"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "éåä"
 
-#: ../modules/calendar/e-task-shell-view-private.c:571
+#: ../modules/calendar/e-task-shell-view-private.c:569
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d éåä"
-msgstr[1] "%d éåä"
 
-#: ../modules/calendar/e-task-shell-view.c:358
-msgid "Delete Tasks"
-msgstr "åéåä"
+#: ../modules/mail/em-account-prefs.c:218
+msgid "Evolution Account Assistant"
+msgstr "Evolution åèåç"
 
-#: ../modules/calendar/e-task-shell-view.c:360
-msgid "Delete Task"
-msgstr "åéåä"
+#: ../modules/mail/em-account-prefs.c:267
+msgid "Account Editor"
+msgstr "åèçèå"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:382
+#: ../modules/mail/e-mail-attachment-handler.c:384
 #, c-format
 msgid "%d attached messages"
 msgstr "%d åéåçéä"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "ææ"
-
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "éäèæ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:185
+#: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
 msgstr "çèæçéäèæ"
 
-#: ../modules/mail/e-mail-shell-backend.c:193
+#: ../modules/mail/e-mail-shell-backend.c:205
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "éäèæå(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
 msgstr "åçæéäèæå"
 
-#: ../modules/mail/e-mail-shell-backend.c:494
+#: ../modules/mail/e-mail-shell-backend.c:408
 msgid "Mail Accounts"
 msgstr "éäåè"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:416
 msgid "Mail Preferences"
 msgstr "éäååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:510
+#: ../modules/mail/e-mail-shell-backend.c:424
 msgid "Composer Preferences"
 msgstr "éäçèåååèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:518
+#: ../modules/mail/e-mail-shell-backend.c:432
 msgid "Network Preferences"
 msgstr "çèååèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
-#: ../modules/mail/e-mail-shell-view.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view.c:945
 msgid "_Disable Account"
 msgstr "åçåè(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "Disable this account"
 msgstr "åçéååè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æäçéåææèæååçååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1078
-msgid "C_reate Search Folder From Search..."
-msgstr "åæååçæåèæå(_R)â"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1085
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "_Download Messages for Offline Usage"
 msgstr "äèéçäççéä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "äèæèçéçäççåèèèæåäéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1092
+#: ../modules/mail/e-mail-shell-view-actions.c:1138
 msgid "Fl_ush Outbox"
 msgstr "æçåäå(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "_Copy Folder To..."
 msgstr "èèèæåå(_C)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid "Copy the selected folder into another folder"
 msgstr "èèåéåçèæåååäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1108
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Permanently remove this folder"
 msgstr "æäçééåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1113
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "E_xpunge"
 msgstr "åé(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æäçéåéåèæååååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1120
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Mar_k All Messages as Read"
 msgstr "æçææéäçåéè(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "Mark all messages in the folder as read"
 msgstr "åèæåäåéçéäæçæåéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "_Move Folder To..."
 msgstr "çåèæåå(_M)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1175
 msgid "Move the selected folder into another folder"
 msgstr "åéåçèæåçèåäåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1134
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "_New..."
 msgstr "æå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "Create a new folder for storing mail"
 msgstr "åçäåæèæåäååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Change the properties of this folder"
 msgstr "èæéåèæåçåæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1150
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "Refresh the folder"
 msgstr "éæèåèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "Change the name of this folder"
 msgstr "èæéåèæåçåç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Select Message _Thread"
 msgstr "éæéäæé(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
 msgid "Select all messages in the same thread as the selected message"
 msgstr "éæææçéçéäçéåçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Select Message S_ubthread"
 msgstr "éæéäåçç(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Select all replies to the currently selected message"
 msgstr "éæææåèéåéäçä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1183
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "Empty _Trash"
 msgstr "æçåæç(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æäçéåææåèååéååéçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "_New Label"
 msgstr "æåæç(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "N_one"
 msgstr "ææ(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "_Manage Subscriptions"
 msgstr "ççèé(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "èéæåæèéåéçäæåçèæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Send / _Receive"
 msgstr "åé/ææ(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Send queued items and retrieve new items"
 msgstr "åéåéçéçäæææçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "R_eceive All"
 msgstr "åéææ(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Receive new items from all accounts"
 msgstr "ææåææåèåçæéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "_Send All"
 msgstr "åéåé(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Send queued items in all accounts"
 msgstr "åéåææåèååéçéç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
-#: ../widgets/misc/e-activity-proxy.c:306
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "Cancel the current mail operation"
 msgstr "åæçåéäæäçèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Collapse All _Threads"
 msgstr "ææææçééä(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "Collapse all message threads"
 msgstr "ææææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1276
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "E_xpand All Threads"
 msgstr "åéææçééä(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "Expand all message threads"
 msgstr "åéææççééä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1283
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "_Message Filters"
 msgstr "éäèå(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 msgid "Create or edit rules for filtering new mail"
 msgstr "çæéäåçæçèéæèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1290
-msgid "Search F_olders"
-msgstr "æåèæå(_O)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
-msgid "Create or edit search folder definitions"
-msgstr "åçæçèæåèæåçåç"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1297
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_Subscriptions..."
 msgstr "èé(_S)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "F_older"
 msgstr "èæå(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "_Label"
 msgstr "æç(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1353
+#: ../modules/mail/e-mail-shell-view-actions.c:1369
+msgid "C_reate Search Folder From Search..."
+msgstr "åæååçæåèæå(_R)â"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+msgid "Search F_olders"
+msgstr "æåèæå(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
+msgid "Create or edit search folder definitions"
+msgstr "åçæçèæåèæåçåç"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1409
 msgid "_New Folder..."
 msgstr "æåèæå(_N)â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1381
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
 msgid "Show Message _Preview"
 msgstr "éçéäéè(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1383
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "Show message preview pane"
 msgstr "éçéäéèçæ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "Show _Deleted Messages"
 msgstr "éçååééä(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1447
 msgid "Show deleted messages with a line through them"
 msgstr "éçååéçéä (åäåéç)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1397
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "_Group By Threads"
 msgstr "äçééäççç(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1455
 msgid "Threaded message list"
 msgstr "çééäæå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1420
+#: ../modules/mail/e-mail-shell-view-actions.c:1476
 msgid "Show message preview below the message list"
 msgstr "åéäæåäæéçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "Show message preview alongside the message list"
 msgstr "åéäæåæééçéäéè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "All Messages"
 msgstr "ææéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
 msgid "Important Messages"
 msgstr "éèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
 msgid "Last 5 Days' Messages"
 msgstr "æè 5 åçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "Messages Not Junk"
 msgstr "éååéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Messages with Attachments"
 msgstr "æéäçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
 msgid "No Label"
 msgstr "çæç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1533
 msgid "Read Messages"
 msgstr "åèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../modules/mail/e-mail-shell-view-actions.c:1540
 msgid "Recent Messages"
 msgstr "æèçéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1547
 msgid "Unread Messages"
 msgstr "æèéä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1599
 msgid "Subject or Addresses contain"
 msgstr "äææéåéääååå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1609
 msgid "All Accounts"
 msgstr "ææçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1560
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
 msgid "Current Account"
 msgstr "çåçåè"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Current Folder"
 msgstr "çåçèæå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1049
+#: ../modules/mail/e-mail-shell-view.c:559
+msgid "All Account Search"
+msgstr "ææçåèæå"
+
+#: ../modules/mail/e-mail-shell-view.c:732
+msgid "Account Search"
+msgstr "åèæå"
+
+#: ../modules/mail/e-mail-shell-view.c:943
+msgid "Proxy _Logout"
+msgstr "çåäçäæå(_L)"
+
+#: ../modules/mail/e-mail-shell-view-private.c:996
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "åéæ %d åï"
-msgstr[1] "åéæ %d åï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1007
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d åååé"
-msgstr[1] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1013
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ååå"
-msgstr[1] "%d ååå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d åèç"
-msgstr[1] "%d åèç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1085
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d åæåé"
-msgstr[1] "%d åæåé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1091
+#: ../modules/mail/e-mail-shell-view-private.c:1038
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d åååé"
-msgstr[1] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1050
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d åæèï"
-msgstr[1] "%d åæèï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../modules/mail/e-mail-shell-view-private.c:1053
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å %d å"
-msgstr[1] "å %d å"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1126
+#: ../modules/mail/e-mail-shell-view-private.c:1073
 msgid "Trash"
 msgstr "åæç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1600
+#: ../modules/mail/e-mail-shell-view-private.c:1541
 msgid "Send / Receive"
 msgstr "åé/ææ"
 
-#: ../modules/mail/e-mail-shell-view.c:563
-msgid "All Account Search"
-msgstr "ææçåèæå"
-
-#: ../modules/mail/e-mail-shell-view.c:746
-msgid "Account Search"
-msgstr "åèæå"
-
-#: ../modules/mail/e-mail-shell-view.c:951
-msgid "Proxy _Logout"
-msgstr "çåäçäæå(_L)"
-
-#: ../modules/mail/em-account-prefs.c:215
-msgid "Evolution Account Assistant"
-msgstr "Evolution åèåç"
-
-#: ../modules/mail/em-account-prefs.c:264
-msgid "Account Editor"
-msgstr "åèçèå"
-
-#: ../modules/mail/em-composer-prefs.c:502
-#: ../modules/plugin-manager/evolution-plugin-manager.c:356
+#: ../modules/mail/em-composer-prefs.c:493
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
 #: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:220
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "ååç"
 
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:497
 msgid "Language(s)"
 msgstr "èè"
 
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "ææ"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "æåäæ"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "æéäæ"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "ææäæ"
 
-#: ../modules/mail/em-mailer-prefs.c:174
-msgid "Add Custom Junk Header"
-msgstr "ååèèååéäæé"
-
-#: ../modules/mail/em-mailer-prefs.c:182
-msgid "Header Name:"
-msgstr "æéåç:"
-
-#: ../modules/mail/em-mailer-prefs.c:183
-msgid "Header Value Contains:"
-msgstr "æéæååå:"
-
-#: ../modules/mail/em-mailer-prefs.c:283
+#: ../modules/mail/em-mailer-prefs.c:289
 msgid "Header"
 msgstr "éé"
 
-#: ../modules/mail/em-mailer-prefs.c:287
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Contains Value"
 msgstr "ååæå"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693
-#: ../modules/mail/em-mailer-prefs.c:766
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s åæçåååäçääèèéäåèåæã"
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:701
-#: ../modules/mail/em-mailer-prefs.c:775
-#, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
-msgstr "%s åæçååçæäçãèæææåæåèèåäã"
-
-#: ../modules/mail/em-mailer-prefs.c:739
-msgid "No junk plugin available"
-msgstr "ææåççååéäåæçå"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1031
 msgid "_Date header:"
 msgstr "æææé(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/mail/em-mailer-prefs.c:1032
 msgid "Show _original header value"
 msgstr "éçååæéæå(_O)"
 
@@ -15177,10 +15518,11 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "ææ Evolution æåçéèçéäçå"
 
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "ææåå Evolution æïææåæåçéèçéäçåã"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:143
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "æåèå Evolution èçæçéèéåéäåæçï"
 
@@ -15188,7 +15530,6 @@ msgstr "æåèå Evolution èçæçéèéåéäåæçï"
 msgid "Click 'Work Online' to return to online mode."
 msgstr "ééãçäåäãäååçäæåã"
 
-# zh_HK: msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
 msgid "Evolution is currently offline due to a network outage."
 msgstr "åççèçæäçïEvolution çåçéçæåã"
@@ -15197,40 +15538,66 @@ msgstr "åççèçæäçïEvolution çåçéçæåã"
 msgid "Evolution is currently offline."
 msgstr "Evolution çåçéçåäã"
 
-# zh_HK: msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
-msgid "Evolution will return to online mode once a network connection is established."
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
 msgstr "äæçèéçåçïEvolution åæååçäæåã"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+"å org.gnome æäååæçåèãéæ OnlineAccounts æåçåéèèèçåæã"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr "OAuth"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr "éåééæéé GNOME Online Accounts æåéæåäæå"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
 msgstr "äè"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+#: ../modules/plugin-manager/evolution-plugin-manager.c:254
 msgid "Plugin Manager"
 msgstr "åæçåççå"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:266
+#: ../modules/plugin-manager/evolution-plugin-manager.c:269
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ææïæäèæåéæåååææçæ"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:295
+#: ../modules/plugin-manager/evolution-plugin-manager.c:298
 msgid "Overview"
 msgstr "æè"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:364
-#: ../modules/plugin-manager/evolution-plugin-manager.c:447
+#: ../modules/plugin-manager/evolution-plugin-manager.c:367
+#: ../modules/plugin-manager/evolution-plugin-manager.c:450
 msgid "Plugin"
 msgstr "åæçå"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:485
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "_Plugins"
 msgstr "åæçå(_P)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "Enable and disable plugins"
 msgstr "åçèåçåæçå"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python æèåæçå"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Python EPlugin èåçåçæèåæçåã"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -15239,56 +15606,108 @@ msgstr "Hello Python"
 msgid "Python Plugin Loader tests"
 msgstr "Python åæçåèåçåæè"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Python æèåæçå"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "çæçç SpamAssassin (%s)ï"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Python EPlugin èåçåçæèåæçåã"
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "çæåéäèæçååäæåè SpamAssassinï"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "çæååã%sãè SpamAssassinï"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr "çæå SpamAssassin èåèåï"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr "SpamAssassin åèçææçæèçéäèæ"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin éé"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "ååéçæè(_N)"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "éæè SpamAssasin æåéïäéåèæã"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "äç SpamAsssassin äæçåååæç"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "äç SpamAsssassin äæçåååæç (spamc/spamd)ã"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "åäçæåååéäæèã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:277
-#: ../widgets/misc/e-import-assistant.c:392
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "åäçæåååéäæè (ææ DNS)ã"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:281
+#: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "èéæææèååçèèï"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:309
-#: ../widgets/misc/e-import-assistant.c:548
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "äè %sï"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:320
-#: ../modules/startup-wizard/evolution-startup-wizard.c:417
+#: ../modules/startup-wizard/evolution-startup-wizard.c:324
+#: ../modules/startup-wizard/evolution-startup-wizard.c:422
 msgid "Importing Files"
 msgstr "æåååææ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:395
+#: ../modules/startup-wizard/evolution-startup-wizard.c:400
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "ååååæãèæãääæãççã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:413
+#: ../modules/startup-wizard/evolution-startup-wizard.c:418
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "ååååæãèæãääæãççã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:487
+#: ../modules/startup-wizard/evolution-startup-wizard.c:492
 msgid "Evolution Setup Assistant"
 msgstr "Evolution èååç"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:493
+#: ../modules/startup-wizard/evolution-startup-wizard.c:498
 msgid "Welcome"
 msgstr "æèäç"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"æèäç Evolutionãääçéæè Evolution éçèæçéåéäåèïäåååäæççåèåææã\n"
+"æèäç Evolutionãääçéæè Evolution éçèæçéåéäåèïäåååä"
+"æççåèåææã\n"
 "\n"
 "èæääãääæãæéççã "
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:608
+msgid "Loading accounts..."
+msgstr "æåèååèâ"
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "åæåéèéåå Evolutionã"
@@ -15298,21 +15717,24 @@ msgid "Local Address Books"
 msgstr "æåçéèé"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "List of clues for the attachment reminder plugin to look for in a message body"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
 msgstr "èéäæéåæçåçäæåéäåæçééåæå"
 
-#. Check buttons
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
+#: ../plugins/attachment-reminder/attachment-reminder.c:125
 msgid "_Do not show this message again."
 msgstr "äèåéçéåèæ(_D)"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:411
+#: ../plugins/attachment-reminder/attachment-reminder.c:457
+#: ../plugins/templates/templates.c:450
 msgid "Keywords"
 msgstr "ééå"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
 msgstr "Evolution åæåæääèèéäæåæéäçééåïåæäåéåéäã"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
@@ -15320,8 +15742,8 @@ msgid "Message has no attachments"
 msgstr "éäææéä"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add attachment..."
-msgstr "æåéä(_A)â"
+msgid "_Add Attachment..."
+msgstr "ååéä(_A)â"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
@@ -15343,156 +15765,162 @@ msgstr "èåéæ"
 msgid "Play audio attachments directly in mail messages."
 msgstr "çæææéääçéæéäã"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:186
 msgid "Select name of the Evolution backup file"
 msgstr "éæ Evolution åäææçåç"
 
-#: ../plugins/backup-restore/backup-restore.c:216
+#: ../plugins/backup-restore/backup-restore.c:219
 msgid "_Restart Evolution after backup"
 msgstr "åäåéæåå Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:242
+#: ../plugins/backup-restore/backup-restore.c:245
 msgid "Select name of the Evolution backup file to restore"
 msgstr "éæèéåç Evolution åäææåç"
 
-#: ../plugins/backup-restore/backup-restore.c:255
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid "_Restart Evolution after restore"
 msgstr "éååéæåå Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:323
-msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
-msgstr "æåäååääéå Evolutionãååäéåææçéäãèäæãåäãååéãéçäãåäåäéåæææçåäèåãéäéæåçã"
+#: ../plugins/backup-restore/backup-restore.c:326
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
+msgstr ""
+"æåäååääéå Evolutionãååäéåææçéäãèäæãåäãååéãé"
+"çäãåäåäéåæææçåäèåãéäéæåçã"
 
-#: ../plugins/backup-restore/backup-restore.c:330
+#: ../plugins/backup-restore/backup-restore.c:333
 msgid "_Restore Evolution from the backup file"
 msgstr "ååäææéå Evolution (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:337
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Please select an Evolution Archive to restore:"
 msgstr "éæèéåç Evolution ææåï"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:343
 msgid "Choose a file to restore"
 msgstr "éæèéåçææ"
 
-#: ../plugins/backup-restore/backup-restore.c:348
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Restore from backup"
 msgstr "ååäææéå"
 
-#: ../plugins/backup-restore/backup-restore.c:386
+#: ../plugins/backup-restore/backup-restore.c:389
 msgid "_Back up Evolution Data..."
 msgstr "åä Evolution èæ(_B)..."
 
-#: ../plugins/backup-restore/backup-restore.c:388
+#: ../plugins/backup-restore/backup-restore.c:391
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "å Evolution çèæèèåååäçææå"
 
-#: ../plugins/backup-restore/backup-restore.c:393
+#: ../plugins/backup-restore/backup-restore.c:396
 msgid "R_estore Evolution Data..."
 msgstr "éå Evolution èæ(_E)..."
 
-#: ../plugins/backup-restore/backup-restore.c:395
+#: ../plugins/backup-restore/backup-restore.c:398
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "åææåéå Evolution çèæèèåå"
 
-#: ../plugins/backup-restore/backup.c:79
+#: ../plugins/backup-restore/backup.c:77
 msgid "Back up Evolution directory"
 msgstr "åä Evolution èæå"
 
-#: ../plugins/backup-restore/backup.c:81
+#: ../plugins/backup-restore/backup.c:79
 msgid "Restore Evolution directory"
 msgstr "éå Evolution çé"
 
-#: ../plugins/backup-restore/backup.c:83
+#: ../plugins/backup-restore/backup.c:81
 msgid "Check Evolution Back up"
 msgstr "ææ Evolution åä"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../plugins/backup-restore/backup.c:83
 msgid "Restart Evolution"
 msgstr "éæåå Evolution"
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
 msgstr "äçååäçèäé"
 
-#: ../plugins/backup-restore/backup.c:289
-#: ../plugins/backup-restore/backup.c:399
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:295
+#: ../plugins/backup-restore/backup.c:412
 msgid "Shutting down Evolution"
 msgstr "æåéé Evolution"
 
-#: ../plugins/backup-restore/backup.c:296
+#: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution accounts and settings"
 msgstr "åä Evolution çåèèèåå"
 
-#: ../plugins/backup-restore/backup.c:304
+#: ../plugins/backup-restore/backup.c:314
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "æååä Evolution èæ (éäãéçäãèäæãåäãååé)"
 
-#: ../plugins/backup-restore/backup.c:317
+#: ../plugins/backup-restore/backup.c:327
 msgid "Back up complete"
 msgstr "åäåæ"
 
-#: ../plugins/backup-restore/backup.c:322
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:334
+#: ../plugins/backup-restore/backup.c:521
 msgid "Restarting Evolution"
 msgstr "éæåå Evolution"
 
-#: ../plugins/backup-restore/backup.c:403
+#: ../plugins/backup-restore/backup.c:418
 msgid "Back up current Evolution data"
 msgstr "åäçåç Evolution èæ"
 
-#: ../plugins/backup-restore/backup.c:409
+#: ../plugins/backup-restore/backup.c:426
 msgid "Extracting files from back up"
 msgstr "ååäèéææ"
 
-#: ../plugins/backup-restore/backup.c:466
+#: ../plugins/backup-restore/backup.c:485
 msgid "Loading Evolution settings"
 msgstr "æåèå Evolution çèåå"
 
-#: ../plugins/backup-restore/backup.c:481
+#: ../plugins/backup-restore/backup.c:502
 msgid "Removing temporary back up files"
 msgstr "çéæåçåäææ"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:514
 msgid "Ensuring local sources"
 msgstr "æåçèæåçäæ"
 
-#: ../plugins/backup-restore/backup.c:678
+#: ../plugins/backup-restore/backup.c:699
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æåäèèæå %s"
 
-#: ../plugins/backup-restore/backup.c:683
+#: ../plugins/backup-restore/backup.c:704
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "åèæåéå %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:728
 msgid "Evolution Back up"
 msgstr "Evolution åä"
 
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:728
 msgid "Evolution Restore"
 msgstr "Evolution éå"
 
-#: ../plugins/backup-restore/backup.c:743
+#: ../plugins/backup-restore/backup.c:766
 msgid "Backing up Evolution Data"
 msgstr "åä Evolution èæ"
 
-#: ../plugins/backup-restore/backup.c:744
+#: ../plugins/backup-restore/backup.c:767
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å Evolution åäæçèææèçåã"
 
-#: ../plugins/backup-restore/backup.c:746
+#: ../plugins/backup-restore/backup.c:769
 msgid "Restoring Evolution Data"
 msgstr "éå Evolution èæ"
 
-#: ../plugins/backup-restore/backup.c:747
+#: ../plugins/backup-restore/backup.c:770
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å Evolution éåæçèææèçåã"
 
-#: ../plugins/backup-restore/backup.c:765
+#: ../plugins/backup-restore/backup.c:788
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "éååäæèçæéåæææçåèäèæçååã"
 
@@ -15510,7 +15938,8 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "çåèéé Evolutionï"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected back up file?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected back up file?"
 msgstr "çåèåéåçåäææéå Evolutionï"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
@@ -15538,43 +15967,53 @@ msgid "The selected folder is not writable."
 msgstr "éåçèæåçæååã"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-msgid "To back up your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding."
-msgstr "èåäæçèæåèååïæåéåéé Evolutionãèçåæåççéèäååååääåæååçèæã"
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+"èåäæçèæåèååïæåéåéé Evolutionãèçåæåççéèäåååå"
+"ääåæååçèæã"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
-msgid "To restore your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding. This will delete all your current Evolution data and settings and restore them from your back up."
-msgstr "èéåæçèæåèååïæåéåéé Evolutionãèçåæåççéèäååååääåæååçèæãéååäæåéæçå Evolution ææçèæåèååïäåæçåäéåååã"
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your back "
+"up."
+msgstr ""
+"èéåæçèæåèååïæåéåéé Evolutionãèçåæåççéèäåååå"
+"ääåæååçèæãéååäæåéæçå Evolution ææçèæåèååïäåæ"
+"çåäéåååã"
 
-#: ../plugins/bbdb/bbdb.c:685
-#: ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:675 ../plugins/bbdb/bbdb.c:684
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "èåååçéçä"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:709
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Create _address book entries when sending mails"
 msgstr "ååééäæèååçéèééç(_A)"
 
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:705
 msgid "Select Address book for Automatic Contacts"
 msgstr "éæçèåååéçäççéèé"
 
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:720
 msgid "Instant Messaging Contacts"
 msgstr "åæèæéçä"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:745
+#: ../plugins/bbdb/bbdb.c:735
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "å Pidgin çååæååæéçäèèååç(_S)"
 
-#: ../plugins/bbdb/bbdb.c:751
+#: ../plugins/bbdb/bbdb.c:741
 msgid "Select Address book for Pidgin buddy list"
 msgstr "éæç Pidgin ååååççéèé"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:762
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Synchronize with _buddy list now"
 msgstr "çåèååæååæ(_B)"
 
@@ -15586,71 +16025,24 @@ msgstr "BBDB"
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
-"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 "äçååèåçççæçéèéäã\n"
 "\n"
-"åèéäæèååéèéäååååèéåéääåãåæäæåååæåäåå IM éçäèèã"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr "Bogofilter åæååãèååèåã"
-
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr "åçç %s æççéèï%s"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr "Bogofilter åçåææåæïäæåâ"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "çå Bogofilter åçåäæïççåâ"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "åçè Bogofilter åæïéèäçï%dã"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
-msgid "Convert message text to _Unicode"
-msgstr "åéäæåèæç _Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "åéäèæç Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
-msgstr "åéäæåèæç Unicode UTF-8 äçääèäååéç spam/ham çåã"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr "Bogofilter ååéäéæå"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "Bogofilter éé"
+"åèéäæèååéèéäååååèéåéääåãåæäæåååæåäåå IM "
+"éçäèèã"
 
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr "äç Bogofilter éæååéäã"
-
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 msgid "Authentication failed. Server requires correct login."
 msgstr "éèåæãäæåèææçççåã"
 
-#: ../plugins/caldav/caldav-browse-server.c:206
+#: ../plugins/caldav/caldav-browse-server.c:205
 msgid "Given URL cannot be found."
 msgstr "æäåæåç URLã"
 
-#: ../plugins/caldav/caldav-browse-server.c:210
+#: ../plugins/caldav/caldav-browse-server.c:209
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -15659,118 +16051,119 @@ msgstr ""
 "äæåååäæéæçèæã\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:340
-#: ../plugins/caldav/caldav-browse-server.c:664
+#: ../plugins/caldav/caldav-browse-server.c:339
+#: ../plugins/caldav/caldav-browse-server.c:663
 msgid "Failed to parse server response."
 msgstr "çæåæäæåçåæã"
 
-#: ../plugins/caldav/caldav-browse-server.c:434
+#: ../plugins/caldav/caldav-browse-server.c:433
 msgid "Events"
 msgstr "ää"
 
-#: ../plugins/caldav/caldav-browse-server.c:456
+#: ../plugins/caldav/caldav-browse-server.c:455
 msgid "User's calendars"
 msgstr "äçèçèäæ"
 
-#: ../plugins/caldav/caldav-browse-server.c:565
-#: ../plugins/caldav/caldav-browse-server.c:733
+#: ../plugins/caldav/caldav-browse-server.c:564
+#: ../plugins/caldav/caldav-browse-server.c:732
 msgid "Failed to get server URL."
 msgstr "çæååäæå URLã"
 
-#: ../plugins/caldav/caldav-browse-server.c:731
-#: ../plugins/caldav/caldav-browse-server.c:772
-#: ../plugins/caldav/caldav-browse-server.c:1431
+#: ../plugins/caldav/caldav-browse-server.c:730
+#: ../plugins/caldav/caldav-browse-server.c:771
+#: ../plugins/caldav/caldav-browse-server.c:1430
 msgid "Searching for user's calendars..."
 msgstr "æåæåäçèçèäæâ"
 
-#: ../plugins/caldav/caldav-browse-server.c:770
+#: ../plugins/caldav/caldav-browse-server.c:769
 msgid "Could not find any user calendar."
 msgstr "æäåäääçèèäæã"
 
-#: ../plugins/caldav/caldav-browse-server.c:902
+#: ../plugins/caldav/caldav-browse-server.c:901
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "åäæçåèåæï%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:904
+#: ../plugins/caldav/caldav-browse-server.c:903
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "åäæçåèåæäçç %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:909
+#: ../plugins/caldav/caldav-browse-server.c:908
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "èåäçè %s åäæå %s äçåç "
 
-#: ../plugins/caldav/caldav-browse-server.c:968
+#: ../plugins/caldav/caldav-browse-server.c:967
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "äèåç URLã%sãç soup èæ"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1214
+#: ../plugins/caldav/caldav-browse-server.c:1213
 msgid "Searching folder content..."
 msgstr "æåèæåååâ"
 
-#: ../plugins/caldav/caldav-browse-server.c:1263
-#: ../plugins/caldav/caldav-source.c:256
+#: ../plugins/caldav/caldav-browse-server.c:1262
+#: ../plugins/caldav/caldav-source.c:258
 msgid "Server _handles meeting invitations"
 msgstr "äæåèçæèéè(_H)"
 
-#: ../plugins/caldav/caldav-browse-server.c:1270
+#: ../plugins/caldav/caldav-browse-server.c:1269
 msgid "List of available calendars:"
 msgstr "åççèäæçæåï"
 
-#: ../plugins/caldav/caldav-browse-server.c:1308
+#: ../plugins/caldav/caldav-browse-server.c:1307
 msgid "Supports"
 msgstr "ææ"
 
-#: ../plugins/caldav/caldav-browse-server.c:1335
-#: ../plugins/caldav/caldav-source.c:254
-msgid "User e-_mail:"
-msgstr "äçè e-_mailï"
+#: ../plugins/caldav/caldav-browse-server.c:1334
+#: ../plugins/caldav/caldav-source.c:256
+msgid "User e_mail:"
+msgstr "äçè e_mailï"
 
-#: ../plugins/caldav/caldav-browse-server.c:1407
+#: ../plugins/caldav/caldav-browse-server.c:1406
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "çæåçåèçï%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1516
+#: ../plugins/caldav/caldav-browse-server.c:1515
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "äæå URLã%sãäæææç URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1522
+#: ../plugins/caldav/caldav-browse-server.c:1521
 msgid "Browse for a CalDAV calendar"
 msgstr "çè CalDAV èäæ"
 
-#: ../plugins/caldav/caldav-source.c:235
-#: ../plugins/calendar-http/calendar-http.c:100
+#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/calendar-http/calendar-http.c:104
 msgid "_URL:"
 msgstr "çå(_U):"
 
-#: ../plugins/caldav/caldav-source.c:242
-#: ../plugins/google-account-setup/google-contacts-source.c:349
-msgid "Use _SSL"
-msgstr "äç _SSL"
-
 #: ../plugins/caldav/caldav-source.c:244
-#: ../plugins/google-account-setup/google-contacts-source.c:327
-#: ../plugins/google-account-setup/google-source.c:638
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:268
+#: ../plugins/calendar-http/calendar-http.c:138
+#: ../plugins/google-account-setup/google-contacts-source.c:351
+msgid "Use _secure connection"
+msgstr "äçååéç(_S)"
+
+#: ../plugins/caldav/caldav-source.c:246
+#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/google-account-setup/google-source.c:652
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
 msgid "User_name:"
 msgstr "äçèåç(_N):"
 
-#: ../plugins/caldav/caldav-source.c:259
+#: ../plugins/caldav/caldav-source.c:261
 msgid "Brows_e server for a calendar"
 msgstr "çèäæåçèäæ(_E)"
 
-#: ../plugins/caldav/caldav-source.c:277
-#: ../plugins/calendar-file/calendar-file.c:191
-#: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:399
-#: ../plugins/google-account-setup/google-contacts-source.c:367
-#: ../plugins/google-account-setup/google-source.c:645
+#: ../plugins/caldav/caldav-source.c:279
+#: ../plugins/calendar-file/calendar-file.c:195
+#: ../plugins/calendar-http/calendar-http.c:123
+#: ../plugins/calendar-weather/calendar-weather.c:403
+#: ../plugins/google-account-setup/google-contacts-source.c:369
+#: ../plugins/google-account-setup/google-source.c:659
 msgid "Re_fresh:"
 msgstr "éææç(_F):"
 
@@ -15782,31 +16175,31 @@ msgstr "åå Evolution å CalDAV çææã"
 msgid "CalDAV Support"
 msgstr "CalDAV ææ"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:129
 msgid "_Customize options"
 msgstr "èèéé(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "File _name:"
 msgstr "ææåç(_N):"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:152
 msgid "Choose calendar file"
 msgstr "éæèäæææ"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "On open"
 msgstr "æéåç"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:201
 msgid "On file change"
 msgstr "æèæçææ"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:202
 msgid "Periodically"
 msgstr "éææç"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:217
 msgid "Force read _only"
 msgstr "åååè(_O)"
 
@@ -15818,11 +16211,7 @@ msgstr "åæåçèäæåå Evolutionã"
 msgid "Local Calendars"
 msgstr "æåèäæ"
 
-#: ../plugins/calendar-http/calendar-http.c:134
-msgid "_Secure connection"
-msgstr "ååéç(_S)"
-
-#: ../plugins/calendar-http/calendar-http.c:194
+#: ../plugins/calendar-http/calendar-http.c:198
 msgid "Userna_me:"
 msgstr "äçèåç(_M):"
 
@@ -15834,62 +16223,62 @@ msgstr "åçèèäæåå Evolutionã"
 msgid "Web Calendars"
 msgstr "çèèäæ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Fog"
 msgstr "åæïèé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Cloudy"
 msgstr "åæïåé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy Night"
 msgstr "åæïåéçåæ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Overcast"
 msgstr "åæïåé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Showers"
 msgstr "åæïéé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Snow"
 msgstr "åæïäé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Sunny"
 msgstr "åæïèé"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Clear Night"
 msgstr "åæïææçåæ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:72
 msgid "Weather: Thunderstorms"
 msgstr "åæïéæ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:226
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "éæäåäç"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:332
-#: ../plugins/calendar-weather/calendar-weather.c:377
+#: ../plugins/calendar-weather/calendar-weather.c:336
+#: ../plugins/calendar-weather/calendar-weather.c:381
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "ææ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:452
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "_Units:"
 msgstr "åä(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:461
+#: ../plugins/calendar-weather/calendar-weather.c:465
 msgid "Metric (Celsius, cm, etc)"
 msgstr "åå(ææãååç)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:464
+#: ../plugins/calendar-weather/calendar-weather.c:468
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "èå(èæãååç)"
 
@@ -15901,24 +16290,7 @@ msgstr "åå Evolution ååæèäæçææã"
 msgid "Weather Calendars"
 msgstr "æèèäæ"
 
-#: ../plugins/contacts-map/contacts-map.c:55
-#: ../plugins/contacts-map/contacts-map.c:201
-msgid "Contacts map"
-msgstr "éçäåå"
-
-#: ../plugins/contacts-map/contacts-map.c:56
-msgid "Show a map of all the contacts"
-msgstr "éçææéçäçåå"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
-msgid "Add a map showing the location of contacts when possible."
-msgstr "ååäçæåååäåååäéçéçäçäçã"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-msgid "Map for contacts"
-msgstr "éçäçåå"
-
-#: ../plugins/dbx-import/dbx-importer.c:273
+#: ../plugins/dbx-import/dbx-importer.c:282
 msgid "Importing Outlook Express data"
 msgstr "æååå Outlook Express èæ"
 
@@ -15934,23 +16306,23 @@ msgstr "Outlook DBX åå"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Outlook Express 5/6 åäèæå (.dbx)"
 
-#: ../plugins/default-source/default-source.c:83
+#: ../plugins/default-source/default-source.c:87
 msgid "Mark as _default address book"
 msgstr "æççéèéèé(_D)"
 
-#: ../plugins/default-source/default-source.c:96
+#: ../plugins/default-source/default-source.c:100
 msgid "A_utocomplete with this address book"
 msgstr "çéåéèééèèååæ(_U)"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:109
 msgid "Mark as _default calendar"
 msgstr "æççéèèäæ(_D)"
 
-#: ../plugins/default-source/default-source.c:106
+#: ../plugins/default-source/default-source.c:110
 msgid "Mark as _default task list"
 msgstr "æççéèåäæå(_D)"
 
-#: ../plugins/default-source/default-source.c:107
+#: ../plugins/default-source/default-source.c:111
 msgid "Mark as _default memo list"
 msgstr "æççéèååéæå(_D)"
 
@@ -15967,8 +16339,13 @@ msgid "List of Custom Headers"
 msgstr "èèæéçæå"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
-msgstr "éåéåæåçææåäååååéäçèèæéæåãæåæéèæéæåçæåçïèèæéåçåäã=ãïåéçæååäã;ãéé"
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"éåéåæåçææåäååååéäçèèæéæåãæåæéèæéæåçæå"
+"çïèèæéåçåäã=ãïåéçæååäã;ãéé"
 
 #: ../plugins/email-custom-header/email-custom-header.c:316
 msgctxt "email-custom-header-Security"
@@ -16028,7 +16405,7 @@ msgid "Key"
 msgstr "èåé"
 
 #: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:417
+#: ../plugins/templates/templates.c:456
 msgid "Values"
 msgstr "æå"
 
@@ -16050,7 +16427,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "åéäçèåäæäæéæèååèçèå"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:125
+#: ../plugins/external-editor/external-editor.c:131
 msgid "Automatically launch when a new mail is edited"
 msgstr "ççèæéäæèååè"
 
@@ -16062,11 +16439,11 @@ msgstr "éèåéçèå"
 msgid "The default command that must be used as the editor."
 msgstr "éèçæäåéèåççèåã"
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:120
 msgid "Command to be executed to launch the editor: "
 msgstr "çäååçèåçæä: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:121
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16074,8 +16451,8 @@ msgstr ""
 "Emacs äçãxemacsã\n"
 "VI äçãgvim -fã"
 
-#: ../plugins/external-editor/external-editor.c:381
-#: ../plugins/external-editor/external-editor.c:383
+#: ../plugins/external-editor/external-editor.c:399
+#: ../plugins/external-editor/external-editor.c:401
 msgid "Compose in External Editor"
 msgstr "ååéçèåäæå"
 
@@ -16096,7 +16473,9 @@ msgid "Editor not launchable"
 msgstr "çèåçæåå"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
-msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
 msgstr "Evoluton çæåççäååæéäçæåææãèçååèã"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
@@ -16104,20 +16483,29 @@ msgid "External editor still running"
 msgstr "åéçèåäååèä"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
-msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
 msgstr "åéçèåäååèäãåèèçèåäåäçïéäçèåèçåäèééã"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
-msgstr "äèåååæåæçåååèåäèåçåéçèåãèèèèåäåççèåã"
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"äèåååæåæçåååèåäèåçåéçèåãèèèèåäåççèåã"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr "éèæååéç"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
-msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens."
-msgstr "æåéèåååéääæååéçãåæåéåééäååéåèååççïååäææääææã"
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+"æåéèåååéääæååéçãåæåéåééäååéåèååççïååäæ"
+"æääææã"
 
 #: ../plugins/face/face.c:286
 msgid "Select a Face Picture"
@@ -16167,17 +16555,17 @@ msgstr "äèèåéåææ"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "æéåçææäääæææç .png åçãéèï{0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
+#: ../plugins/google-account-setup/google-contacts-source.c:317
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:243
 msgid "Server"
 msgstr "äæå"
 
-#: ../plugins/google-account-setup/google-source.c:438
+#: ../plugins/google-account-setup/google-source.c:443
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "èåäçè %s çåçäåååèéçèäææåã"
 
-#: ../plugins/google-account-setup/google-source.c:549
+#: ../plugins/google-account-setup/google-source.c:560
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16186,17 +16574,17 @@ msgstr ""
 "äèå Google äæåèåèæã\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:737
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/google-account-setup/google-source.c:560
+#: ../plugins/mail-to-task/mail-to-task.c:796
+#: ../plugins/mail-to-task/mail-to-task.c:1045
 msgid "Unknown error."
 msgstr "äæçéèã"
 
-#: ../plugins/google-account-setup/google-source.c:649
+#: ../plugins/google-account-setup/google-source.c:663
 msgid "Cal_endar:"
 msgstr "èäæ(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:684
+#: ../plugins/google-account-setup/google-source.c:698
 msgid "Retrieve _List"
 msgstr "ååæå(_L)"
 
@@ -16208,434 +16596,6 @@ msgstr "å Google ææåå Evolutionã"
 msgid "Google Calendars"
 msgstr "Google ææ"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:453
-msgid "Checklist"
-msgstr "æææå"
-
-#. Translators: First %s is the server name, second %s is user name
-#: ../plugins/groupwise-features/camel-gw-listener.c:513
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "èå %s (äçè %s) çåç "
-
-#: ../plugins/groupwise-features/camel-gw-listener.c:533
-msgid "Failed to authenticate.\n"
-msgstr "éèæèåæã\n"
-
-#: ../plugins/groupwise-features/gw-ui.c:112
-msgid "New _Shared Folder..."
-msgstr "æååäèæå(_S)â"
-
-#: ../plugins/groupwise-features/gw-ui.c:119
-msgid "_Proxy Login..."
-msgstr "äçäæåçå(_P)â"
-
-#: ../plugins/groupwise-features/gw-ui.c:170
-msgid "Junk Mail Settings..."
-msgstr "ååéäèååâ"
-
-#: ../plugins/groupwise-features/gw-ui.c:177
-msgid "Track Message Status..."
-msgstr "èèéäçæâ"
-
-#: ../plugins/groupwise-features/gw-ui.c:183
-msgid "Retract Mail"
-msgstr "æåéä"
-
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "æå"
-
-#: ../plugins/groupwise-features/gw-ui.c:338
-msgid "Accept Tentatively"
-msgstr "ææåç"
-
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "æç"
-
-#: ../plugins/groupwise-features/gw-ui.c:352
-msgid "Rese_nd Meeting..."
-msgstr "éåæè(_N)â"
-
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
-msgid "Create folder"
-msgstr "åçèæå"
-
-#: ../plugins/groupwise-features/install-shared.c:230
-#, c-format
-msgid ""
-"The user '%s' has shared a folder with you\n"
-"\n"
-"Message from '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Click 'Apply' to install the shared folder\n"
-"\n"
-msgstr ""
-"äçèã%sãåäääåèæåçæ\n"
-"\n"
-"äèã%sãçèæ\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"æãåçãäåèåäèæå\n"
-"\n"
-
-#: ../plugins/groupwise-features/install-shared.c:242
-msgid "Install the shared folder"
-msgstr "åèåäèæå"
-
-#: ../plugins/groupwise-features/install-shared.c:246
-msgid "Shared Folder Installation"
-msgstr "åäèæååè"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:82
-msgid "Junk Settings"
-msgstr "ååéäèåå"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:96
-#: ../plugins/groupwise-features/junk-settings.ui.h:3
-msgid "Junk Mail Settings"
-msgstr "ååéäèåå"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:1
-msgid "Email:"
-msgstr "éåéä:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:2
-msgid "Junk List:"
-msgstr "ååéäæåï"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:6
-msgid "_Enable"
-msgstr "åç(_E)"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:7
-msgid "_Junk List"
-msgstr "ååéäæå(_J)"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:12
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "çé(_R)"
-
-#: ../plugins/groupwise-features/mail-retract.c:81
-msgid "Message Retract"
-msgstr "éäæå"
-
-#: ../plugins/groupwise-features/mail-retract.c:90
-msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?"
-msgstr "æåéäåèæåèéäèæäèçäççéãæçåèééåï"
-
-#: ../plugins/groupwise-features/mail-retract.c:111
-msgid "Message retracted successfully"
-msgstr "éäåæåæå"
-
-#: ../plugins/groupwise-features/mail-send-options.c:202
-msgid "Insert Send options"
-msgstr "æååééé"
-
-#: ../plugins/groupwise-features/notification.ui.h:3
-#: ../plugins/groupwise-features/properties.ui.h:6
-msgid "The participants will receive the following notification.\n"
-msgstr "åèèåææåäåéçã\n"
-
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to GroupWise messages"
-msgstr "å åé ééåå GroupWise èæ"
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "Fine-tune your GroupWise accounts."
-msgstr "æèæç GroupWise åèã"
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "GroupWise Features"
-msgstr "GroupWise åè"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
-msgid "Message retract failed"
-msgstr "éäåæåæ"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
-msgid "The server did not allow the selected message to be retracted."
-msgstr "æäæåäåèåéåçéäåæã"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "åçæåçç &quot;{0}&quot; çåèååãèæææçèæåçæã"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "åèååå"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
-msgid "Invalid user"
-msgstr "çæçäçè"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
-msgstr "ä &quot;{0}&quot; çåäçäæååæãèæææçéåéääåäåèäæã"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
-msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "äèèäçè &quot;{0}&quot; ååäçäæå"
-
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
-msgid "Specify User"
-msgstr "æåäçè"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
-msgid "You have already given proxy permissions to this user."
-msgstr "æåçåäçäæåçæéçäéåäçèã"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
-msgid "You have to specify a valid user name to give proxy rights."
-msgstr "æåéæåææçäçèåçäååäçäæåæéã"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "æäèèæåçäçè &quot;{0}&quot; åäéåèæå"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "æåéæåèååæåäçèåç"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-msgid "Do you want to resend the meeting?"
-msgstr "æåèéæåééåæèï"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-msgid "Do you want to resend the recurring meeting?"
-msgstr "æåèéæåéæéæææèï"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-msgid "Do you want to retract the original item?"
-msgstr "æåèæåååçéçï"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
-msgid "The original will be removed from the recipient's mailbox."
-msgstr "æåäååæäèçäçäçéã"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
-msgid "This is a recurring meeting"
-msgstr "éæéæææè"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
-msgid "This will create a new meeting using the existing meeting details."
-msgstr "éæäçæåçæèèçèæåçæçæèã"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
-msgstr "éæäçæåçæèèçèæåçæçæèãåäéææèåçéåéèéæèåã"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
-msgid "Would you like to accept it?"
-msgstr "ææèæåååï"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
-msgid "Would you like to decline it?"
-msgstr "ææèæçååï"
-
-#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "C_ustomize notification message"
-msgstr "èèéçèæ(_U)"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
-msgid "Con_tacts..."
-msgstr "éçä(_T)â"
-
-#: ../plugins/groupwise-features/properties.ui.h:4
-msgid "Shared Folder Notification"
-msgstr "åäèæåéç"
-
-#: ../plugins/groupwise-features/properties.ui.h:8
-msgid "Users:"
-msgstr "äçèï"
-
-#: ../plugins/groupwise-features/properties.ui.h:11
-msgid "_Not Shared"
-msgstr "æåä(_N)"
-
-#: ../plugins/groupwise-features/properties.ui.h:13
-msgid "_Shared With..."
-msgstr "åäç(_S)â"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
-msgid "Access Rights"
-msgstr "ååæå"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
-msgid "Add/Edit"
-msgstr "åå/çè"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
-msgid "Con_tacts"
-msgstr "éçä(_T)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
-msgid "Modify _folders/options/rules/"
-msgstr "çèèæå/éé/èå/(_F)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
-msgid "Read items marked _private"
-msgstr "èåæèççäçéç(_P)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
-msgid "Reminder Notes"
-msgstr "æéååè"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
-msgid "Subscribe to my _alarms"
-msgstr "èéèæçéé(_A)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
-msgid "Subscribe to my _notifications"
-msgstr "èéèæçéç(_N)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
-msgid "_Write"
-msgstr "åå(_W)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
-msgid "permission to read|_Read"
-msgstr "è(_R)"
-
-#: ../plugins/groupwise-features/proxy-listing.ui.h:1
-msgid "Proxy"
-msgstr "äçäæå"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:239
-msgid "Account Name"
-msgstr "åèåç"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
-msgid "Proxy Login"
-msgstr "çåäçäæå"
-
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:494
-#: ../plugins/groupwise-features/send-options.c:84
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sèèå %s æéçåç(äçè %s)"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
-msgid "The Proxy tab will be available only when the account is online."
-msgstr "äçäæåéçåæååèäçæææåçã"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:704
-msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "äçäæåéçåæååçæåèæææåçã"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:709
-msgctxt "GW"
-msgid "Proxy"
-msgstr "äç"
-
-#: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:694
-msgid "Add User"
-msgstr "ååäçè"
-
-#: ../plugins/groupwise-features/send-options.c:214
-msgid "Advanced send options"
-msgstr "ééåééé"
-
-#: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:729
-msgid "Users"
-msgstr "äçè"
-
-#: ../plugins/groupwise-features/share-folder-common.c:317
-msgid "Enter the users and set permissions"
-msgstr "èåäçèäèåæé"
-
-#: ../plugins/groupwise-features/share-folder-common.c:418
-msgid "Sharing"
-msgstr "åä"
-
-#: ../plugins/groupwise-features/share-folder.c:532
-msgid "Custom Notification"
-msgstr "èèéç"
-
-#: ../plugins/groupwise-features/share-folder.c:734
-msgid "Add   "
-msgstr "æå"
-
-#: ../plugins/groupwise-features/share-folder.c:740
-msgid "Modify"
-msgstr "äæ"
-
-#: ../plugins/groupwise-features/status-track.c:125
-msgid "Message Status"
-msgstr "éäçæ"
-
-#. Subject
-#: ../plugins/groupwise-features/status-track.c:139
-msgid "Subject:"
-msgstr "äæ:"
-
-#: ../plugins/groupwise-features/status-track.c:153
-msgid "From:"
-msgstr "åäè:"
-
-#: ../plugins/groupwise-features/status-track.c:168
-msgid "Creation date:"
-msgstr "åçææ:"
-
-#: ../plugins/groupwise-features/status-track.c:208
-msgid "Recipient: "
-msgstr "æäè:"
-
-#: ../plugins/groupwise-features/status-track.c:215
-msgid "Delivered: "
-msgstr "åéé:"
-
-#: ../plugins/groupwise-features/status-track.c:221
-msgid "Opened: "
-msgstr "åéå:"
-
-#: ../plugins/groupwise-features/status-track.c:226
-msgid "Accepted: "
-msgstr "åæå:"
-
-#: ../plugins/groupwise-features/status-track.c:231
-msgid "Deleted: "
-msgstr "ååé:"
-
-#: ../plugins/groupwise-features/status-track.c:236
-msgid "Declined: "
-msgstr "ååæ:"
-
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Completed: "
-msgstr "ååæ: "
-
-#: ../plugins/groupwise-features/status-track.c:246
-msgid "Undelivered: "
-msgstr "æéé:"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "èååç"
@@ -16644,12 +16604,12 @@ msgstr "èååç"
 msgid "View image attachments directly in mail messages."
 msgstr "çæåéääéçåçã"
 
-#: ../plugins/imap-features/imap-headers.c:329
+#: ../plugins/imap-features/imap-headers.c:333
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "èèæé"
 
-#: ../plugins/imap-features/imap-headers.c:342
+#: ../plugins/imap-features/imap-headers.c:346
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP æé"
@@ -16660,7 +16620,8 @@ msgstr "åæèéäèåæé(éèå)"
 
 #: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
 "æäåäåæææéäåææèææçéåæéã\n"
@@ -16676,7 +16637,7 @@ msgstr ""
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "åææé(_B) - (æå)\n"
@@ -16696,201 +16657,208 @@ msgstr "IMAP åè"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:490
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "çæèåèäæã%sã(%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:654
+#: ../plugins/itip-formatter/itip-formatter.c:631
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "èäæ '%s' äççæåéåæèçèç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:655
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "åæåèäæã%sãäççæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:761
 msgid "Unable to find any calendars"
 msgstr "æäåääèäæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this meeting in any calendar"
 msgstr "çæåääèäæäæåéåçæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:772
 msgid "Unable to find this task in any task list"
 msgstr "çæåääåäæåäæåééåä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:804
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find this memo in any memo list"
 msgstr "çæåääååéæåäæåééååé"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
-msgid "Opening the calendar. Please wait.."
+#: ../plugins/itip-formatter/itip-formatter.c:1026
+msgid "Opening the calendar. Please wait..."
 msgstr "æåéåèäæãèçåâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:883
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Searching for an existing version of this appointment"
 msgstr "åæéåçææåççæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1166
+#: ../plugins/itip-formatter/itip-formatter.c:1302
 msgid "Unable to parse item"
 msgstr "çæåæéç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1391
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "çæåééçèèäæã%sãã%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1403
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "åéèèäæ '%s' äèçåæå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "åéèèäæ '%s' äèçäçåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "åéèèäæ '%s' äèçååæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "åéèèäæã%sãäèçååæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1511
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æèåéäåçéäçä %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "Sent a cancelation notice to the delegate"
 msgstr "åéåæéççäçä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1520
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "çæåéåæéççäçä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1495
+#: ../plugins/itip-formatter/itip-formatter.c:1631
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "çæäåæççæäååæèçæçæææï"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1660
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "çæææåæèã%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1528
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid "Attendee status updated"
 msgstr "åæèçæåææ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1532
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "åæèçæäèææïåçéçåçäåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1554
+#: ../plugins/itip-formatter/itip-formatter.c:1690
 msgid "Meeting information sent"
 msgstr "æèèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1693
 msgid "Task information sent"
 msgstr "åäèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1560
+#: ../plugins/itip-formatter/itip-formatter.c:1696
 msgid "Memo information sent"
 msgstr "ååéèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1569
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "çæååæèèèïèæèääåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1708
 msgid "Unable to send task information, the task does not exist"
 msgstr "çæåååäèèïèéåääåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1711
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "çæååååéèèïèååéääåå"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1776
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1645
+#: ../plugins/itip-formatter/itip-formatter.c:1781
 msgid "Save Calendar"
 msgstr "ååèäæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1703
-#: ../plugins/itip-formatter/itip-formatter.c:1714
+#: ../plugins/itip-formatter/itip-formatter.c:1839
+#: ../plugins/itip-formatter/itip-formatter.c:1850
 msgid "The calendar attached is not valid"
 msgstr "éåçèäææçæç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1704
-#: ../plugins/itip-formatter/itip-formatter.c:1715
-msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:1840
+#: ../plugins/itip-formatter/itip-formatter.c:1851
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "æéäååååæèäæååïäåèäæäéææç iCalendarã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1755
-#: ../plugins/itip-formatter/itip-formatter.c:1783
-#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1891
+#: ../plugins/itip-formatter/itip-formatter.c:1919
+#: ../plugins/itip-formatter/itip-formatter.c:2028
 msgid "The item in the calendar is not valid"
 msgstr "èäæäçéçæçæç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1756
-#: ../plugins/itip-formatter/itip-formatter.c:1784
-#: ../plugins/itip-formatter/itip-formatter.c:1893
-msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
-msgstr "æéäçååæèäæååïäèååäæååääääãåäæçé/åçèè"
+#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1920
+#: ../plugins/itip-formatter/itip-formatter.c:2029
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"æéäçååæèäæååïäèååäæååääääãåäæçé/åçèè"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../plugins/itip-formatter/itip-formatter.c:1933
 msgid "The calendar attached contains multiple items"
 msgstr "éåçèäæåååæååéç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1798
-msgid "To process all of these items, the file should be saved and the calendar imported"
+#: ../plugins/itip-formatter/itip-formatter.c:1934
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
 msgstr "èèçéäåéçéçïæèåæææååååååäçèäæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2592
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ææ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2476
+#: ../plugins/itip-formatter/itip-formatter.c:2608
 msgid "Tentatively Accepted"
 msgstr "æææå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2594
+#: ../plugins/itip-formatter/itip-formatter.c:2726
 msgid "This meeting recurs"
 msgstr "éåæèçéæèåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2597
+#: ../plugins/itip-formatter/itip-formatter.c:2729
 msgid "This task recurs"
 msgstr "ééåäçéæèåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2600
+#: ../plugins/itip-formatter/itip-formatter.c:2732
 msgid "This memo recurs"
 msgstr "éåååéçéæèåç"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2834
+#: ../plugins/itip-formatter/itip-formatter.c:2976
 msgid "_Delete message after acting"
 msgstr "åæååééä(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2844
-#: ../plugins/itip-formatter/itip-formatter.c:2877
+#: ../plugins/itip-formatter/itip-formatter.c:2986
+#: ../plugins/itip-formatter/itip-formatter.c:3019
 msgid "Conflict Search"
 msgstr "èççæå"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2859
+#: ../plugins/itip-formatter/itip-formatter.c:3001
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "éæèæåæèèççèäæ"
 
@@ -17085,7 +17053,9 @@ msgstr "%s åæååäåæåçæèï"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "%s through %s wishes to receive the latest information for the following meeting:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
 msgstr "%s éé %s åææåäåæèçææèèï"
 
 #: ../plugins/itip-formatter/itip-view.c:400
@@ -17170,12 +17140,15 @@ msgstr "%s åæååäéæåçåäï"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "%s through %s wishes to receive the latest information for the following assigned task:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
 msgstr "%s éé %s åææåäåææåäçææèèï"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "%s wishes to receive the latest information for the following assigned task:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s åææåäåææåäçææèèï"
 
 #: ../plugins/itip-formatter/itip-view.c:492
@@ -17258,7 +17231,7 @@ msgstr "éåæï"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../plugins/itip-formatter/itip-view.c:1055
 msgid "Start time:"
 msgstr "éåæé:"
 
@@ -17268,100 +17241,100 @@ msgstr "çææï"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../plugins/itip-formatter/itip-view.c:1066
 msgid "End time:"
 msgstr "çææé:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Open Calendar"
 msgstr "éåèäæ(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:849
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:876
-#: ../plugins/itip-formatter/itip-view.c:881
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Decline"
 msgstr "æç(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:878
-#: ../plugins/itip-formatter/itip-view.c:883
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:879
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "A_ccept"
 msgstr "æå(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Decline all"
 msgstr "åéæç(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:855
 msgid "_Tentative all"
 msgstr "åéæè(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:877
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
 msgid "_Tentative"
 msgstr "æè(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:856
 msgid "A_ccept all"
 msgstr "åéæå(_C)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "_Send Information"
 msgstr "åéèè(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Update Attendee Status"
 msgstr "ææååçæ(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:873
+#: ../plugins/itip-formatter/itip-view.c:874
 msgid "_Update"
 msgstr "ææ(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1085
-#: ../plugins/itip-formatter/itip-view.c:1139
+#: ../plugins/itip-formatter/itip-view.c:1086
+#: ../plugins/itip-formatter/itip-view.c:1140
 msgid "Comment:"
 msgstr "èè:"
 
-#: ../plugins/itip-formatter/itip-view.c:1124
+#: ../plugins/itip-formatter/itip-view.c:1125
 msgid "Send _reply to sender"
 msgstr "åèåäè(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "Send _updates to attendees"
 msgstr "åéææçåæè(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "_Apply to all instances"
 msgstr "åçèææåé(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1173
 msgid "Show time as _free"
 msgstr "éçæéççé(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1176
 msgid "_Preserve my reminder"
 msgstr "äçæçæé(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1181
+#: ../plugins/itip-formatter/itip-view.c:1182
 msgid "_Inherit reminder"
 msgstr "çææé(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1924
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Tasks:"
 msgstr "åä(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1926
+#: ../plugins/itip-formatter/itip-view.c:1927
 msgid "_Memos:"
 msgstr "ååé(_M):"
 
@@ -17382,7 +17355,8 @@ msgid "This meeting has been delegated"
 msgstr "éåæèååæ"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "éååèäéäèçåçåæèãååääååçåæèï"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
@@ -17390,66 +17364,52 @@ msgid "Beep or play sound file."
 msgstr "çååèæææèéææã"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "åç D-Bus èæã"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "åçéçåçåçã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "çæéäåéæçç D-BUS èæã"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr "åæçãtrueãïåçæéäæéæçååèåååææèéæã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "åéçæäåçæéäã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "çæéäåéæææèéææã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "åæäæäçåèæåïåæéäéåæææäéçéæã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
-msgstr "ååçäååæéäã"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "çæéäåéæåéçåéçæéäåçã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
 msgstr "èææçèéææåçã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "æéäéåæèææçéæææïåæäæäçåèæåã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Use sound theme"
 msgstr "äçéæäé"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "çæéäåéææåææèéæææçååèã"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "æååæéäæéææåçäååèæã"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æååéçæäåçæéäã"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:394
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17460,72 +17420,60 @@ msgid_plural ""
 msgstr[0] ""
 "æåçææ %d åéä ã \n"
 "äæ %sã"
-msgstr[1] ""
-"æåçææ %d åéä ã \n"
-"äæ %sã"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:410
-#, c-format
-msgid "From: %s"
-msgstr "åäèï%s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:423
+#: ../plugins/mail-notification/mail-notification.c:419
 #, c-format
 msgid "Subject: %s"
 msgstr "äæï%s"
 
-#: ../plugins/mail-notification/mail-notification.c:433
+#: ../plugins/mail-notification/mail-notification.c:430
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "æåçææ %d åéä ã "
-msgstr[1] "æåçææ %d åéä ã "
 
-#: ../plugins/mail-notification/mail-notification.c:446
-#: ../plugins/mail-notification/mail-notification.c:454
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:439
+#: ../plugins/mail-notification/mail-notification.c:447
+#: ../plugins/mail-notification/mail-notification.c:450
 msgid "New email"
 msgstr "æéä"
 
-#: ../plugins/mail-notification/mail-notification.c:506
-msgid "Show icon in _notification area"
-msgstr "åéçåäéçåç(_N)"
-
-#: ../plugins/mail-notification/mail-notification.c:536
-msgid "Popup _message together with the icon"
-msgstr "ååçäååèæ(_M)"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:471
+#, c-format
+msgid "Show %s"
+msgstr "éç %s"
 
-#: ../plugins/mail-notification/mail-notification.c:723
-msgid "_Play sound when new messages arrive"
+#: ../plugins/mail-notification/mail-notification.c:673
+msgid "_Play sound when a new message arrives"
 msgstr "çæéäåéæææèéææ(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:753
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "_Beep"
 msgstr "åè(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:766
+#: ../plugins/mail-notification/mail-notification.c:716
 msgid "Use sound _theme"
 msgstr "äçéæäé(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _file:"
 msgstr "ææææ(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:796
+#: ../plugins/mail-notification/mail-notification.c:744
 msgid "Select sound file"
 msgstr "éæèéææ"
 
-#: ../plugins/mail-notification/mail-notification.c:854
+#: ../plugins/mail-notification/mail-notification.c:801
 msgid "Notify new messages for _Inbox only"
 msgstr "åéçæäåçæéä(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:863
-msgid "Generate a _D-Bus message"
-msgstr "çç _D-Bus èæ"
+#: ../plugins/mail-notification/mail-notification.c:811
+msgid "Show _notification when a new message arrives"
+msgstr "çæéäåéæéçéç(_N)"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -17536,138 +17484,131 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "çæéäåéæéçæã"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:157
+#: ../plugins/mail-to-task/mail-to-task.c:235
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "å %s çéäæåç"
 
-#: ../plugins/mail-to-task/mail-to-task.c:490
+#: ../plugins/mail-to-task/mail-to-task.c:586
 #, c-format
-msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr "éåçèäæåçååääã%sããæåèçèæèçääï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:493
+#: ../plugins/mail-to-task/mail-to-task.c:589
 #, c-format
-msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
 msgstr "éåçåäæååçåååäã%sããæåèçèæèçåäï"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:592
 #, c-format
-msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
 msgstr "éåçååéæååçååååéã%sããæåèçèæèçååéï"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:516
-msgid "Selected calendar contains some events for the given mails already. Would you like to create new events anyway?"
-msgstr "éåçèäæåçååæäæåéääçääãæåèåååçæçääï"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:522
-msgid "Selected task list contains some tasks for the given mails already. Would you like to create new tasks anyway?"
-msgstr "éåçåäæååçååæäæåéääçåäãæåèåååçæçåäï"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:528
-msgid "Selected memo list contains some memos for the given mails already. Would you like to create new memos anyway?"
-msgstr "éåçååéæååçååæäæåéääçååéãæåèåååçæçååéï"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:549
-msgid "Selected calendar contains an event for the given mail already. Would you like to create new event anyway?"
-msgid_plural "Selected calendar contains events for the given mails already. Would you like to create new events anyway?"
-msgstr[0] "éåçèäæåçååæåéääçääãæåèåååçæçääï"
-msgstr[1] "éåçèäæåçååæåéääçääãæåèåååçæçääï"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:558
-msgid "Selected task list contains a task for the given mail already. Would you like to create new task anyway?"
-msgid_plural "Selected task list contains tasks for the given mails already. Would you like to create new tasks anyway?"
-msgstr[0] "éåçåäæååçååæåéääçåäãæåèåååçæçåäï"
-msgstr[1] "éåçåäæååçååæåéääçåäãæåèåååçæçåäï"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:567
-msgid "Selected memo list contains a memo for the given mail already. Would you like to create new memo anyway?"
-msgid_plural "Selected memo list contains memos for the given mails already. Would you like to create new memos anyway?"
-msgstr[0] "éåçååéæååçååæåéääçååéãæåèåååçæçååéï"
-msgstr[1] "éåçååéæååçååæåéääçååéãæåèåååçæçååéï"
-
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#: ../plugins/mail-to-task/mail-to-task.c:609
+#, c-format
+msgid ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+msgstr "æåçéæ %d åéäèèæçääãçåèæåååéåååï"
+
+#: ../plugins/mail-to-task/mail-to-task.c:612
+#, c-format
+msgid ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+msgstr "æåçéæ %d åéäèèæçåäãçåèæåååéåååï"
+
+#: ../plugins/mail-to-task/mail-to-task.c:615
+#, c-format
+msgid ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr "æåçéæ %d åéäèèæçååéãçåèæåååéåååï"
+
+#: ../plugins/mail-to-task/mail-to-task.c:634
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "æåèççèæåéçéäï"
+
+#: ../plugins/mail-to-task/mail-to-task.c:709
 msgid "[No Summary]"
 msgstr "[æææè]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:637
+#: ../plugins/mail-to-task/mail-to-task.c:721
 msgid "Invalid object returned from a server"
 msgstr "åäæåååçæççä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:708
+#: ../plugins/mail-to-task/mail-to-task.c:771
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "åèçæéççéèï%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:796
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "çæéåèäæã%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:744
-msgid "Selected source is read only, thus cannot create event there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:803
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
 msgstr "éåçäææåèçïåæäèåéèåçääãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:747
-msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:806
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
 msgstr "éåçäææåèçïåæäèåéèåçåäãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
-msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:809
+msgid ""
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 msgstr "éåçäææåèçïåæäèåéèåçååéãèéæåäçäæã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/mail-to-task/mail-to-task.c:1045
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "äèååäææåã%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1075
+#: ../plugins/mail-to-task/mail-to-task.c:1104
+msgid "No writable calendar is available."
+msgstr "ææåååçèäæã"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1196
 msgid "Create an _Event"
 msgstr "åçää(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1198
 msgid "Create a new event from the selected message"
 msgstr "äéåçéäåçæçää"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1082
+#: ../plugins/mail-to-task/mail-to-task.c:1203
 msgid "Create a Mem_o"
 msgstr "åçååé(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1205
 msgid "Create a new memo from the selected message"
 msgstr "äéåçéäåçæçååé"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1089
+#: ../plugins/mail-to-task/mail-to-task.c:1210
 msgid "Create a _Task"
 msgstr "åçåä(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1212
 msgid "Create a new task from the selected message"
 msgstr "äéåçéäåçæçåä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1099
+#: ../plugins/mail-to-task/mail-to-task.c:1220
 msgid "Create a _Meeting"
 msgstr "åçæè(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1101
+#: ../plugins/mail-to-task/mail-to-task.c:1222
 msgid "Create a new meeting from the selected message"
 msgstr "äéåçéäåçæçæè"
 
@@ -17675,55 +17616,55 @@ msgstr "äéåçéäåçæçæè"
 msgid "Convert a mail message to a task."
 msgstr "åéäèæçåäã"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:345
 msgid "Get List _Archive"
 msgstr "ååæåææå(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:347
 msgid "Get an archive of the list this message belongs to"
 msgstr "ååæéäæåèåçææå"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
 msgid "Get List _Usage Information"
 msgstr "ååæåäçèè(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:354
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "ååæéäæåèåçäçææçéèè"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
 msgid "Contact List _Owner"
 msgstr "éçäæåææè(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:361
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "éçæéäæåéäèåçççè"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
 msgid "_Post Message to List"
 msgstr "åééäçèå(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "æåéäçæéäæåçéäèå"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "_Subscribe to List"
 msgstr "èéèå(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "èéæéäæåçéäèå"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "_Unsubscribe from List"
 msgstr "åæèéèå(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "åæèéæéäæåçéäèå"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "Mailing _List"
 msgstr "éäèå(_L)"
 
@@ -17741,11 +17682,14 @@ msgstr "çæäçåä"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message has been sent."
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"ååååäåéåéäè URL \"{0}\"ãæåäèåéåéäïææåæçäåäæèã\n"
+"ååååäåéåéäè URL \"{0}\"ãæåäèåéåéäïææåæçäåäæ"
+"èã\n"
 "\n"
 "åéåéäéååääææèææåäèéäèåçåæã"
 
@@ -17762,8 +17706,12 @@ msgid "Posting not allowed"
 msgstr "äåèåè"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
-msgstr "åæéäèåçåèæäèåèçãéåèæäååèçéäèåãèéçèåçççèäååéäæèèã"
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"åæéäèåçåèæäèåèçãéåèæäååèçéäèåãèéçèåççç"
+"èäååéäæèèã"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -17771,7 +17719,8 @@ msgstr "åééäåéäèåï"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -17790,7 +17739,9 @@ msgstr ""
 "æéï {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid "This message does not contain the header information required for this action."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "éåéäææååæåäæéçæéèè"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -17806,18 +17757,22 @@ msgid "Also mark messages in subfolders?"
 msgstr "æåäæèåèæåäçéäï"
 
 #: ../plugins/mark-all-read/mark-all-read.c:44
-msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
-msgstr "æèåçåçèæåäçéäåéèïææååçåçèæååååèæåäææéäã"
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"æèåçåçèæåäçéäåéèïææååçåçèæååååèæåäææé"
+"äã"
 
-#: ../plugins/mark-all-read/mark-all-read.c:193
+#: ../plugins/mark-all-read/mark-all-read.c:213
 msgid "In Current Folder and _Subfolders"
 msgstr "æçåçèæååååèæå(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:207
+#: ../plugins/mark-all-read/mark-all-read.c:227
 msgid "In Current _Folder Only"
 msgstr "æçåçèæå(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:444
+#: ../plugins/mark-all-read/mark-all-read.c:565
 msgid "Mark Me_ssages as Read"
 msgstr "æçéäçåè(_S)"
 
@@ -17855,7 +17810,9 @@ msgid "Show plain text if present"
 msgstr "åæäçæååéçå"
 
 #: ../plugins/prefer-plain/prefer-plain.c:242
-msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
 msgstr "åææçæåçéååéçåïååè Evolution éææäçéåäéçã"
 
 #: ../plugins/prefer-plain/prefer-plain.c:243
@@ -17863,7 +17820,9 @@ msgid "Only ever show plain text"
 msgstr "åäçæåéç"
 
 #: ../plugins/prefer-plain/prefer-plain.c:243
-msgid "Always show plain text part and make attachments from other parts, if requested."
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
 msgstr "åææèææïæééççæåçéåäååäçéåèäéäã"
 
 #: ../plugins/prefer-plain/prefer-plain.c:290
@@ -17874,14 +17833,6 @@ msgstr "åæåç HTML éåéççéä(_U)"
 msgid "HTML _Mode"
 msgstr "HT_ML æå"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-msgid "Evolution Profiler"
-msgstr "Evolution èååå"
-
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Profile data events in Evolution (for developers only)."
-msgstr "Evolution äçèåçåèæääïåäéçèäçïã"
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
 msgstr "å PST ææåå Outlook éä"
@@ -17894,36 +17845,35 @@ msgstr "Outlook PST åå"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook åäèæå (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../plugins/pst-import/pst-importer.c:308
 msgid "_Mail"
 msgstr "éä(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:326
 msgid "Destination folder:"
 msgstr "ççåèæå:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:331
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Address Book"
 msgstr "éèé(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:338
+#: ../plugins/pst-import/pst-importer.c:339
 msgid "A_ppointments"
 msgstr "çæ(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:344
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:345 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "åä(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:350
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "_Journal entries"
 msgstr "æèéç(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:365
+#: ../plugins/pst-import/pst-importer.c:366
 msgid "Importing Outlook data"
 msgstr "åå Outlook èæ"
 
@@ -18076,159 +18026,102 @@ msgstr "äçèåç(_U):"
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:69
-#: ../plugins/publish-calendar/publish-format-ical.c:82
+#: ../plugins/publish-calendar/publish-format-fb.c:88
+#: ../plugins/publish-calendar/publish-format-ical.c:86
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "çæçåèäæïèäæåççååäåå"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:484
+#: ../plugins/publish-calendar/url-editor-dialog.c:487
 msgid "New Location"
 msgstr "æçäç"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:486
+#: ../plugins/publish-calendar/url-editor-dialog.c:489
 msgid "Edit Location"
 msgstr "çèäç"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "æäå SpamAssassinïäçï%d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "åçåçåæï%s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "fork äåççéèï%s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr "SpamAssassin åçåææåæïäæåâ"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "çå SpamAssassin åçåäæïççåâ"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "åçè SpamAssassin åæïéèäçï%d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
-#, c-format
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "SpamAssassin çæäçãèååèåã"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "éæè SpamAssasin æåéïäéåèæ"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
-msgid "I_nclude remote tests"
-msgstr "ååéçæè(_N)"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr "äç SpamAssassin éæååéäã"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr "SpamAssassin ååéäéæå"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin éé"
-
-#.
-#. * Translator: the %F %T is the thirth argument for a strftime function.
-#. * It lets you define the formatting of the date in the csv-file.
-#. *
-#: ../plugins/save-calendar/csv-format.c:161
+#. Translators: the %F %T is the third argument for a
+#. * strftime function.  It lets you define the formatting
+#. * of the date in the csv-file.
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Description List"
 msgstr "æèæå"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Categories List"
 msgstr "åéæå"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Comment List"
 msgstr "èèæå"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Contact List"
 msgstr "éçäæå"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Start"
 msgstr "éå"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "End"
 msgstr "çæ"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Due"
 msgstr "ææ"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "percent Done"
 msgstr "ïååæ"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "URL"
 msgstr "çå"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Attendees List"
 msgstr "åæèæå"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Modified"
 msgstr "åäæ"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV æåçéééé(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:537
+#: ../plugins/save-calendar/csv-format.c:568
 msgid "Prepend a _header"
 msgstr "éåèçæé(_H)"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:577
 msgid "_Value delimiter:"
 msgstr "æååçç(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:588
 msgid "_Record delimiter:"
 msgstr "çéåçç(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:599
 msgid "_Encapsulate values with:"
 msgstr "äæåèæå(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:582
-msgid "Comma separated value format (.csv)"
+#: ../plugins/save-calendar/csv-format.c:625
+msgid "Comma separated values (.csv)"
 msgstr "éèééçæåæå (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:162
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar æå (.ics)"
+#: ../plugins/save-calendar/ical-format.c:166 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -18247,47 +18140,54 @@ msgstr "åèäææåäååèççã"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:369
-msgid "RDF format (.rdf)"
-msgstr "RDF æå (.rdf)"
+#: ../plugins/save-calendar/rdf-format.c:375
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:122
 msgid "_Format:"
 msgstr "æå(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:183
 msgid "Select destination file"
 msgstr "éåççææ"
 
-#: ../plugins/save-calendar/save-calendar.c:334
+#: ../plugins/save-calendar/save-calendar.c:336
 msgid "Save the selected calendar to disk"
 msgstr "åéåçèäæååèçç"
 
-#: ../plugins/save-calendar/save-calendar.c:365
+#: ../plugins/save-calendar/save-calendar.c:367
 msgid "Save the selected memo list to disk"
 msgstr "åéåçååéæåååèçç"
 
-#: ../plugins/save-calendar/save-calendar.c:396
+#: ../plugins/save-calendar/save-calendar.c:398
 msgid "Save the selected task list to disk"
 msgstr "åéåçåäæåååèçç"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
 msgstr "äçéäåæççæåæçååççééå/æåçæåã"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "åæèçççæåæçå"
+msgid ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
+"an email you are replying to."
+msgstr ""
+"åæèçççæåæçåãæåääççèææ $ORIG[subject], $ORIG[from], $ORIG"
+"[to] æ $ORIG[body]ïååæäææåèçéääçæååäã"
 
-#: ../plugins/templates/templates.c:635
+#: ../plugins/templates/templates.c:1066
 msgid "No Title"
 msgstr "æææé"
 
-#: ../plugins/templates/templates.c:746
+#: ../plugins/templates/templates.c:1167
 msgid "Save as _Template"
 msgstr "ååççæ(_T)"
 
-#: ../plugins/templates/templates.c:748
+#: ../plugins/templates/templates.c:1169
 msgid "Save as Template"
 msgstr "ååççæ"
 
@@ -18307,27 +18207,26 @@ msgstr "èå vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "çæåéääéç vCardã"
 
-#: ../plugins/vcard-inline/vcard-inline.c:198
-#: ../plugins/vcard-inline/vcard-inline.c:283
+#: ../plugins/vcard-inline/vcard-inline.c:200
+#: ../plugins/vcard-inline/vcard-inline.c:285
 msgid "Show Full vCard"
 msgstr "éçåæç vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:201
+#: ../plugins/vcard-inline/vcard-inline.c:203
 msgid "Show Compact vCard"
 msgstr "éçççç vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:262
+#: ../plugins/vcard-inline/vcard-inline.c:264
 msgid "There is one other contact."
 msgstr "éæéçäã"
 
-#: ../plugins/vcard-inline/vcard-inline.c:271
+#: ../plugins/vcard-inline/vcard-inline.c:273
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "éæ %d ååäéçäã"
-msgstr[1] "éæ %d ååäéçäã"
 
-#: ../plugins/vcard-inline/vcard-inline.c:292
+#: ../plugins/vcard-inline/vcard-inline.c:294
 msgid "Save in Address Book"
 msgstr "ååéèé"
 
@@ -18339,15 +18238,15 @@ msgstr "å WebDAV éçäåå Evolutionã"
 msgid "WebDAV contacts"
 msgstr "WebDAV éçä"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:67
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:256
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:255
 msgid "URL:"
 msgstr "çå:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:282
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:281
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "éå IfM_atch (éäç Apache < 2.2.8)"
 
@@ -18392,7 +18291,8 @@ msgid "Enable express mode"
 msgstr "åçåéæå"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "çååçéçèäç HTTP/ ååå HTTP æåçäçäæåèååã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
@@ -18420,8 +18320,15 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ååæéèéççåäçé ID æååã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr "åæç trueïåäçäæåçéçåéèéèãåääçèåçæå GConf çãapps/evolution/shell/network_config/authentication_userãéåååïèåçæå gnome-keyring æã~/.gnome2_private/Evolutionãçåçææååã"
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+"åæç trueïåäçäæåçéçåéèéèãåääçèåçæå GConf çãapps/"
+"evolution/shell/network_config/authentication_userãéåååïèåçæå "
+"gnome-keyring æã~/.gnome2_private/Evolutionãçåçææååã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
@@ -18436,7 +18343,9 @@ msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser åèççååèæåã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
 msgstr "éäååååäçååæèãã0ãæåçïã1ãææåæèã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
@@ -18444,7 +18353,8 @@ msgid "Last upgraded configuration version"
 msgstr "äæåçççæçæ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "èåæèçççèæåïåèåæå (äéçäç)"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
@@ -18476,8 +18386,15 @@ msgid "Secure HTTP proxy port"
 msgstr "ååå HTTP äçäæåéèå"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
-msgstr "éæäçäæåçææåãææçæåæ 0ã 1ã 2ã å 3ïååäèãäçççèååãããääçäçäæåãããäçæåäçäæåçæãåãäçå autoconfig url äæäçäçäæåçæãã"
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+"éæäçäæåçææåãææçæåæ 0ã 1ã 2ã å 3ïååäèãäçççèå"
+"åãããääçäçäæåãããäçæåäçäæåçæãåãäçå autoconfig "
+"url äæäçäçäæåçæãã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
@@ -18487,8 +18404,7 @@ msgstr "éçåéæ"
 msgid "Skip development warning dialog"
 msgstr "åçéçèååèç"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-#: ../shell/main.c:371
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "äéçæååå"
 
@@ -18497,8 +18413,11 @@ msgid "Statusbar is visible"
 msgstr "çæåèçéç"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "Evolution ççæçæïä major/minor/configuration åçèç(äåã2.6.0ã) ã"
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"Evolution ççæçæïä major/minor/configuration åçèç(äåã2.6.0ã) ã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
@@ -18521,8 +18440,12 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "åéæçéèååïäåçèã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "äæåçç Evolution çæçæïä major/minor/configuration åçèç(äåã2.6.0ã) ã"
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"äæåçç Evolution çæçæïä major/minor/configuration åçèç(äå"
+"ã2.6.0ã) ã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
@@ -18537,25 +18460,49 @@ msgid "The machine name to proxy socks through."
 msgstr "socks äçäæåäæåçã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
-msgstr "åçæã/apps/evolution/shell/network_config/http_hostãçäçäæåäæéèåã"
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"åçæã/apps/evolution/shell/network_config/http_hostãçäçäæåäæéè"
+"åã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
-msgstr "åçæã/apps/evolution/shell/network_config/secure_hostãçäçäæåäæéèåã"
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"åçæã/apps/evolution/shell/network_config/secure_hostãçäçäæåäæé"
+"èåã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
-msgstr "åçæã/apps/evolution/shell/network_config/socks_hostãçäçäæåäæéèåã"
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"åçæã/apps/evolution/shell/network_config/socks_hostãçäçäæåäæéè"
+"åã"
 
-# (pofilter) gconf: do not translate gconf attribute: "text", "icons", "both", "toolbar", "toolbar"
 #: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
-msgstr "èçæéçéæãåäæãtextã(æå)ããiconsã(åç)ããbothã(åè)ããtoolbarã(ååå)ãåæèçãtoolbarã(ååå)ïæéçéææä GNOME åååèååæåã"
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+"èçæéçéæãåäæãtextã(æå)ããiconsã(åç)ããbothã(åè)ã"
+"ãtoolbarã(ååå)ãåæèçãtoolbarã(ååå)ïæéçéææä GNOME ååå"
+"èååæåã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr "éåéåååäèçæéçïäééäçäæåïåææäçïçäæãæååäçäæåçãçåïééäçèçååå *.foo.comïãIP äåïIPv4 å IPv6 çåïæåæåçèéççäåïåæ 192.168.0.0/24ïã"
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+"éåéåååäèçæéçïäééäçäæåïåææäçïçäæãæååäçä"
+"æåçãçåïééäçèçååå *.foo.comïãIP äåïIPv4 å IPv6 çåïæ"
+"åæåçèéççäåïåæ 192.168.0.0/24ïã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
@@ -18570,10 +18517,9 @@ msgid "Use HTTP proxy"
 msgstr "äç HTTP äçäæå"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr "äç HTTP äçäæåæçäéèçäçèåçã"
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr "äç HTTP äçäæåæéèèèçäçèåçã"
 
-# zh_HK: msgstr "Evolution æåäéçæååååäçäæåã"
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution æåäéçæååååäçäæåã"
@@ -18595,7 +18541,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "æååäçååååã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "æåçç Evulution éççæçèååèçã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:62
@@ -18610,12 +18557,11 @@ msgstr "èçæééæ"
 msgid "Window buttons are visible"
 msgstr "èçæéæåèç"
 
-#: ../shell/e-shell-content.c:695
-#: ../shell/e-shell-content.c:696
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "æå"
 
-#: ../shell/e-shell-content.c:738
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "ååæåçæ"
 
@@ -18623,42 +18569,38 @@ msgstr "ååæåçæ"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:935
+#: ../shell/e-shell-searchbar.c:938
 msgid "Sho_w:"
 msgstr "éç(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:968
+#: ../shell/e-shell-searchbar.c:971
 msgid "Sear_ch:"
 msgstr "æå(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1031
+#: ../shell/e-shell-searchbar.c:1034
 msgid "i_n"
 msgstr "æ(_N)"
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:223
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:257
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
-#: ../shell/e-shell-utils.c:278
+#: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "ææææ (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:295
 msgid "Saving user interface state"
 msgstr "ååäçèäéçæ"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:648
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -18669,268 +18611,278 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:659
 msgid "Evolution Website"
 msgstr "Evolution çç"
 
-#: ../shell/e-shell-window-actions.c:1215
+#: ../shell/e-shell-window-actions.c:921
+msgid "Categories Editor"
+msgstr "åéçèå"
+
+#: ../shell/e-shell-window-actions.c:1256
 msgid "Bug Buddy is not installed."
 msgstr "åæåè Bug Buddyã"
 
-#: ../shell/e-shell-window-actions.c:1217
+#: ../shell/e-shell-window-actions.c:1258
 msgid "Bug Buddy could not be run."
 msgstr "çæåè Bug Buddyã"
 
-#: ../shell/e-shell-window-actions.c:1398
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Show information about Evolution"
 msgstr "éç Evolution çéèè"
 
-#: ../shell/e-shell-window-actions.c:1403
-#: ../shell/e-shell-window-actions.c:1417
+#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1458
 msgid "_Close Window"
 msgstr "ééèç(_C)"
 
-#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1465
 msgid "_Contents"
 msgstr "åå(_C)"
 
-#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1467
 msgid "Open the Evolution User Guide"
 msgstr "éå Evolution äçèæå"
 
-#: ../shell/e-shell-window-actions.c:1452
+#: ../shell/e-shell-window-actions.c:1493
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1454
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "éååèåé(FAQ)çé"
 
-#: ../shell/e-shell-window-actions.c:1459
+#: ../shell/e-shell-window-actions.c:1500
 msgid "_Forget Passwords"
 msgstr "éååç(_F)"
 
-#: ../shell/e-shell-window-actions.c:1461
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Forget all remembered passwords"
 msgstr "åèææèæçåç"
 
-#: ../shell/e-shell-window-actions.c:1466
+#: ../shell/e-shell-window-actions.c:1507
 msgid "I_mport..."
 msgstr "åå(_M)â"
 
-#: ../shell/e-shell-window-actions.c:1468
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Import data from other programs"
 msgstr "åååäçåçèæ"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1514
 msgid "New _Window"
 msgstr "éæèç(_W)"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Create a new window displaying this view"
 msgstr "åçäåæçèçäéçéåæè"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1528
+msgid "Available Cate_gories"
+msgstr "åççåé(_G)"
+
+#: ../shell/e-shell-window-actions.c:1530
+msgid "Manage available categories"
+msgstr "ççåççåé"
+
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Quick Reference"
 msgstr "åéååèå(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Show Evolution's shortcut keys"
 msgstr "éç Evolution çæåé"
 
-#: ../shell/e-shell-window-actions.c:1503
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Exit the program"
 msgstr "éééåçå"
 
-#: ../shell/e-shell-window-actions.c:1508
+#: ../shell/e-shell-window-actions.c:1556
 msgid "_Advanced Search..."
 msgstr "ééæå(_A)â"
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Construct a more advanced search"
 msgstr "åææééçæå"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Clear the current search parameters"
 msgstr "æéçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Edit Saved Searches..."
 msgstr "çèååçæåçæ(_E)â"
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Manage your saved searches"
 msgstr "ççæåååçæå"
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Click here to change the search type"
 msgstr "æéèäæèæåéå"
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1584
 msgid "_Find Now"
 msgstr "çåæå(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Execute the current search parameters"
 msgstr "åèçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1591
 msgid "_Save Search..."
 msgstr "ååæåçæ(_S)â"
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Save the current search parameters"
 msgstr "ååçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1605
 msgid "Submit _Bug Report..."
 msgstr "åééèåå(_B)â"
 
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Submit a bug report using Bug Buddy"
 msgstr "äç Bug Buddy éåéèååã"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1612
 msgid "_Work Offline"
 msgstr "éçåä(_W)"
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1614
 msgid "Put Evolution into offline mode"
 msgstr "è Evolution éåéçæå"
 
-# zh_HK: msgstr "çäåä(_W)"
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1619
 msgid "_Work Online"
 msgstr "çäåä(_W)"
 
-# zh_HK: msgstr "äçäæååå"
-#: ../shell/e-shell-window-actions.c:1573
+#: ../shell/e-shell-window-actions.c:1621
 msgid "Put Evolution into online mode"
 msgstr "è Evolution éåäçæå"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1649
 msgid "Lay_out"
 msgstr "äå(_O)"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_New"
 msgstr "æå(_N)"
 
-#: ../shell/e-shell-window-actions.c:1615
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Search"
 msgstr "æå(_S)"
 
-#: ../shell/e-shell-window-actions.c:1622
+#: ../shell/e-shell-window-actions.c:1670
 msgid "_Switcher Appearance"
 msgstr "åæåè(_S)"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1684
 msgid "_Window"
 msgstr "èç(_O)"
 
-#: ../shell/e-shell-window-actions.c:1665
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show Side _Bar"
 msgstr "éçåéæ(_B)"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1715
 msgid "Show the side bar"
 msgstr "éçåéå"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1721
 msgid "Show _Buttons"
 msgstr "éçæé(_B)"
 
-#: ../shell/e-shell-window-actions.c:1675
+#: ../shell/e-shell-window-actions.c:1723
 msgid "Show the switcher buttons"
 msgstr "éçåæçåæé"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1729
 msgid "Show _Status Bar"
 msgstr "éççæå(_S)"
 
-#: ../shell/e-shell-window-actions.c:1683
+#: ../shell/e-shell-window-actions.c:1731
 msgid "Show the status bar"
 msgstr "éççæå"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Show _Tool Bar"
 msgstr "éçååå(_T)"
 
-#: ../shell/e-shell-window-actions.c:1691
+#: ../shell/e-shell-window-actions.c:1739
 msgid "Show the tool bar"
 msgstr "éçååå"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1761
 msgid "_Icons Only"
 msgstr "åæåç(_I)"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons with icons only"
 msgstr "åéçèçæéçåç"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1768
 msgid "_Text Only"
 msgstr "åææå(_T)"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Display window buttons with text only"
 msgstr "åéçèçæéçæå"
 
-#: ../shell/e-shell-window-actions.c:1727
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Icons _and Text"
 msgstr "åçåæå(_A)"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1777
 msgid "Display window buttons with icons and text"
 msgstr "éçèçæéçåçåæå"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1782
 msgid "Tool_bar Style"
 msgstr "åååéæ(_B)"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1784
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "äçæéåååèååéçèçæé"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Define Views..."
 msgstr "åçæèâ"
 
-#: ../shell/e-shell-window-actions.c:1746
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Create or edit views"
 msgstr "åçæçèæè(_C)"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1799
 msgid "Save Custom View..."
 msgstr "ååèèæèâ"
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1801
 msgid "Save current custom view"
 msgstr "ååçåçèèæè"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1808
 msgid "C_urrent View"
 msgstr "çåæè(_U)"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1818
 msgid "Custom View"
 msgstr "èèæè"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1820
 msgid "Current view is a customized view"
 msgstr "çåçæèæåæèèçæè"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1830
 msgid "Change the page settings for your current printer"
 msgstr "äæçååèæçééååèå"
 
-#: ../shell/e-shell-window-actions.c:2167
+#: ../shell/e-shell-window-actions.c:2215
 #, c-format
 msgid "Switch to %s"
 msgstr "åæè %s"
 
-#: ../shell/e-shell-window-actions.c:2382
+#: ../shell/e-shell-window-actions.c:2430
 msgid "Execute these search parameters"
 msgstr "åèéäæååæ"
 
@@ -18940,24 +18892,24 @@ msgstr "åèéäæååæ"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:438
+#: ../shell/e-shell-window.c:442
 msgid "New"
 msgstr "æå"
 
-#: ../shell/e-shell.c:257
+#: ../shell/e-shell.c:361
 msgid "Preparing to go offline..."
 msgstr "æåéåéçâ"
 
-#: ../shell/e-shell.c:310
+#: ../shell/e-shell.c:414
 msgid "Preparing to go online..."
 msgstr "æåéåäçâ"
 
-#: ../shell/e-shell.c:372
+#: ../shell/e-shell.c:476
 msgid "Preparing to quit..."
 msgstr "æåçæâ"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18992,7 +18944,7 @@ msgstr ""
 "æååææäååäææïèäæå\n"
 "çååæææäæèï\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19000,63 +18952,65 @@ msgstr ""
 "èè\n"
 "Evolution åçæä\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:226
 msgid "Do not tell me again"
 msgstr "äèåéçéåèæ"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:365
-msgid "Start Evolution showing the specified component. Available options are 'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
-msgstr "åå Evolution æäæåçåäéçãåççééæãmailãããcalendarãããcontactsãããtasksãåãmemosã"
+#: ../shell/main.c:308
+msgid ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgstr ""
+"åå Evolution æäæåçåäéçãåççééæãmailãããcalendarãã"
+"ãcontactsãããtasksãåãmemosã"
 
-#: ../shell/main.c:369
+#: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
 msgstr "åæåçåååçåäèç"
 
-# zh_HK: msgstr "äçäæååå"
-#: ../shell/main.c:373
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "äçäæååå"
 
-#: ../shell/main.c:375
+#: ../shell/main.c:318
 msgid "Ignore network availability"
 msgstr "åççéçèæååç"
 
-#: ../shell/main.c:377
+#: ../shell/main.c:320
 msgid "Start in \"express\" mode"
 msgstr "äãåéãæååå"
 
-#: ../shell/main.c:380
+#: ../shell/main.c:323
 msgid "Forcibly shut down Evolution"
 msgstr "ååéé Evoultion"
 
-#: ../shell/main.c:383
+#: ../shell/main.c:326
 msgid "Send the debugging output of all components to a file."
 msgstr "ååéåäçééèåèæåéèäåææã"
 
-#: ../shell/main.c:385
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "åçåääåæçåçèåã"
 
-#: ../shell/main.c:387
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "åçéäãéçäååäçéèçæã"
 
-#: ../shell/main.c:391
+#: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "åæåç URI æææåçååçæääçåæã"
 
-#: ../shell/main.c:393
+#: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "èæåèäç Evolution çåçæ"
 
-#: ../shell/main.c:557
-#: ../shell/main.c:565
+#: ../shell/main.c:511 ../shell/main.c:519
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM èéäåæç"
 
-#: ../shell/main.c:627
+#: ../shell/main.c:582
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19065,7 +19019,7 @@ msgstr ""
 "%sï --online å --offline äèäèäçã\n"
 "  äç '%s --help' ååéäæèèã\n"
 
-#: ../shell/main.c:633
+#: ../shell/main.c:588
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19087,12 +19041,20 @@ msgid "Continue Anyway"
 msgstr "ååçç"
 
 #: ../shell/shell.error.xml.h:4
-msgid "Evolution no longer supports upgrading directly from version {0}. However as a workaround you might try first upgrading to Evolution 2, and then upgrading to Evolution 3."
-msgstr "Evolution äåææå {0} ççæåçãçèèéçææææåäèèååçå Evolution 2ïæèååçå Evolution 3ã"
+msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"Evolution äåææå {0} ççæåçãçèèéçææææåäèèååçå "
+"Evolution 2ïæèååçå Evolution 3ã"
 
 #: ../shell/shell.error.xml.h:5
-msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
-msgstr "éåæçåçæåéææåèæçåçãåäæéèäçåçæåææçæèåã"
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+"éåæçåçæåéææåèæçåçãåäæéèäçåçæåææçæèåã"
 
 #: ../shell/shell.error.xml.h:7
 msgid "Quit Now"
@@ -19110,7 +19072,8 @@ msgstr "éå(_F)"
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
 "{0}\n"
 "\n"
@@ -19169,31 +19132,31 @@ msgstr "äèåéæä URI èãType=Linkãæééç"
 msgid "Not a launchable item"
 msgstr "äæåäååçéç"
 
-#: ../smclient/eggsmclient.c:224
+#: ../smclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
 msgstr "åçåäæéæçççåçéç"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
 msgstr "æååååååçæçææ"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 msgid "FILE"
 msgstr "ææ"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr "æåäæéæçç ID"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:251
+#: ../smclient/eggsmclient.c:253
 msgid "Session management options:"
 msgstr "äæéæççééï"
 
-#: ../smclient/eggsmclient.c:252
+#: ../smclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "éçäæéæççéé"
 
@@ -19209,74 +19172,116 @@ msgstr ""
 "çèääèååï"
 
 #: ../smime/gui/cert-trust-dialog.c:144
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "åçæääçåææèçæèåäïæäééåææçïååæåääææèçæææã"
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"åçæääçåææèçæèåäïæäééåææçïååæåääææèçææ"
+"æã"
 
 #: ../smime/gui/cert-trust-dialog.c:148
-msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "åçæäääçåææèçæèåäïæäééåææçïååæåäääææèçæææã"
-
-#: ../smime/gui/certificate-manager.c:148
-#: ../smime/gui/certificate-manager.c:460
-#: ../smime/gui/certificate-manager.c:697
-msgid "Select a certificate to import..."
-msgstr "éåèååçæèâ"
-
-#: ../smime/gui/certificate-manager.c:157
-msgid "All PKCS12 files"
-msgstr "ææç PKCS12 ææ"
-
-#: ../smime/gui/certificate-manager.c:163
-#: ../smime/gui/certificate-manager.c:475
-#: ../smime/gui/certificate-manager.c:711
-msgid "All files"
-msgstr "ææææ"
-
-#: ../smime/gui/certificate-manager.c:182
-msgid "Failed to import user's certificate"
-msgstr "çæååäçèçæè"
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"åçæäääçåææèçæèåäïæäééåææçïååæåäääææèçæ"
+"ææã"
 
-#: ../smime/gui/certificate-manager.c:352
-#: ../smime/gui/certificate-manager.c:574
-#: ../smime/gui/certificate-manager.c:808
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
 msgstr "æèåç"
 
-#: ../smime/gui/certificate-manager.c:361
-#: ../smime/gui/certificate-manager.c:592
-msgid "Purposes"
-msgstr "çé"
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+msgid "Issued To Organization"
+msgstr "çççç"
+
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+msgid "Issued To Organizational Unit"
+msgstr "ççççåä"
 
-#: ../smime/gui/certificate-manager.c:370
-#: ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "åè"
 
-#: ../smime/gui/certificate-manager.c:378
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
+msgid "Purposes"
+msgstr "çé"
+
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "ççè"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+msgid "Issued By Organization"
+msgstr "çççç"
+
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+msgid "Issued By Organizational Unit"
+msgstr "ççççåä"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+msgid "Issued"
+msgstr "çèè"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "åæ"
 
-#: ../smime/gui/certificate-manager.c:469
-msgid "All email certificate files"
-msgstr "ææçéåéäæèææ"
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+msgid "SHA1 Fingerprint"
+msgstr "SHA1 æç"
+
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+msgid "MD5 Fingerprint"
+msgstr "MD5 æç"
+
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+msgid "Email Address"
+msgstr "éåéääå"
+
+#: ../smime/gui/certificate-manager.c:574
+msgid "Select a certificate to import..."
+msgstr "éåèååçæèâ"
+
+#: ../smime/gui/certificate-manager.c:587
+msgid "All files"
+msgstr "ææææ"
+
+#: ../smime/gui/certificate-manager.c:622
+msgid "Failed to import certificate"
+msgstr "çæååæè"
 
-#: ../smime/gui/certificate-manager.c:502
-msgid "Failed to import contact's certificate"
-msgstr "çæååéçäçæè"
+#: ../smime/gui/certificate-manager.c:990
+msgid "All PKCS12 files"
+msgstr "ææç PKCS12 ææ"
 
-#: ../smime/gui/certificate-manager.c:583
-msgid "E-Mail Address"
-msgstr "éåéäåå"
+#: ../smime/gui/certificate-manager.c:1008
+msgid "All email certificate files"
+msgstr "ææçéåéäæèææ"
 
-#: ../smime/gui/certificate-manager.c:706
+#: ../smime/gui/certificate-manager.c:1026
 msgid "All CA certificate files"
 msgstr "ææç CA æèææ"
 
-#: ../smime/gui/certificate-manager.c:737
-msgid "Failed to import certificate authority's certificate"
-msgstr "çæååæèäåçæè"
-
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -19332,11 +19337,14 @@ msgid "Backup _All"
 msgstr "åéåä(_A)"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
-msgstr "ääææèççäåäåïåæåäçèïææèåææåçæèäååçæçåçåã"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"ääææèççäåäåïåæåäçèïææèåææåçæèäååçæçåç"
+"åã"
 
-#: ../smime/gui/smime-ui.ui.h:5
-#: ../smime/lib/e-cert.c:1086
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1088
 msgid "Certificate"
 msgstr "æè"
 
@@ -19396,10 +19404,6 @@ msgstr "æäæå"
 msgid "Fingerprints"
 msgstr "æäæç"
 
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "Issued By"
-msgstr "ççè"
-
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "ççææ"
@@ -19408,10 +19412,6 @@ msgstr "ççææ"
 msgid "Issued To"
 msgstr "çç"
 
-#: ../smime/gui/smime-ui.ui.h:26
-msgid "MD5 Fingerprint"
-msgstr "MD5 æç"
-
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "çç (O)"
@@ -19420,17 +19420,11 @@ msgstr "çç (O)"
 msgid "Organizational Unit (OU)"
 msgstr "ççåä (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "SHA1 Fingerprint"
-msgstr "SHA1 æç"
-
-#: ../smime/gui/smime-ui.ui.h:30
-#: ../smime/lib/e-cert.c:824
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "SSL çæçæè"
 
-#: ../smime/gui/smime-ui.ui.h:31
-#: ../smime/lib/e-cert.c:828
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "SSL äæåæè"
 
@@ -19463,7 +19457,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "æåçæäèéäçççæèïåäèåæçèå:"
 
 #: ../smime/gui/smime-ui.ui.h:40
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "æåçææææççéæèïåäèåéäæèççäå:"
 
 #: ../smime/gui/smime-ui.ui.h:41
@@ -19487,8 +19482,7 @@ msgstr "çèæèççäå (CA) ääå(_E)"
 msgid "Certificate already exists"
 msgstr "æèåçåå"
 
-#: ../smime/lib/e-cert.c:228
-#: ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
@@ -19582,13 +19576,11 @@ msgstr "äæåéæçæ"
 msgid "Subject's Public Key"
 msgstr "äæçåé"
 
-#: ../smime/lib/e-cert.c:815
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "éèïçæèçåä"
 
-#: ../smime/lib/e-cert.c:836
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "çäççè"
 
@@ -19632,8 +19624,7 @@ msgstr "CRL ççè"
 msgid "Critical"
 msgstr "éè"
 
-#: ../smime/lib/e-cert.c:946
-#: ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "äéè"
 
@@ -19641,47 +19632,48 @@ msgstr "äéè"
 msgid "Extensions"
 msgstr "åä"
 
-#. Translators: This string is used in Certificate details for fields like Issuer
-#. or Subject, which shows the field name on the left and its respective value
-#. on the right, both as stored in the certificate itself. You probably do not
-#. need to change this string, unless changing the order of name and value.
-#. As a result example: "OU = VeriSign Trust Network"
-#.
-#: ../smime/lib/e-cert.c:1045
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../smime/lib/e-cert.c:1047
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100
-#: ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1102 ../smime/lib/e-cert.c:1225
 msgid "Certificate Signature Algorithm"
 msgstr "æèççæçæ"
 
-#: ../smime/lib/e-cert.c:1109
+#: ../smime/lib/e-cert.c:1111
 msgid "Issuer"
 msgstr "ççè"
 
-#: ../smime/lib/e-cert.c:1164
+#: ../smime/lib/e-cert.c:1166
 msgid "Issuer Unique ID"
 msgstr "ççèçæ ID"
 
-#: ../smime/lib/e-cert.c:1183
+#: ../smime/lib/e-cert.c:1185
 msgid "Subject Unique ID"
 msgstr "äæçæ ID"
 
-#: ../smime/lib/e-cert.c:1229
+#: ../smime/lib/e-cert.c:1231
 msgid "Certificate Signature Value"
 msgstr "æèççå"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ææåç"
 
-#: ../smime/lib/e-pkcs12.c:251
+#: ../smime/lib/e-pkcs12.c:250
 msgid "Enter password for PKCS12 file:"
 msgstr "èå PKCS12 ææçåç:"
 
-#: ../smime/lib/e-pkcs12.c:353
+#: ../smime/lib/e-pkcs12.c:352
 msgid "Imported Certificate"
 msgstr "èåçæè"
 
@@ -19693,8 +19685,7 @@ msgstr "äåå(_C)"
 msgid "_Address Cards"
 msgstr "ååå(_A)"
 
-#: ../views/addressbook/galview.xml.h:3
-#: ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "æåæè(_L)"
 
@@ -19763,7 +19754,7 @@ msgstr "èåçæ(_S)"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:780
 msgid "UTC"
 msgstr "UTC"
 
@@ -19781,7 +19772,8 @@ msgstr "æåäæåçåæå"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "äçæéåéæèååçååïçåéåæåã\n"
@@ -19791,14 +19783,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "éæçå(_S) "
 
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-define-views-dialog.c:348
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "åç %s çæè"
 
-#: ../widgets/menus/gal-define-views-dialog.c:354
 #: ../widgets/menus/gal-define-views-dialog.c:356
+#: ../widgets/menus/gal-define-views-dialog.c:358
 msgid "Define Views"
 msgstr "åçæè"
 
@@ -19807,11 +19799,11 @@ msgstr "åçæè"
 msgid "Define Views for \"%s\""
 msgstr "åçã%sãçæè"
 
-#: ../widgets/menus/gal-view-factory-etable.c:109
+#: ../widgets/menus/gal-view-factory-etable.c:111
 msgid "Table"
 msgstr "èæ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:273
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:275
 msgid "Save Current View"
 msgstr "ååçåæè"
 
@@ -19823,7 +19815,7 @@ msgstr "åçæçæè(_C)"
 msgid "_Replace existing view"
 msgstr "çæçåçæè(_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:106
+#: ../widgets/menus/gal-view-new-dialog.c:108
 msgid "Define New View"
 msgstr "åçæçæè"
 
@@ -19839,123 +19831,128 @@ msgstr "æèçéå"
 msgid "Type of view:"
 msgstr "æèçéå:"
 
-#: ../widgets/misc/e-account-manager.c:349
+#: ../widgets/misc/e-account-manager.c:353
 msgid "De_fault"
 msgstr "éèå(_F)"
 
-#: ../widgets/misc/e-account-tree-view.c:270
+#: ../widgets/misc/e-account-tree-view.c:243
+msgid "Account Name"
+msgstr "åèåç"
+
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "éèåå"
 
-#: ../widgets/misc/e-attachment-dialog.c:304
+#: ../widgets/misc/e-attachment-dialog.c:308
 msgid "Attachment Properties"
 msgstr "éäåå"
 
-#: ../widgets/misc/e-attachment-dialog.c:326
+#: ../widgets/misc/e-attachment-dialog.c:330
 msgid "_Filename:"
 msgstr "ææåç(_F):"
 
-#: ../widgets/misc/e-attachment-dialog.c:361
+#: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "MIME éåï"
 
-#: ../widgets/misc/e-attachment-dialog.c:369
-#: ../widgets/misc/e-attachment-store.c:556
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
 msgid "_Suggest automatic display of attachment"
 msgstr "åèèåéçéä(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:96
+#: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "çæèçèæ"
 
-#: ../widgets/misc/e-attachment-handler-image.c:148
+#: ../widgets/misc/e-attachment-handler-image.c:145
 msgid "Set as _Background"
 msgstr "èçèæ(_B)"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:90
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "çæéåéäã"
-msgstr[1] "çæéåéäã"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:132
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
 msgid "_Send To..."
 msgstr "åéè(_S)â"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:134
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
 msgid "Send the selected attachments somewhere"
 msgstr "åééåçéäååè"
 
-#: ../widgets/misc/e-attachment-icon-view.c:158
-#: ../widgets/misc/e-attachment-tree-view.c:543
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Loading"
 msgstr "èåä"
 
-#: ../widgets/misc/e-attachment-icon-view.c:170
-#: ../widgets/misc/e-attachment-tree-view.c:555
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
 msgid "Saving"
 msgstr "ååä"
 
-#: ../widgets/misc/e-attachment-paned.c:93
+#: ../widgets/misc/e-attachment-paned.c:97
 msgid "Hide Attachment _Bar"
 msgstr "éèéäå(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:95
-#: ../widgets/misc/e-attachment-paned.c:635
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
 msgid "Show Attachment _Bar"
 msgstr "éçéäå(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "Add Attachment"
 msgstr "ååéä"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:550
 msgid "A_ttach"
 msgstr "éå(_T)"
 
-#: ../widgets/misc/e-attachment-store.c:610
+#: ../widgets/misc/e-attachment-store.c:613
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "ååéä"
-msgstr[1] "ååéä"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:639
-#: ../widgets/misc/e-attachment.c:1806
-#: ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment.c:1809 ../widgets/misc/e-attachment.c:2351
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr "äåäæççåéåâ"
+
+#: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
 msgstr "åååé(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:375
+#: ../widgets/misc/e-attachment-view.c:437
 msgid "A_dd Attachment..."
 msgstr "ååéä(_A)â"
 
-#: ../widgets/misc/e-attachment-view.c:399
+#: ../widgets/misc/e-attachment-view.c:461
 msgid "_Hide"
 msgstr "éè(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:406
+#: ../widgets/misc/e-attachment-view.c:468
 msgid "Hid_e All"
 msgstr "åééè(_E)"
 
-#: ../widgets/misc/e-attachment-view.c:413
+#: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
 msgstr "æèèå(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:420
+#: ../widgets/misc/e-attachment-view.c:482
 msgid "Vie_w All Inline"
 msgstr "åéäèåæè(_W)"
 
-#: ../widgets/misc/e-attachment-view.c:738
+#: ../widgets/misc/e-attachment-view.c:803
 #, c-format
-msgid "Open with \"%s\""
+msgid "Open With \"%s\""
 msgstr "äã%sãéå"
 
-#: ../widgets/misc/e-attachment-view.c:741
+#: ../widgets/misc/e-attachment-view.c:806
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å %s äéåéåéä"
@@ -19964,80 +19961,82 @@ msgstr "å %s äéåéåéä"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:994
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "éåçéä"
 
-#: ../widgets/misc/e-attachment.c:1849
-#: ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2653
 msgid "A load operation is already in progress"
 msgstr "èåæäååéèä"
 
-#: ../widgets/misc/e-attachment.c:1857
-#: ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2661
 msgid "A save operation is already in progress"
 msgstr "ååæäååéèä"
 
-#: ../widgets/misc/e-attachment.c:1949
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load '%s'"
 msgstr "çæèåã%sã"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1955
 #, c-format
 msgid "Could not load the attachment"
 msgstr "çæèåéä"
 
-#: ../widgets/misc/e-attachment.c:2228
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open '%s'"
 msgstr "çæéåã%sã"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2234
 #, c-format
 msgid "Could not open the attachment"
 msgstr "çæéåéä"
 
-#: ../widgets/misc/e-attachment.c:2666
+#: ../widgets/misc/e-attachment.c:2669
 msgid "Attachment contents not loaded"
 msgstr "çæèåéäåå"
 
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save '%s'"
 msgstr "çæååã%sã"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2748
 #, c-format
 msgid "Could not save the attachment"
 msgstr "çæååéä"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:363
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-åæäéåéç"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1229
+#: ../widgets/misc/e-calendar-item.c:1247
 msgid "%B %Y"
 msgstr "%Yå%mæ"
 
-#: ../widgets/misc/e-calendar.c:225
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "æèäæ"
 
-#: ../widgets/misc/e-charset-combo-box.c:92
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "ååçç"
 
-#: ../widgets/misc/e-charset-combo-box.c:115
+#: ../widgets/misc/e-charset-combo-box.c:119
 msgid "Enter the character set to use"
 msgstr "èåèäççååé"
 
-#: ../widgets/misc/e-charset-combo-box.c:335
+#: ../widgets/misc/e-charset-combo-box.c:339
 msgid "Other..."
 msgstr "ååâ"
 
+#: ../widgets/misc/e-contact-map-window.c:347
+msgid "Contacts Map"
+msgstr "éçäåå"
+
 #: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "ææèæå"
@@ -20070,8 +20069,7 @@ msgstr "ææ(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1686
-#: ../widgets/misc/e-dateedit.c:1918
+#: ../widgets/misc/e-dateedit.c:1686 ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "ææ"
@@ -20084,168 +20082,177 @@ msgstr "çæçæææå"
 msgid "Invalid Time Value"
 msgstr "çæçæåæå"
 
-#: ../widgets/misc/e-import-assistant.c:245
-msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
+#: ../widgets/misc/e-import-assistant.c:249
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
 msgstr "éåèåå Evolution çææïääåæååéåææéåã"
 
-#: ../widgets/misc/e-import-assistant.c:262
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "ææåç(_I):"
 
-#: ../widgets/misc/e-import-assistant.c:272
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "éæäåææ"
 
-#: ../widgets/misc/e-import-assistant.c:286
-#: ../widgets/misc/e-import-assistant.c:461
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "ææéå(_T):"
 
-#: ../widgets/misc/e-import-assistant.c:329
-#: ../widgets/misc/e-import-assistant.c:905
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:910
 msgid "Choose the destination for this import"
 msgstr "éææèåçççå"
 
-#: ../widgets/misc/e-import-assistant.c:354
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "éæååæåèåèçéåï"
 
-#: ../widgets/misc/e-import-assistant.c:362
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "åèçåèåèæåèåå(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:370
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "åååäææ(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:522
-msgid "Evolution checked for settings to import from the following applications: Pine, Netscape, Elm, iCalendar. No importable settings found. If you would like to try again, please click the \"Back\" button."
-msgstr "Evolution åçææåääæççåèåçèååïPineãNetscapeãElmãiCalendarãæäååäèåçèååãåæææåèäæïèæääãååãæéã"
+#: ../widgets/misc/e-import-assistant.c:526
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolution åçææåääæççåèåçèååïPineãNetscapeãElmã"
+"iCalendarãæäååäèåçèååãåæææåèäæïèæääãååãæéã"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:762
+#: ../widgets/misc/e-import-assistant.c:767
 msgid "_Cancel Import"
 msgstr "åæåå(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:904
+#: ../widgets/misc/e-import-assistant.c:909
 msgid "Preview data to be imported"
 msgstr "éèéèååçèæ"
 
-#: ../widgets/misc/e-import-assistant.c:910
-#: ../widgets/misc/e-import-assistant.c:923
-#: ../widgets/misc/e-import-assistant.c:1270
-#: ../widgets/misc/e-import-assistant.c:1336
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:928
+#: ../widgets/misc/e-import-assistant.c:1273
+#: ../widgets/misc/e-import-assistant.c:1349
+#: ../widgets/misc/e-import-assistant.c:1358
 msgid "Import Data"
 msgstr "ååèæ"
 
-#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:923
 msgid "Select what type of file you want to import from the list."
 msgstr "éæææèåæåäååçææéåã"
 
-#: ../widgets/misc/e-import-assistant.c:1260
-#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1263
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid "Evolution Import Assistant"
 msgstr "Evolution åååç"
 
-#: ../widgets/misc/e-import-assistant.c:1277
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1336
 msgid "Import Location"
 msgstr "èåäç"
 
-#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1291
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing external files into Evolution."
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
 msgstr ""
 "æèäç Evolution çåååçã\n"
 "éåçéåæéåæåäååéçææååå Evolutionã"
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Importer Type"
 msgstr "èååéå"
 
-#: ../widgets/misc/e-import-assistant.c:1310
+#: ../widgets/misc/e-import-assistant.c:1318
 msgid "Select Information to Import"
 msgstr "éæèååçèè"
 
-#: ../widgets/misc/e-import-assistant.c:1317
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "éåææ"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1344
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æãåçãéååææååå Evolutionã"
 
-#: ../widgets/misc/e-map.c:866
+#: ../widgets/misc/e-map.c:869
 msgid "World Map"
 msgstr "äçåå"
 
-#: ../widgets/misc/e-map.c:869
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
-msgstr "çäéææåçæéäåååååäãäçéççäçèæèäçäæçäæåçåæåäéææåã"
+#: ../widgets/misc/e-map.c:872
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"çäéææåçæéäåååååäãäçéççäçèæèäçäæçäæåçåæ"
+"åäéææåã"
 
-# zh_HK: msgstr "Evolution çåççäæåãæääææéäéèéçåäã"
-#: ../widgets/misc/e-online-button.c:23
+#: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution çåççäæåãæääææéäéèéçåäã"
 
-# zh_HK: msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
-#: ../widgets/misc/e-online-button.c:26
+#: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
 
-# zh_HK: msgstr "Evolution çåçéçæåãæääææéäéèçäåäã"
-#: ../widgets/misc/e-online-button.c:29
+#: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "åççèçæäçïEvolution çåçéçæåã"
 
-#: ../widgets/misc/e-preferences-window.c:275
+#: ../widgets/misc/e-preferences-window.c:279
 msgid "Evolution Preferences"
 msgstr "Evolution ååèå"
 
-#: ../widgets/misc/e-search-bar.c:75
+#: ../widgets/misc/e-search-bar.c:79
 #, c-format
 msgid "Matches: %d"
 msgstr "çåï%d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:561
 msgid "Close the find bar"
 msgstr "ééæåååå"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:569
 msgid "Fin_d:"
 msgstr "åæ(_D):"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:581
 msgid "Clear the search"
 msgstr "æéææå"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:605
 msgid "_Previous"
 msgstr "ääå(_P)"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:611
 msgid "Find the previous occurrence of the phrase"
 msgstr "åæääååççåè"
 
-#: ../widgets/misc/e-search-bar.c:620
+#: ../widgets/misc/e-search-bar.c:624
 msgid "_Next"
 msgstr "ääå(_N)"
 
-#: ../widgets/misc/e-search-bar.c:626
+#: ../widgets/misc/e-search-bar.c:630
 msgid "Find the next occurrence of the phrase"
 msgstr "åæääååççåè"
 
-#: ../widgets/misc/e-search-bar.c:639
+#: ../widgets/misc/e-search-bar.c:643
 msgid "Mat_ch case"
 msgstr "ååååå(_C)"
 
-#: ../widgets/misc/e-search-bar.c:667
+#: ../widgets/misc/e-search-bar.c:671
 msgid "Reached bottom of page, continued from top"
 msgstr "åéééåéïåéççç"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:693
 msgid "Reached top of page, continued from bottom"
 msgstr "åééééçïååéçç"
 
@@ -20384,38 +20391,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "ææ"
 
-#: ../widgets/misc/e-signature-editor.c:134
-#: ../widgets/misc/e-signature-editor.c:560
-#: ../widgets/misc/e-signature-manager.c:348
-#: ../widgets/misc/e-signature-script-dialog.c:215
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "æååç"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "åååéé(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:427
+#: ../widgets/misc/e-signature-editor.c:431
 msgid "Edit Signature"
 msgstr "çèçåæ"
 
-#: ../widgets/misc/e-signature-editor.c:442
+#: ../widgets/misc/e-signature-editor.c:446
 msgid "_Signature Name:"
 msgstr "çåæåç(_S):"
 
-#: ../widgets/misc/e-signature-manager.c:293
+#: ../widgets/misc/e-signature-manager.c:317
 msgid "Add Signature Script"
 msgstr "æåçååäç"
 
-#: ../widgets/misc/e-signature-manager.c:358
+#: ../widgets/misc/e-signature-manager.c:382
 msgid "Edit Signature Script"
 msgstr "çèçååäç"
 
-#: ../widgets/misc/e-signature-manager.c:577
+#: ../widgets/misc/e-signature-manager.c:602
 msgid "Add _Script"
 msgstr "æååäç(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:264
+#: ../widgets/misc/e-signature-script-dialog.c:268
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -20425,11 +20432,11 @@ msgstr ""
 "çåæãææåçåçåæäç\n"
 "éçäçã"
 
-#: ../widgets/misc/e-signature-script-dialog.c:309
+#: ../widgets/misc/e-signature-script-dialog.c:313
 msgid "S_cript:"
 msgstr "åäç(_C):"
 
-#: ../widgets/misc/e-signature-script-dialog.c:340
+#: ../widgets/misc/e-signature-script-dialog.c:344
 msgid "Script file must be executable."
 msgstr "åäçåéçååèæã"
 
@@ -20437,80 +20444,86 @@ msgstr "åäçåéçååèæã"
 msgid "Click here to go to URL"
 msgstr "æéèäçè URL"
 
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:408
 msgid "_Copy Link Location"
 msgstr "èèéçäå(_C)"
 
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:410
 msgid "Copy the link to the clipboard"
 msgstr "èèéçååèè"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:418
 msgid "_Open Link in Browser"
 msgstr "åçèååéåéç(_O)"
 
-#: ../widgets/misc/e-web-view.c:387
+#: ../widgets/misc/e-web-view.c:420
 msgid "Open the link in a web browser"
 msgstr "åçéçèåäéåæéç"
 
-#: ../widgets/misc/e-web-view.c:395
+#: ../widgets/misc/e-web-view.c:428
 msgid "_Copy Email Address"
 msgstr "èèéåéääå(_C)"
 
-#: ../widgets/misc/e-web-view.c:424
-#: ../widgets/misc/e-web-view.c:1080
+#: ../widgets/misc/e-web-view.c:445
+msgid "_Copy Image"
+msgstr "èèåç(_C)"
+
+#: ../widgets/misc/e-web-view.c:447
+msgid "Copy the image to the clipboard"
+msgstr "èèåçååèè"
+
+#: ../widgets/misc/e-web-view.c:467 ../widgets/misc/e-web-view.c:1292
 msgid "Select all text and images"
 msgstr "éææææåååç"
 
-#: ../widgets/misc/e-web-view.c:860
-#: ../widgets/misc/e-web-view.c:862
-#: ../widgets/misc/e-web-view.c:864
+#: ../widgets/misc/e-web-view.c:956 ../widgets/misc/e-web-view.c:958
+#: ../widgets/misc/e-web-view.c:960
 #, c-format
 msgid "Click to call %s"
 msgstr "æääæèç %s"
 
-#: ../widgets/misc/e-web-view.c:866
+#: ../widgets/misc/e-web-view.c:962
 msgid "Click to hide/unhide addresses"
 msgstr "æéèéè/èééèäå"
 
-#: ../widgets/misc/e-web-view.c:868
+#: ../widgets/misc/e-web-view.c:964
 #, c-format
 msgid "Click to open %s"
 msgstr "æäääéå %s"
 
-#: ../widgets/misc/ea-calendar-item.c:299
-#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:302
+#: ../widgets/misc/ea-calendar-item.c:311
 msgid "%d %B %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../widgets/misc/ea-calendar-item.c:311
+#: ../widgets/misc/ea-calendar-item.c:314
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "èäæïå %s å %s"
 
-#: ../widgets/misc/ea-calendar-item.c:347
+#: ../widgets/misc/ea-calendar-item.c:350
 msgid "evolution calendar item"
 msgstr "evolution èäæéç"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "åååæå"
 
-#: ../widgets/table/e-cell-date-edit.c:300
+#: ../widgets/table/e-cell-date-edit.c:299
 msgid "Now"
 msgstr "çå"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:317
+#: ../widgets/table/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "ææ"
 
-#: ../widgets/table/e-cell-date-edit.c:325
+#: ../widgets/table/e-cell-date-edit.c:324
 msgid "OK"
 msgstr "çå"
 
-#: ../widgets/table/e-cell-date-edit.c:869
+#: ../widgets/table/e-cell-date-edit.c:868
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "æéåéçææåï%s"
@@ -20519,36 +20532,34 @@ msgstr "æéåéçææåï%s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "æååéæç 0 å 100 çæå"
 
-#: ../widgets/table/e-table-click-to-add.c:592
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
+#: ../widgets/table/e-table-click-to-add.c:594
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:141
 msgid "click to add"
 msgstr "èæéèåå"
 
-#: ../widgets/table/e-table-config.c:385
-#: ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Ascending)"
 msgstr "(éå)"
 
-#: ../widgets/table/e-table-config.c:385
-#: ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Descending)"
 msgstr "(éæ)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:394
 msgid "Not sorted"
 msgstr "ææå"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:435
 msgid "No grouping"
 msgstr "æçæçç"
 
-#: ../widgets/table/e-table-config.c:654
+#: ../widgets/table/e-table-config.c:659
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "éçæä"
 
-#: ../widgets/table/e-table-config.c:674
+#: ../widgets/table/e-table-config.c:679
 msgid "Available Fields"
 msgstr "åççæä"
 
@@ -20557,7 +20568,7 @@ msgid "A_vailable Fields:"
 msgstr "åççæä(_V):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "Ascending"
 msgstr "éå"
 
@@ -20570,7 +20581,7 @@ msgid "Clear _All"
 msgstr "åéæé(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "Descending"
 msgstr "éæ"
 
@@ -20618,6 +20629,10 @@ msgstr "æäéç(_F)â"
 msgid "_Group By..."
 msgstr "ççä(_G)â"
 
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "çé(_R)"
+
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "éçæèäçæä(_S)"
@@ -20630,11 +20645,11 @@ msgstr "äåéçéäæä(_S):"
 msgid "_Sort..."
 msgstr "æå(_S)â"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:117
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
 msgid "Add a Column"
 msgstr "ååäæ"
 
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -20649,12 +20664,11 @@ msgstr ""
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:353
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%sï%s (%d åéç)"
-msgstr[1] "%sï%s (%d åéç)"
 
 #. Translators: This text is used as a special row when an ETable
 #. has turned on grouping on a column, which doesn't have set a title.
@@ -20662,418 +20676,105 @@ msgstr[1] "%sï%s (%d åéç)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:365
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d åéç)"
-msgstr[1] "%s (%d åéç)"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1523
 msgid "Customize Current View"
 msgstr "èèçåçæè"
 
-#: ../widgets/table/e-table-header-item.c:1525
+#: ../widgets/table/e-table-header-item.c:1544
 msgid "Sort _Ascending"
 msgstr "éåæå(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1528
+#: ../widgets/table/e-table-header-item.c:1547
 msgid "Sort _Descending"
 msgstr "éææå(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1550
 msgid "_Unsort"
 msgstr "äæå(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1553
 msgid "Group By This _Field"
 msgstr "äææäåçç(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1556
 msgid "Group By _Box"
 msgstr "äæåççç(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "Remove This _Column"
 msgstr "çéææ(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1544
+#: ../widgets/table/e-table-header-item.c:1563
 msgid "Add a C_olumn..."
 msgstr "ååäæ(_O)â"
 
-#: ../widgets/table/e-table-header-item.c:1548
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "A_lignment"
 msgstr "æå(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1551
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "B_est Fit"
 msgstr "æéåæ(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "Format Column_s..."
 msgstr "æååæ(_S)â"
 
-#: ../widgets/table/e-table-header-item.c:1558
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Custo_mize Current View..."
 msgstr "èèçåçæè(_M)â"
 
-#: ../widgets/table/e-table-header-item.c:1617
+#: ../widgets/table/e-table-header-item.c:1636
 msgid "_Sort By"
 msgstr "æåæå(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1635
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Custom"
 msgstr "èè(_C)"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "åååéå"
 
 #. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
 msgid "toggle the cell"
 msgstr "åæååæ"
 
 #. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
 msgid "expands the row in the ETree containing this cell"
 msgstr "åé ETree äååæååæçå"
 
 #. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "æç ETree äååæååæçå"
 
-#: ../widgets/table/gal-a11y-e-cell.c:119
+#: ../widgets/table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "èæçååæ"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "åæ"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+#: ../widgets/table/gal-a11y-e-table-column-header.c:157
 msgid "sort"
 msgstr "æå"
 
-#: ../widgets/text/e-text.c:2283
+#: ../widgets/text/e-text.c:2306
 msgid "Select All"
 msgstr "åééå"
 
-#: ../widgets/text/e-text.c:2295
+#: ../widgets/text/e-text.c:2318
 msgid "Input Methods"
 msgstr "èåæ"
-
-#~ msgid "(map)"
-#~ msgstr "(æå)"
-
-#~ msgid "map"
-#~ msgstr "åæ"
-
-#~ msgid "Accessing LDAP Server anonymously"
-#~ msgstr "æäååæååå LDAP äæå"
-
-#~ msgid "Select folder to import OE folder into"
-#~ msgstr "éååå OE èæåççèæå"
-
-#~ msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
-#~ msgstr "éæäå png ççïæååæ 700 äåçïåå 48*48ï"
-
-#~ msgid "Account Management"
-#~ msgstr "åèçç"
-
-#~ msgid "Migrate local mbox folders to maildir"
-#~ msgstr "åæåç mbox èæåèæç maildir"
-
-#~ msgid "Start Evolution activating the specified component"
-#~ msgstr "åå Evolution æååæåçåä"
-
-#~ msgid "Count of default recurrence for a new event. -1 means forever."
-#~ msgstr "æääçéèéææææã -1 äèæéã"
-
-#~ msgid "Default recurrence count"
-#~ msgstr "éèéæåçææ"
-
-#~ msgid "Event Gradient"
-#~ msgstr "ääæåææ"
-
-#~ msgid "Event Transparency"
-#~ msgstr "ääéæææ"
-
-#~ msgid "Gradient of the events in calendar views."
-#~ msgstr "èäææèäçääæåææã"
-
-#~ msgid ""
-#~ "Transparency of the events in calendar views, a value between 0 "
-#~ "(transparent) and 1 (opaque)."
-#~ msgstr ""
-#~ "èäææèäçääéæåææïæåäæ 0 (ååéæ)å 10 (äéæ)äéã"
-
-#~ msgid "URI of the highlighted (\"primary\") calendar"
-#~ msgstr "çéç(ãäèã)èäæç URI"
-
-#~ msgid "URI of the highlighted (\"primary\") memo list"
-#~ msgstr "çéç(ãäèã)ååéæåç URI"
-
-#~ msgid "URI of the highlighted (\"primary\") task list"
-#~ msgstr "çéç(ãäèã)åäæåç URI"
-
-#~ msgid "Recurring:"
-#~ msgstr "åçæåï"
-
-#~ msgid "Yes. (Complex Recurrence)"
-#~ msgstr "æã(èéåç)"
-
-#~ msgid "Every day"
-
-#~ msgid_plural "Every %d days"
-#~ msgstr[0] "æå"
-#~ msgstr[1] "æ %d å"
-
-#~ msgid "Every week"
-
-#~ msgid_plural "Every %d weeks"
-#~ msgstr[0] "æé"
-#~ msgstr[1] "æ %d é"
-
-#~ msgid "Every week on "
-
-#~ msgid_plural "Every %d weeks on "
-#~ msgstr[0] "æéæ"
-#~ msgstr[1] "æ %d éæ"
-
-#~ msgid " and "
-#~ msgstr " å "
-
-#~ msgid "The %s day of "
-#~ msgstr "%s ææ "
-
-#~ msgid "The %s %s of "
-#~ msgstr "%s %s ææ "
-
-#~ msgid "every month"
-
-#~ msgid_plural "every %d months"
-#~ msgstr[0] "ææ"
-#~ msgstr[1] "æ %d æ"
-
-#~ msgid "Every year"
-
-#~ msgid_plural "Every %d years"
-#~ msgstr[0] "æå"
-#~ msgstr[1] "æ %d å"
-
-#~ msgid "a total of %d time"
-
-#~ msgid_plural "a total of %d times"
-#~ msgstr[0] "çå %d æ"
-#~ msgstr[1] "çå %d æ"
-
-#~ msgid ", ending on "
-#~ msgstr "ïçææ "
-
-#~ msgid "Starts"
-#~ msgstr "éå"
-
-#~ msgid "Ends"
-#~ msgstr "çæ"
-
-#~ msgid "iCalendar Information"
-#~ msgstr "iCalendar èè"
-
-#~ msgid "iCalendar Error"
-#~ msgstr "iCalendar éè"
-
-#~ msgid ""
-#~ "Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr " èæéäåèèïçååäéçéåäéæäååäã"
-
-#~ msgid ""
-#~ "The meeting has been canceled, however it could not be found in your "
-#~ "calendars"
-#~ msgstr "æèåçåæïäæåæçèäæäæäå"
-
-#~ msgid ""
-#~ "The task has been canceled, however it could not be found in your task "
-#~ "lists"
-#~ msgstr "åäåçåæïäæåæçåäæåäæäå"
-
-#~ msgid "%s has published meeting information."
-#~ msgstr "%s åççåæèèèã"
-
-#~ msgid "Meeting Information"
-#~ msgstr "æèèè"
-
-#~ msgid "%s requests the presence of %s at a meeting."
-#~ msgstr "%s éè %s ååæææèã"
-
-#~ msgid "%s requests your presence at a meeting."
-#~ msgstr "%s éèæååæææèã"
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "æèææ"
-
-#~ msgid "%s wishes to be added to an existing meeting."
-#~ msgstr "%s åæååäåæåçæèã"
-
-#~ msgid "Meeting Update"
-#~ msgstr "æèææ"
-
-#~ msgid "%s wishes to receive the latest meeting information."
-#~ msgstr "%s åææåææçæèèèã"
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "æèææèæ"
-
-#~ msgid "%s has replied to a meeting request."
-#~ msgstr "%s åççèäæèèæã"
-
-#~ msgid "Meeting Reply"
-#~ msgstr "æèçè"
-
-#~ msgid "%s has canceled a meeting."
-#~ msgstr "%s åçæåæèã"
-
-#~ msgid "Meeting Cancelation"
-#~ msgstr "æèåæ"
-
-#~ msgid "%s has sent an unintelligible message."
-#~ msgstr "%s åéääåéäçèçèæã"
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "äæççæèèæ"
-
-#~ msgid "%s has published task information."
-#~ msgstr "%s åççåäåäèèã"
-
-#~ msgid "Task Information"
-#~ msgstr "åäèè"
-
-#~ msgid "%s requests %s to perform a task."
-#~ msgstr "%s èæ %s éèåäã"
-
-#~ msgid "%s requests you perform a task."
-#~ msgstr "%s èææéèåäã"
-
-#~ msgid "Task Proposal"
-#~ msgstr "åäèå"
-
-#~ msgid "%s wishes to be added to an existing task."
-#~ msgstr "%s åæååäéæåçåäã"
-
-#~ msgid "Task Update"
-#~ msgstr "åäææ"
-
-#~ msgid "%s wishes to receive the latest task information."
-#~ msgstr "%s åææåææçåäèèã"
-
-#~ msgid "Task Update Request"
-#~ msgstr "åäææèæ"
-
-#~ msgid "%s has replied to a task assignment."
-#~ msgstr "%s åçåèææçåäã"
-
-#~ msgid "Task Reply"
-#~ msgstr "åäåè"
-
-#~ msgid "%s has canceled a task."
-#~ msgstr "%s åçåæåäã"
-
-#~ msgid "Task Cancelation"
-#~ msgstr "åäåæ"
-
-#~ msgid "Bad Task Message"
-#~ msgstr "äæççåäèæ"
-
-#~ msgid "%s has published free/busy information."
-#~ msgstr "%s åççåçé/åçèèã"
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "çé/åçèè"
-
-#~ msgid "%s requests your free/busy information."
-#~ msgstr "%s èææççé/åçèèã"
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "çé/åçèæ"
-
-#~ msgid "%s has replied to a free/busy request."
-#~ msgstr "%s åççèçé/åçèæã"
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "çé/åçåè"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "äæçççé/åçèæ"
-
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "éäääææèéçåçæ"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "éåéäåååäææçèæã"
-
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "éäææåæèçèäæéç"
-
-#~ msgid "Update complete\n"
-#~ msgstr "ææåæ\n"
-
-#~ msgid "Object is invalid and cannot be updated\n"
-#~ msgstr "çäæçæçèääèææ\n"
-
-#~ msgid "This response is not from a current attendee.  Add as an attendee?"
-#~ msgstr "éååèäéäèçåçåæèãåäååçåæèï"
-
-#~ msgid "Attendee status could not be updated because of an invalid status!\n"
-#~ msgstr "çæäåæççæäååæèçæçæææï\n"
-
-#~ msgid "Attendee status updated\n"
-#~ msgstr "åæèçæåææ\n"
-
-#~ msgid "Item sent!\n"
-#~ msgstr "éçåéï\n"
-
-#~ msgid "The item could not be sent!\n"
-#~ msgstr "çæåééåéçï\n"
-
-#~ msgid "Choose an action:"
-#~ msgstr "éæäååä:"
-
-#~ msgid "Update"
-#~ msgstr "ææ"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "æææå"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "éåçé/åçèè"
-
-#~ msgid "Update respondent status"
-#~ msgstr "ææåæçæ"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "éåææèè"
-
-#~ msgid "--to--"
-#~ msgstr "--å--"
-
-#~ msgid "Calendar Message"
-#~ msgstr "èäæèæ"
-
-#~ msgid "Date:"
-#~ msgstr "ææ:"
-
-#~ msgid "Loading Calendar"
-#~ msgstr "èåèäæ"
-
-#~ msgid "Loading calendar..."
-#~ msgstr "èåèäæâ"
-
-#~ msgid "Organizer:"
-#~ msgstr "æèåéä:"
-
-#~ msgid "Server Message:"
-#~ msgstr "äæåèæ:"



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