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



commit 009008924daea0c24bc458b01dfa35b18aecd5f2
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sun Jan 23 14:19:38 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 3103 ++++++++++++++++++++++++---------------------------
 po/zh_TW.po | 3599 ++++++++++++++++++++++++++---------------------------------
 2 files changed, 3016 insertions(+), 3686 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index fde5620..75ff082 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,32 +7,27 @@
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
 #
-#: ../shell/main.c:615
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.91.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-09 20:14+0800\n"
-"PO-Revision-Date: 2010-12-09 20:15+0800\n"
+"Project-Id-Version: evolution 2.91.6\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
+"POT-Creation-Date: 2011-01-18 17:03+0000\n"
+"PO-Revision-Date: 2011-01-23 14:18+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"
 
 #. 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
@@ -52,10 +47,7 @@ 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."
+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
@@ -67,10 +59,7 @@ 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."
+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
@@ -78,7 +67,8 @@ msgid "Delete address book '{0}'?"
 msgstr "åééèéã{0}ãï"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:34
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Delete"
 msgstr "äèåé(_N)"
 
@@ -113,15 +103,11 @@ 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?"
+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."
+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
@@ -133,9 +119,7 @@ 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."
+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
@@ -163,16 +147,11 @@ 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?"
+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"
+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
@@ -180,18 +159,16 @@ 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?"
+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."
+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:603
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:603
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
@@ -227,7 +204,8 @@ msgstr "éåçåæ"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2083 ../capplet/anjal-settings-main.c:123
+#: ../calendar/gui/e-calendar-view.c:2083
+#: ../capplet/anjal-settings-main.c:124
 #: ../shell/main.c:133
 msgid "Birthday"
 msgstr "çæ"
@@ -265,7 +243,8 @@ msgstr "èçäçèå"
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+#: ../plugins/groupwise-features/junk-settings.c:409
+#: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "éåéä"
 
@@ -498,7 +477,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:368
+#: ../addressbook/gui/widgets/eab-gui-util.c:381
 msgid "Error adding contact"
 msgstr "æåèçäæççéè"
 
@@ -655,7 +634,7 @@ msgid "_List name:"
 msgstr "åååç(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:159
 msgid "_Select..."
 msgstr "éå(_S)â"
 
@@ -688,19 +667,18 @@ msgstr "çéæåæççéè"
 msgid "Changed Contact:"
 msgstr "ææåçèçä:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
 msgid "Conflicting Contact:"
 msgstr "èççèçä:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "åæåéèçèçä"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+#: ../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 "æèçäçåçæéåéäåååçååææèæåãçèåäéèæåååï"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
@@ -725,7 +703,8 @@ msgid "_Merge"
 msgstr "åä(_M)"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:169
-#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#: ../addressbook/util/addressbook.c:245
+#: ../calendar/gui/tasktypes.xml.h:7
 #, c-format
 msgid "Cancelled"
 msgstr "ååæ"
@@ -735,7 +714,8 @@ 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:1691
@@ -1251,37 +1231,28 @@ msgstr "éèæ"
 msgid "Click to mail %s"
 msgstr "æäääåééä %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-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: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:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
 #, 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:111
-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: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:120
-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:126
+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:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid "Detailed error message:"
 msgstr "èççéèèæï"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1293,7 +1264,7 @@ msgstr ""
 "èäçæåæççæèæææéæçéæåççé\n"
 "äæåååèåäççæéåã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 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"
@@ -1306,49 +1277,49 @@ msgstr ""
 "æéäéã"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 #, 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:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 #, 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:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 #, 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:202
+#: ../addressbook/gui/widgets/eab-gui-util.c:214
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:242
+#: ../addressbook/gui/widgets/eab-gui-util.c:254
 msgid "Select Address Book"
 msgstr "éæéèé"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 msgid "list"
 msgstr "æå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:441
+#: ../addressbook/gui/widgets/eab-gui-util.c:455
 msgid "Move contact to"
 msgstr "åèçäçå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Copy contact to"
 msgstr "èèèçäå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
+#: ../addressbook/gui/widgets/eab-gui-util.c:460
 msgid "Move contacts to"
 msgstr "åèçäçå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:448
+#: ../addressbook/gui/widgets/eab-gui-util.c:462
 msgid "Copy contacts to"
 msgstr "èèèçäå"
 
@@ -1360,7 +1331,8 @@ msgstr "åçæèæå"
 #: ../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
+#: ../calendar/importers/icalendar-importer.c:764
+#: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ååâ"
 
@@ -1450,9 +1422,7 @@ 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."
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
 msgstr "éåææåäïäåèåææäçåçæçïéèååæ 100ã"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:75
@@ -1460,8 +1430,7 @@ msgid "NUMBER"
 msgstr "æé"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:137
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "æäååæéèïèäç --help ééäæççæã"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:151
@@ -1507,28 +1476,20 @@ 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
@@ -1540,9 +1501,7 @@ 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
@@ -1550,13 +1509,11 @@ 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
@@ -1666,14 +1623,11 @@ 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
@@ -1695,45 +1649,31 @@ 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
@@ -1821,10 +1761,7 @@ 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
@@ -1860,7 +1797,8 @@ msgstr "éæåå Evolution äåïçæäçäçåäã"
 msgid "_Discard Changes"
 msgstr "ææææ(_D)"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:271
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "åå(_S)"
 
@@ -1869,7 +1807,8 @@ msgid "_Save Changes"
 msgstr "ååææ(_S)"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:33
+#: ../mail/mail.error.xml.h:158
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "åé(_S)"
@@ -1905,8 +1844,8 @@ msgstr "åéèé(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
 #: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "äç:"
@@ -1915,7 +1854,8 @@ msgstr "äç:"
 msgid "Snooze _time:"
 msgstr "åçæé(_T):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:882
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../e-util/e-alert.c:887
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "èé(_D)"
@@ -1926,7 +1866,8 @@ msgstr "åæ(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
+#: ../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:375
 msgid "hours"
@@ -1939,39 +1880,41 @@ msgstr "çæçåé"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../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
+#: ../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:374
 msgid "minutes"
 msgstr "åé"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1585
 msgid "No summary available."
 msgstr "ææåççæèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
 msgid "No description available."
 msgstr "ææääæèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
 msgid "No location information available."
 msgstr "ææåççåéèèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1523
 #, 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:1698
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
 msgid "Warning"
 msgstr "èå"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1706
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1983,11 +1926,10 @@ msgstr ""
 "éåéåéäã  Evolution æéç\n"
 "æéçæéåèçääæã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
 #, 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"
@@ -2000,7 +1942,7 @@ msgstr ""
 "\n"
 "äçåèåèéåçåï"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1752
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1756
 msgid "Do not ask me about this program again."
 msgstr "äèåèåæéæéåçåã"
 
@@ -2009,7 +1951,8 @@ 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:406
+#: ../calendar/gui/alarm-notify/util.c:69
+#: ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2018,7 +1961,8 @@ 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:412
+#: ../calendar/gui/alarm-notify/util.c:75
+#: ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2029,7 +1973,8 @@ 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:418
+#: ../calendar/gui/alarm-notify/util.c:79
+#: ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2057,13 +2002,16 @@ msgstr "éæè"
 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 "éä"
 
@@ -2073,66 +2021,85 @@ 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:240
-#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
-#: ../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:780
+#: ../calendar/gui/e-task-table.c:495
+#: ../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
+#: ../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:524
 #: ../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
 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:239
-#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.c:239
+#: ../calendar/gui/e-cal-model.c:778
+#: ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "çä"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-cal-model.c:776
-#: ../calendar/gui/e-task-table.c:493 ../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:769
+#: ../calendar/gui/e-cal-model.c:776
+#: ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "åé"
 
@@ -2146,34 +2113,44 @@ 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
 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 "äæ"
 
@@ -2222,7 +2199,8 @@ 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:72
 msgid "Options"
 msgstr "éé"
 
@@ -2268,8 +2246,10 @@ msgstr "å"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../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:336
+#: ../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:336
 #: ../plugins/google-account-setup/google-contacts-source.c:376
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "days"
@@ -2319,7 +2299,8 @@ msgstr "éå:"
 msgid "_Type:"
 msgstr "éå(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:150
+#: ../calendar/gui/dialogs/calendar-setup.c:232
+#: ../mail/mail-config.ui.h:152
 #: ../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
@@ -2346,7 +2327,8 @@ 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
+#: ../mail/em-folder-properties.c:200
+#: ../mail/mail-config.ui.h:51
 #: ../modules/addressbook/addressbook-config.c:1015
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
 #: ../plugins/itip-formatter/itip-formatter.c:2818
@@ -2486,23 +2468,29 @@ msgstr "æåäæååéçï"
 msgid "Click here to close the current window"
 msgstr "æéèäééçåèç"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1020 ../mail/e-mail-browser.c:139
+#: ../calendar/gui/dialogs/comp-editor.c:1020
+#: ../mail/e-mail-browser.c:139
 #: ../shell/e-shell-window-actions.c:1434
-#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
+#: ../widgets/misc/e-focus-tracker.c:118
+#: ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:412
+#: ../widgets/misc/e-web-view.c:1065
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1027 ../mail/e-mail-browser.c:146
+#: ../calendar/gui/dialogs/comp-editor.c:1027
+#: ../mail/e-mail-browser.c:146
 #: ../shell/e-shell-window-actions.c:1441
-#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-focus-tracker.c:111
+#: ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:1059
 msgid "Cut the selection"
 msgstr "åäéåçå"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1034
 #: ../shell/e-shell-window-actions.c:1448
-#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:565
+#: ../widgets/misc/e-focus-tracker.c:132
+#: ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "åééåçå"
 
@@ -2510,9 +2498,11 @@ msgstr "åééåçå"
 msgid "Click here to view help available"
 msgstr "æéèäæèåççèæ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1048 ../mail/e-mail-browser.c:153
+#: ../calendar/gui/dialogs/comp-editor.c:1048
+#: ../mail/e-mail-browser.c:153
 #: ../shell/e-shell-window-actions.c:1483
-#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-focus-tracker.c:125
+#: ../widgets/misc/e-focus-tracker.c:560
 #: ../widgets/misc/e-web-view.c:1071
 msgid "Paste the clipboard"
 msgstr "èäåèççåå"
@@ -2521,9 +2511,11 @@ msgstr "èäåèççåå"
 msgid "Click here to save the current window"
 msgstr "æéèäååçåèç"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076 ../mail/e-mail-browser.c:160
+#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../mail/e-mail-browser.c:160
 #: ../shell/e-shell-window-actions.c:1553
-#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:570
+#: ../widgets/misc/e-focus-tracker.c:139
+#: ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "éåæææå"
 
@@ -2532,7 +2524,8 @@ msgid "_Classification"
 msgstr "æé(_C)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1090
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+#: ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:174
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1581
@@ -2540,7 +2533,8 @@ msgstr "æé(_C)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:167
+#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../mail/e-mail-browser.c:167
 #: ../shell/e-shell-window-actions.c:1588
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
@@ -2560,8 +2554,10 @@ msgstr "æå(_I)"
 msgid "_Options"
 msgstr "éé(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125 ../mail/e-mail-browser.c:181
-#: ../shell/e-shell-window-actions.c:1630 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../mail/e-mail-browser.c:181
+#: ../shell/e-shell-window-actions.c:1630
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æè(_V)"
 
@@ -2647,12 +2643,12 @@ msgid "Toggles whether the Attendee Type is displayed"
 msgstr "åææåéçãåæèéåãæä"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1238
-#: ../composer/e-composer-private.c:70
+#: ../composer/e-composer-private.c:73
 msgid "Recent _Documents"
 msgstr "æèäçæä(_D)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1923
-#: ../composer/e-composer-actions.c:461
+#: ../composer/e-composer-actions.c:469
 msgid "Attach"
 msgstr "éå"
 
@@ -2819,7 +2815,8 @@ msgstr "çé/åç(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "æèæåæèççé/åçèè"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
+#: ../calendar/gui/dialogs/event-editor.c:318
+#: ../calendar/gui/print.c:3142
 msgid "Appointment"
 msgstr "çæ"
 
@@ -2958,7 +2955,7 @@ msgstr "ææ"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "Atte_ndees..."
 msgstr "åæè(_N)â"
 
@@ -3029,7 +3026,8 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "çå"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
+#: ../calendar/gui/dialogs/memo-editor.c:109
+#: ../calendar/gui/print.c:3146
 msgid "Memo"
 msgstr "ååé"
 
@@ -3054,10 +3052,14 @@ msgstr "äèåæççèååéïåçääæåéä"
 msgid "Unable to open memos in '%s'."
 msgstr "çæåã%sãéåååéã"
 
-#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:282
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2401
-#: ../mail/em-format-html.c:2460 ../mail/em-format-html.c:2484
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:75
+#: ../calendar/gui/dialogs/memo-page.c:1081
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1052
+#: ../mail/em-format-html.c:2401
+#: ../mail/em-format-html.c:2466
+#: ../mail/em-format-html.c:2490
+#: ../mail/message-list.etspec.h:20
+#: ../modules/mail/em-mailer-prefs.c:75
 msgid "To"
 msgstr "æäè"
 
@@ -3295,7 +3297,8 @@ 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:79
 msgid "Preview"
 msgstr "éè"
 
@@ -3366,10 +3369,14 @@ msgstr "çé"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:298
 #: ../calendar/gui/e-cal-model-tasks.c:442
-#: ../calendar/gui/e-cal-model-tasks.c:716 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3230 ../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:716
+#: ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229
+#: ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:3232
+#: ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180
+#: ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "ååæ"
@@ -3379,18 +3386,24 @@ msgstr "ååæ"
 #: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:440
 #: ../calendar/gui/e-cal-model-tasks.c:714
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
-#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:592 ../calendar/gui/print.c:3227
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:232
+#: ../calendar/gui/e-task-table.c:212
+#: ../calendar/gui/e-task-table.c:227
+#: ../calendar/gui/e-task-table.c:592
+#: ../calendar/gui/print.c:3229
+#: ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
 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:317
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-task-table.c:516
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1226
+#: ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "é"
 
@@ -3399,25 +3412,31 @@ msgstr "é"
 #: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:438
 #: ../calendar/gui/e-cal-model-tasks.c:712
-#: ../calendar/gui/e-cal-model-tasks.c:789 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3224
+#: ../calendar/gui/e-cal-model-tasks.c:789
+#: ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225
+#: ../calendar/gui/e-task-table.c:591
+#: ../calendar/gui/print.c:3226
 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:321
-#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-task-table.c:518
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1224
+#: ../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:319
-#: ../calendar/gui/e-cal-model.c:1524 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1225
+#: ../calendar/gui/e-cal-model.c:1526
+#: ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/message-list.c:1225
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "äè"
@@ -3426,9 +3445,12 @@ msgstr "äè"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:302
 #: ../calendar/gui/e-cal-model-tasks.c:436
-#: ../calendar/gui/e-cal-model-tasks.c:710 ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:590
-#: ../calendar/gui/print.c:3221 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:710
+#: ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223
+#: ../calendar/gui/e-task-table.c:590
+#: ../calendar/gui/print.c:3223
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æéå"
 
@@ -3447,14 +3469,16 @@ msgstr "çæ(_U):"
 #: ../calendar/gui/e-calendar-view.c:1837
 #: ../calendar/gui/e-meeting-list-view.c:596
 #: ../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:519
+#: ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "ææå"
@@ -3485,7 +3509,8 @@ msgstr "æéèæè/æèèåäççæèçèæ"
 msgid "_Send Options"
 msgstr "åééé(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:331 ../calendar/gui/print.c:3142
+#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/print.c:3144
 #: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "åä"
@@ -3616,7 +3641,8 @@ msgstr "%s å %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s çæççèçéå"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:674
+#: ../calendar/gui/e-cal-component-preview.c:192
+#: ../filter/e-filter-rule.c:674
 msgid "Untitled"
 msgstr "çæé"
 
@@ -3647,7 +3673,8 @@ msgstr "çæï"
 msgid "Priority:"
 msgstr "ååççï"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "æèï"
 
@@ -3683,7 +3710,8 @@ msgid "Free"
 msgstr "çé"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "åç"
 
@@ -3703,39 +3731,46 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "ææ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model-tasks.c:1064
+#: ../calendar/gui/e-cal-model.c:1532
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-meeting-store.c:191
 #: ../calendar/gui/e-meeting-store.c:1029
 msgid "Yes"
 msgstr "æ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model-tasks.c:1064
+#: ../calendar/gui/e-cal-model.c:1532
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:193
 msgid "No"
 msgstr "å"
 
-#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:782
+#: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1073
-#: ../calendar/gui/print.c:1090 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:237
+#: ../calendar/gui/print.c:1073
+#: ../calendar/gui/print.c:1090
+#: ../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
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../calendar/gui/e-cal-model.c:1526
+#: ../calendar/gui/e-cal-model.c:1528
 msgid "Recurring"
 msgstr "éæææå"
 
-#: ../calendar/gui/e-cal-model.c:1528
+#: ../calendar/gui/e-cal-model.c:1530
 msgid "Assigned"
 msgstr "åæå"
 
-#: ../calendar/gui/e-cal-model.c:2608
+#: ../calendar/gui/e-cal-model.c:2610
 #, c-format
 msgid "Opening %s"
 msgstr "æåéå %s"
@@ -3795,40 +3830,46 @@ msgstr "ååèçèäää"
 msgid "Delete selected events"
 msgstr "åééåçää"
 
-#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:467
+#: ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "åééåççä"
 
-#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-memo-table.c:855
 #: ../calendar/gui/e-task-table.c:1078
 msgid "Updating objects"
 msgstr "ææçä"
 
 #: ../calendar/gui/e-calendar-view.c:1784
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/e-meeting-store.c:224
 #: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "æå"
 
 #: ../calendar/gui/e-calendar-view.c:1785
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:226
 #: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "åæ"
 
 #: ../calendar/gui/e-calendar-view.c:1786
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "Tentative"
 msgstr "æè"
 
 #: ../calendar/gui/e-calendar-view.c:1787
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:230
 #: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "ååæ"
@@ -3839,7 +3880,8 @@ 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:1932 ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-calendar-view.c:1932
+#: ../calendar/gui/e-memo-table.c:538
 #: ../calendar/gui/e-task-table.c:753
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -3847,14 +3889,16 @@ 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:1936 ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-calendar-view.c:1936
+#: ../calendar/gui/e-memo-table.c:543
 #: ../calendar/gui/e-task-table.c:756
 #, c-format
 msgid "Organizer: %s"
 msgstr "æèåéä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1952 ../calendar/gui/print.c:3176
+#: ../calendar/gui/e-calendar-view.c:1952
+#: ../calendar/gui/print.c:3178
 #, c-format
 msgid "Location: %s"
 msgstr "äçï%s"
@@ -3918,10 +3962,12 @@ 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:877 ../calendar/gui/e-day-view.c:1802
-#: ../calendar/gui/e-week-view-main-item.c:214 ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-day-view-top-item.c:877
+#: ../calendar/gui/e-day-view.c:1802
+#: ../calendar/gui/e-week-view-main-item.c:214
+#: ../calendar/gui/print.c:1847
 msgid "%A %d %B"
-msgstr "%A %d %B"
+msgstr "%B %d %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
@@ -3929,36 +3975,44 @@ msgstr "%A %d %B"
 #. %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:881 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-day-view-top-item.c:881
+#: ../calendar/gui/e-day-view.c:1819
 #: ../calendar/gui/e-week-view-main-item.c:223
 #: ../calendar/gui/ea-gnome-calendar.c:203
 #: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
-msgstr "%-m æ %-d æ (%a)"
+msgstr "%b %d (%a)"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #. 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:885 ../calendar/gui/e-day-view.c:1835
+#: ../calendar/gui/e-day-view-top-item.c:885
+#: ../calendar/gui/e-day-view.c:1835
 #: ../calendar/gui/e-week-view-main-item.c:237
 #: ../calendar/gui/ea-gnome-calendar.c:233
 #: ../modules/calendar/e-cal-shell-view-private.c:1041
 msgid "%d %b"
-msgstr "%-m æ %-d æ"
+msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:904 ../calendar/gui/print.c:920
-#: ../calendar/gui/print.c:2341 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-day-view.c:1005
+#: ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:904
+#: ../calendar/gui/print.c:920
+#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2358
 msgid "am"
 msgstr "äå"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1008 ../calendar/gui/e-week-view.c:763
-#: ../calendar/gui/print.c:906 ../calendar/gui/print.c:922
-#: ../calendar/gui/print.c:2343 ../calendar/gui/print.c:2360
+#: ../calendar/gui/e-day-view.c:1008
+#: ../calendar/gui/e-week-view.c:763
+#: ../calendar/gui/print.c:906
+#: ../calendar/gui/print.c:922
+#: ../calendar/gui/print.c:2343
+#: ../calendar/gui/print.c:2360
 msgid "pm"
 msgstr "äå"
 
@@ -3985,55 +4039,67 @@ msgid "Resources"
 msgstr "èæ"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1023 ../calendar/gui/print.c:1069
+#: ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:1023
+#: ../calendar/gui/print.c:1069
 msgid "Individual"
 msgstr "åå"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1070 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1070
+#: ../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:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:135
 #: ../calendar/gui/print.c:1071
 msgid "Resource"
 msgstr "èæ"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:137
 #: ../calendar/gui/print.c:1072
 msgid "Room"
 msgstr "æèå"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:166
 #: ../calendar/gui/print.c:1086
 msgid "Chair"
 msgstr "äå"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1026 ../calendar/gui/print.c:1087
+#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:1026
+#: ../calendar/gui/print.c:1087
 msgid "Required Participant"
 msgstr "ååè"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:170
 #: ../calendar/gui/print.c:1088
 msgid "Optional Participant"
 msgstr "ååè"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:172
 #: ../calendar/gui/print.c:1089
 msgid "Non-Participant"
 msgstr "çåè"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-store.c:222
 #: ../calendar/gui/e-meeting-store.c:1036
 msgid "Needs Action"
 msgstr "éèåä"
@@ -4049,35 +4115,36 @@ msgstr "åæè"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:234
 msgid "In Process"
 msgstr "éèä"
 
 #: ../calendar/gui/e-meeting-store.c:1760
-#, fuzzy, c-format
+#, c-format
 #| msgid "Enter password for user %s on server %s"
 msgid "Enter password to access free/busy information on server %s as user %s"
-msgstr "èåäçè %s åäæå %s äçåç "
+msgstr "èåäçè %2$s åäæå %1$s äååçé/åçèèçåç "
 
 #: ../calendar/gui/e-meeting-store.c:1767
-#, fuzzy, c-format
+#, c-format
 #| msgid "Failed to create thread: %s"
 msgid "Failure reason: %s"
-msgstr "çæåçåèçï%s"
+msgstr "åæååï%s"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:434
-#: ../calendar/gui/e-meeting-time-sel.c:2397
+#: ../calendar/gui/e-meeting-time-sel.c:2400
 msgid "%A, %B %d, %Y"
-msgstr "%Y å %-m æ %-d æ (%A)"
+msgstr "%Y, %B %d (%A)"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:438
-#: ../calendar/gui/e-meeting-time-sel.c:2428
+#: ../calendar/gui/e-meeting-time-sel.c:2431
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -4087,63 +4154,63 @@ msgstr "%Y/%m/%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "Out of Office"
 msgstr "äåèåå"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "No Information"
 msgstr "ææèè"
 
-#: ../calendar/gui/e-meeting-time-sel.c:587
+#: ../calendar/gui/e-meeting-time-sel.c:590
 msgid "O_ptions"
 msgstr "éé(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:605
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _only working hours"
 msgstr "åéçåäæé(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:616
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "Show _zoomed out"
 msgstr "éççå(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:635
 msgid "_Update free/busy"
 msgstr "ææçé/åç(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:647
+#: ../calendar/gui/e-meeting-time-sel.c:650
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:665
+#: ../calendar/gui/e-meeting-time-sel.c:668
 msgid "_Autopick"
 msgstr "èåéæ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:680
+#: ../calendar/gui/e-meeting-time-sel.c:683
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:698
+#: ../calendar/gui/e-meeting-time-sel.c:701
 msgid "_All people and resources"
 msgstr "ææäååèæ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:708
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "All _people and one resource"
 msgstr "ææäååäåèæ(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:721
 msgid "_Required people"
 msgstr "åèçäå(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:727
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "Required people and _one resource"
 msgstr "åèäååäåèæ(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:776
+#: ../calendar/gui/e-meeting-time-sel.c:779
 msgid "_Start time:"
 msgstr "éåæå(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:816
+#: ../calendar/gui/e-meeting-time-sel.c:819
 msgid "_End time:"
 msgstr "çææå(_E):"
 
@@ -4180,17 +4247,20 @@ msgstr "æå"
 msgid "Memos"
 msgstr "ååé"
 
-#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:717
+#: ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:717
 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:797
+#: ../calendar/gui/e-memo-table.c:585
+#: ../calendar/gui/e-task-table.c:797
 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:815
+#: ../calendar/gui/e-memo-table.c:604
+#: ../calendar/gui/e-task-table.c:815
 msgid "Due: "
 msgstr "åæ:"
 
@@ -4228,7 +4298,8 @@ msgstr "èæéèååæçååé"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
+#: ../calendar/gui/e-task-table.c:636
+#: ../calendar/gui/print.c:2140
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
@@ -4270,7 +4341,8 @@ 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:231 ../calendar/gui/print.c:1828
+#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/print.c:1828
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -4328,7 +4400,8 @@ msgstr "çèææ"
 msgid "a table to view and select the current time range"
 msgstr "çäæèèéææåçåçèæ"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:151
+#: ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4337,7 +4410,8 @@ 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:156 ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-day-view.c:156
+#: ../calendar/gui/ea-week-view.c:153
 msgid "It has no events."
 msgstr "åææääã"
 
@@ -4374,7 +4448,7 @@ msgstr "Gnome èäæ"
 #: ../calendar/gui/ea-gnome-calendar.c:200
 #: ../modules/calendar/e-cal-shell-view-private.c:1001
 msgid "%A %d %b %Y"
-msgstr "%Y/%m/%d (%a)"
+msgstr "%Y, %b %d (%A)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:205
 #: ../calendar/gui/ea-gnome-calendar.c:210
@@ -4383,7 +4457,7 @@ msgstr "%Y/%m/%d (%a)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1014
 #: ../modules/calendar/e-cal-shell-view-private.c:1017
 msgid "%a %d %b %Y"
-msgstr "%Y å %-m æ %-d æ (%a)"
+msgstr "%Y, %b %d (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:229
 #: ../calendar/gui/ea-gnome-calendar.c:235
@@ -4394,7 +4468,7 @@ msgstr "%Y å %-m æ %-d æ (%a)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1052
 #: ../modules/calendar/e-cal-shell-view-private.c:1055
 msgid "%d %b %Y"
-msgstr "%Y å %-m æ %-d æ"
+msgstr "%Y, %b %d"
 
 #: ../calendar/gui/ea-jump-button.c:147
 msgid "Jump button"
@@ -4483,7 +4557,8 @@ msgstr "éæäå(_T)"
 msgid "September"
 msgstr "äæ"
 
-#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
+#: ../calendar/gui/itip-utils.c:407
+#: ../calendar/gui/itip-utils.c:458
 #: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "åéæåäååéäã"
@@ -4492,19 +4567,23 @@ msgstr "åéæåäååéäã"
 msgid "At least one attendee is necessary"
 msgstr "èåéèäååæè"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:631
+#: ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "ääèè"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "åäèè"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:637
+#: ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "ååéèè"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "çé/åçèè"
 
@@ -4537,7 +4616,8 @@ 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:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:691
+#: ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "åæç"
@@ -4756,61 +4836,61 @@ msgstr "ä"
 msgid "Sa"
 msgstr "å"
 
-#: ../calendar/gui/print.c:2969
+#: ../calendar/gui/print.c:2971
 msgid " to "
 msgstr " å "
 
-#: ../calendar/gui/print.c:2979
+#: ../calendar/gui/print.c:2981
 msgid " (Completed "
 msgstr " (ååæ) "
 
-#: ../calendar/gui/print.c:2985
+#: ../calendar/gui/print.c:2987
 msgid "Completed "
 msgstr "ååæ "
 
-#: ../calendar/gui/print.c:2995
+#: ../calendar/gui/print.c:2997
 msgid " (Due "
 msgstr "(æé)"
 
-#: ../calendar/gui/print.c:3002
+#: ../calendar/gui/print.c:3004
 msgid "Due "
 msgstr "æé "
 
-#: ../calendar/gui/print.c:3167
+#: ../calendar/gui/print.c:3169
 #, c-format
 msgid "Summary: %s"
 msgstr "æèï%s"
 
-#: ../calendar/gui/print.c:3194
+#: ../calendar/gui/print.c:3196
 msgid "Attendees: "
 msgstr "åæè:"
 
-#: ../calendar/gui/print.c:3237
+#: ../calendar/gui/print.c:3239
 #, c-format
 msgid "Status: %s"
 msgstr "çæ(_S): %s"
 
-#: ../calendar/gui/print.c:3252
+#: ../calendar/gui/print.c:3254
 #, c-format
 msgid "Priority: %s"
 msgstr "ååéå(_P): %s"
 
-#: ../calendar/gui/print.c:3270
+#: ../calendar/gui/print.c:3272
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "åæçåæ: %i"
 
-#: ../calendar/gui/print.c:3281
+#: ../calendar/gui/print.c:3283
 #, c-format
 msgid "URL: %s"
 msgstr "çå: %s"
 
-#: ../calendar/gui/print.c:3294
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Categories: %s"
 msgstr "åé: %s"
 
-#: ../calendar/gui/print.c:3305
+#: ../calendar/gui/print.c:3307
 msgid "Contacts: "
 msgstr "èçä: "
 
@@ -4823,11 +4903,13 @@ msgstr "% ååæ"
 msgid "In progress"
 msgstr "æåéè"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28
+#: ../mail/em-filter-i18n.h: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 "åæ"
 
@@ -6621,7 +6703,8 @@ msgstr "ååçèç(_D)"
 msgid "Save as draft"
 msgstr "ååçèç"
 
-#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:318
+#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-private.c:347
 msgid "S_end"
 msgstr "åé(_E)"
 
@@ -6646,62 +6729,70 @@ msgid "Sign this message with your PGP key"
 msgstr "çäç PGP åçåçéäåäæççç"
 
 #: ../composer/e-composer-actions.c:358
+msgid "_Picture Gallery"
+msgstr "åçé(_P)"
+
+#: ../composer/e-composer-actions.c:360
+msgid "Show a collection of pictures that you can drag to your message"
+msgstr "çäåäææåéääçåçé"
+
+#: ../composer/e-composer-actions.c:366
 msgid "_Prioritize Message"
 msgstr "éäååæ(_P)"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:368
 msgid "Set the message priority to high"
 msgstr "åéäååæèçãéã"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:374
 msgid "Re_quest Read Receipt"
 msgstr "èæèäåæ(_Q)"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:376
 msgid "Get delivery notification when your message is read"
 msgstr "åäçéäèéèæååéäéç"
 
-#: ../composer/e-composer-actions.c:374
+#: ../composer/e-composer-actions.c:382
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME åå"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:384
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "äçäç S/MIME ååèæåéåéäåå"
 
-#: ../composer/e-composer-actions.c:382
+#: ../composer/e-composer-actions.c:390
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME åç"
 
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:392
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "çäç S/MIME ççèæçéäåäæççç"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:398
 msgid "_Bcc Field"
 msgstr "åäåææä(_B)"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:400
 msgid "Toggles whether the BCC field is displayed"
 msgstr "åæåäåææäçéççæ"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:406
 msgid "_Cc Field"
 msgstr "åææä(_C)"
 
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:408
 msgid "Toggles whether the CC field is displayed"
 msgstr "åæåææäçéççæ"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:414
 msgid "_Reply-To Field"
 msgstr "åèæä(_R)"
 
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:416
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "åæåèæäçéççæ"
 
-#: ../composer/e-composer-actions.c:464
+#: ../composer/e-composer-actions.c:475
 msgid "Save Draft"
 msgstr "ååèç"
 
@@ -6714,9 +6805,7 @@ msgid "Enter the addresses that will receive a carbon copy 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"
+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:1006
@@ -6759,55 +6848,51 @@ msgstr "æéèæåçéæå"
 msgid "Click here to select folders to post to"
 msgstr "æääéèïéåèåèçèæå"
 
-#: ../composer/e-composer-private.c:217
+#: ../composer/e-composer-private.c:245
 msgid "Undo the last action"
 msgstr "ååääæçåä"
 
-#: ../composer/e-composer-private.c:221
+#: ../composer/e-composer-private.c:249
 msgid "Redo the last undone action"
 msgstr "åæääæååçåä"
 
-#: ../composer/e-composer-private.c:225
+#: ../composer/e-composer-private.c:253
 msgid "Search for text"
 msgstr "æåæå"
 
-#: ../composer/e-composer-private.c:229
+#: ../composer/e-composer-private.c:257
 msgid "Search for and replace text"
 msgstr "æåååäæå"
 
-#: ../composer/e-composer-private.c:338
+#: ../composer/e-composer-private.c:367
 msgid "Save draft"
 msgstr "ååèç"
 
 #: ../composer/e-msg-composer.c:784
 #, 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
 #, 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:2014
+#: ../composer/e-msg-composer.c:1675
+#: ../composer/e-msg-composer.c:2043
 msgid "Compose Message"
 msgstr "çèéä"
 
-#: ../composer/e-msg-composer.c:4085
+#: ../composer/e-msg-composer.c:4118
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "éäçèåååäèçèçéæåçéäåæã"
 
-#: ../composer/e-msg-composer.c:4790
+#: ../composer/e-msg-composer.c:4823
 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
@@ -6827,9 +6912,7 @@ 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
@@ -6841,17 +6924,11 @@ 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
@@ -6883,9 +6960,7 @@ 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
@@ -6896,14 +6971,13 @@ 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:117
 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
@@ -6943,24 +7017,24 @@ msgstr "ååååäå(_S)"
 msgid "_Try Again"
 msgstr "åèäæ(_T)"
 
-#: ../capplet/anjal-settings-main.c:223
+#: ../capplet/anjal-settings-main.c:224
 msgid "Run Anjal in a window"
 msgstr "äååèçåè Anjal"
 
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:225
 msgid "Make Anjal the default email client"
 msgstr "ä Anjal åçéèéäåæç"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:231
+#: ../capplet/anjal-settings-main.c:232
 msgid "ID of the socket to embed in"
 msgstr "socket ç IDïååæ"
 
-#: ../capplet/anjal-settings-main.c:232
+#: ../capplet/anjal-settings-main.c:233
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:245
+#: ../capplet/anjal-settings-main.c:246
 msgid "Anjal email client"
 msgstr "Anjal éåéäåæç"
 
@@ -7037,17 +7111,11 @@ 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."
+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."
+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
@@ -7055,9 +7123,7 @@ 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."
+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
@@ -7065,13 +7131,12 @@ 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."
+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:2095 ../mail/em-account-editor.c:2216
+#: ../mail/em-account-editor.c:2095
+#: ../mail/em-account-editor.c:2216
 msgid "Identity"
 msgstr "èå"
 
@@ -7164,10 +7229,7 @@ msgid "Setup Yahoo calendar with Evolution"
 msgstr "å Yahoo èäæåå Evolution"
 
 #: ../capplet/settings/mail-account-view.c:770
-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."
+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:777
@@ -7196,11 +7258,16 @@ msgid "Evolution account assistant"
 msgstr "Evolution åèåç"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:358 ../mail/e-mail-migrate.c:677
-#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:148
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:218
+#: ../capplet/settings/mail-capplet-shell.c:358
+#: ../mail/e-mail-migrate.c:680
+#: ../mail/e-mail-store.c:225
+#: ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165
+#: ../mail/mail-vfolder.c:218
 #: ../mail/message-list.c:1709
 #: ../modules/addressbook/e-book-shell-backend.c:96
 #: ../modules/addressbook/e-book-shell-migrate.c:135
@@ -7238,7 +7305,8 @@ msgstr "èäæääéç"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution éééç"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:959
+#: ../data/evolution.desktop.in.in.h:1
+#: ../mail/e-mail-browser.c:959
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
@@ -7248,7 +7316,8 @@ 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:652
 msgid "Groupware Suite"
 msgstr "Groupware åèèä"
 
@@ -7356,12 +7425,16 @@ 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 "çé"
@@ -7385,7 +7458,8 @@ msgid "Today"
 msgstr "äå"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:210
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æå"
 
@@ -7403,7 +7477,8 @@ msgid_plural "Next %a"
 msgstr[0] "ä%a"
 msgstr[1] "ä%a"
 
-#: ../e-util/e-datetime-format.c:295 ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:295
+#: ../e-util/e-datetime-format.c:305
 #: ../e-util/e-datetime-format.c:314
 msgid "Use locale default"
 msgstr "äçååèåéèå"
@@ -7429,7 +7504,8 @@ msgstr "æåååã%sã"
 msgid "Writing \"%s\" to %s"
 msgstr "æåååã%sãè %s"
 
-#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:429
+#: ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:377
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
@@ -7444,8 +7520,7 @@ 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."
+msgid "The printing system did not report any additional details about the error."
 msgstr "æåççææååääéææéèçéåèèã"
 
 #: ../e-util/e-signature.c:707
@@ -7472,7 +7547,8 @@ msgstr "èèåå?"
 msgid "File exists \"{0}\"."
 msgstr "ææåååã{0}ãã"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:155
+#: ../e-util/e-system.error.xml.h:6
+#: ../mail/mail.error.xml.h:157
 msgid "_Overwrite"
 msgstr "èå(_O)"
 
@@ -7493,58 +7569,77 @@ msgstr "GConf éèï%s"
 msgid "All further errors shown only on terminal."
 msgstr "ææéäæçéèèæåæåççæäéçã"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
-#: ../mail/e-mail-tag-editor.c:329 ../mail/message-list.etspec.h:7
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1050
+#: ../mail/e-mail-tag-editor.c:329
+#: ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:73
 msgid "From"
 msgstr "åäè"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1051
 #: ../modules/mail/em-mailer-prefs.c:74
 msgid "Reply-To"
 msgstr "åè"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2464
-#: ../mail/em-format-html.c:2487 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2402
+#: ../mail/em-format-html.c:2470
+#: ../mail/em-format-html.c:2493
+#: ../modules/mail/em-mailer-prefs.c:76
 msgid "Cc"
 msgstr "åæ"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2403 ../mail/em-format-html.c:2468
-#: ../mail/em-format-html.c:2490 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2403
+#: ../mail/em-format-html.c:2474
+#: ../mail/em-format-html.c:2496
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "Bcc"
 msgstr "åäåæ"
 
-#: ../em-format/em-format-quote.c:426 ../em-format/em-format.c:1055
-#: ../mail/e-mail-tag-editor.c:334 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:427
+#: ../em-format/em-format.c:1055
+#: ../mail/e-mail-tag-editor.c:334
+#: ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18
+#: ../modules/mail/em-mailer-prefs.c:78
 #: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
+#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "äæ"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:437 ../mail/em-format-html.c:2584
+#: ../em-format/em-format-quote.c:438
+#: ../mail/em-format-html.c:2590
 #: ../modules/mail/em-mailer-prefs.c:1117
 msgid "Mailer"
 msgstr "åäè"
 
-#: ../em-format/em-format-quote.c:518 ../mail/em-composer-utils.c:1141
+#: ../em-format/em-format-quote.c:519
+#: ../mail/em-composer-utils.c:1142
 msgid "-------- Forwarded Message --------"
 msgstr "-------- èéçéä --------"
 
-#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:79 ../widgets/misc/e-dateedit.c:529
+#: ../em-format/em-format.c:1056
+#: ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:79
+#: ../widgets/misc/e-dateedit.c:529
 #: ../widgets/misc/e-dateedit.c:551
 msgid "Date"
 msgstr "ææ"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1057
+#: ../modules/mail/em-mailer-prefs.c:80
 msgid "Newsgroups"
 msgstr "æèçç"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format.c:1058
+#: ../modules/mail/em-mailer-prefs.c:81
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "éè"
@@ -7558,7 +7653,8 @@ msgstr "%s éä"
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "çæåæ S/MIME éä:æççéè"
 
-#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
+#: ../em-format/em-format.c:1729
+#: ../em-format/em-format.c:1926
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "çæèæ MIME æåçéäãååéçååæã"
 
@@ -7578,11 +7674,13 @@ msgstr "çæåæ PGP/MIME éäïæççéè"
 msgid "Unsupported signature format"
 msgstr "äææçççæå"
 
-#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
+#: ../em-format/em-format.c:1964
+#: ../em-format/em-format.c:2137
 msgid "Error verifying signature"
 msgstr "æéççççéè"
 
-#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
+#: ../em-format/em-format.c:1965
+#: ../em-format/em-format.c:2124
 #: ../em-format/em-format.c:2138
 msgid "Unknown error verifying signature"
 msgstr "æéççççäæéè"
@@ -7591,9 +7689,12 @@ msgstr "æéççççäæéè"
 msgid "Could not parse PGP message: "
 msgstr "çæèæ PGP éäï"
 
-#: ../em-format/em-format.c:2235 ../mail/mail-ops.c:624
+#: ../em-format/em-format.c:2235
+#: ../mail/em-folder-tree.c:662
+#: ../mail/mail-ops.c:624
 #: ../plugins/caldav/caldav-browse-server.c:211
-#: ../plugins/caldav/caldav-browse-server.c:1408 ../plugins/face/face.c:169
+#: ../plugins/caldav/caldav-browse-server.c:1408
+#: ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "äæçéè"
@@ -7702,7 +7803,8 @@ msgstr[1] "%d åå"
 msgid "<click here to select a date>"
 msgstr "<æéèéæææ>"
 
-#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:136
+#: ../filter/e-filter-datespec.c:147
 #: ../filter/e-filter-datespec.c:158
 msgid "now"
 msgstr "çå"
@@ -7750,7 +7852,8 @@ msgstr "ææ"
 msgid "All related"
 msgstr "ææçéç"
 
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:759
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "åè"
 
@@ -7770,12 +7873,14 @@ msgstr "åæéäçç(_N)"
 msgid "A_dd Condition"
 msgstr "ååæä(_D)"
 
-#: ../filter/e-filter-rule.c:1136 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:1136
+#: ../filter/filter.ui.h:2
 #: ../mail/em-utils.c:317
 msgid "Incoming"
 msgstr "åé"
 
-#: ../filter/e-filter-rule.c:1136 ../mail/em-utils.c:318
+#: ../filter/e-filter-rule.c:1136
+#: ../mail/em-utils.c:318
 msgid "Outgoing"
 msgstr "åå"
 
@@ -7807,7 +7912,8 @@ 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:83
 msgid "Missing name."
 msgstr "çååçã"
 
@@ -7863,7 +7969,8 @@ 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)"
 
@@ -7900,9 +8007,12 @@ msgstr "äæåçæå"
 msgid "years"
 msgstr "å"
 
-#: ../mail/e-mail-attachment-bar.c:93 ../mail/e-mail-attachment-bar.c:98
-#: ../mail/em-format-html-display.c:1053 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:131
+#: ../mail/e-mail-attachment-bar.c:93
+#: ../mail/e-mail-attachment-bar.c:98
+#: ../mail/em-format-html-display.c:1053
+#: ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:131
 #: ../widgets/misc/e-attachment-paned.c:136
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -7919,7 +8029,8 @@ msgstr "åçæè"
 msgid "List View"
 msgstr "æåæè"
 
-#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1406
+#: ../mail/e-mail-browser.c:132
+#: ../shell/e-shell-window-actions.c:1406
 #: ../shell/e-shell-window-actions.c:1413
 #: ../shell/e-shell-window-actions.c:1420
 msgid "Close this window"
@@ -8008,32 +8119,38 @@ msgstr "éè"
 msgid "Name"
 msgstr "åç"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree.c:2986
-#: ../modules/mail/e-mail-shell-view-private.c:1099
-#: ../modules/mail/e-mail-shell-view-private.c:1110
+#: ../mail/e-mail-local.c:35
+#: ../mail/em-folder-properties.c:285
+#: ../mail/em-folder-tree-model.c:766
+#: ../mail/em-folder-tree.c:3132
+#: ../modules/mail/e-mail-shell-view-private.c:1118
+#: ../modules/mail/e-mail-shell-view-private.c:1129
 msgid "Inbox"
 msgstr "æäå"
 
-#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:1007
+#: ../mail/e-mail-local.c:36
+#: ../mail/e-mail-migrate.c:1000
 #: ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1097
+#: ../modules/mail/e-mail-shell-view-private.c:1116
 msgid "Drafts"
 msgstr "èç"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
-#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../mail/e-mail-local.c:37
+#: ../mail/em-folder-tree-model.c:770
+#: ../modules/mail/e-mail-shell-view-private.c:1120
 msgid "Outbox"
 msgstr "åäå"
 
-#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:1000
+#: ../mail/e-mail-local.c:38
+#: ../mail/e-mail-migrate.c:994
 #: ../mail/em-folder-tree-model.c:772
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1122
 msgid "Sent"
 msgstr "ååé"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1105
+#: ../mail/e-mail-local.c:39
+#: ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1124
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:581
 msgid "Templates"
@@ -8052,14 +8169,13 @@ msgstr "çè"
 msgid "Migrating '%s':"
 msgstr "æåçèã%sãï"
 
-#: ../mail/e-mail-migrate.c:657
+#: ../mail/e-mail-migrate.c:660
 msgid "Migrating Folders"
 msgstr "æåèçèæå"
 
-#: ../mail/e-mail-migrate.c:658
+#: ../mail/e-mail-migrate.c:661
 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 ""
@@ -8067,7 +8183,7 @@ msgstr ""
 "\n"
 "ç Evolution çèäçèæåæïèèåçå..."
 
-#: ../mail/e-mail-migrate.c:1147
+#: ../mail/e-mail-migrate.c:1131
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "çæåã%sãåçæåéäèæåï%s"
@@ -8084,11 +8200,13 @@ msgstr "èéæèæå"
 msgid "Do not ask me again"
 msgstr "äèåèåæ"
 
-#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:309
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "èèèèæå"
 
-#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:309
+#: ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "èè(_O)"
 
@@ -8096,25 +8214,24 @@ msgstr "èè(_O)"
 #. %d with count of duplicate messages.
 #: ../mail/e-mail-reader.c:510
 #, 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?"
+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:969 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:969
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "çèèæå"
 
-#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:969
+#: ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "çå(_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1404
 #: ../mail/e-mail-reader.c:1446
 msgid "_Do not ask me again."
 msgstr "äèåèåæ(_D)ã"
@@ -8251,7 +8368,8 @@ msgstr "åéåçéäåäèéææ"
 msgid "_Attached"
 msgstr "éä(_A)"
 
-#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1953
 msgid "Forward the selected message to someone as an attachment"
 msgstr "åéåçéääéäååèåçæä"
 
@@ -8263,7 +8381,8 @@ msgstr "äéäèå(_A)"
 msgid "_Inline"
 msgstr "èå(_I)"
 
-#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1967
 msgid "Forward the selected message in the body of a new message"
 msgstr "åéèèåçéäåéææéäçåæä"
 
@@ -8275,7 +8394,8 @@ msgstr "äèåèå(_I)"
 msgid "_Quoted"
 msgstr "åæ(_Q)"
 
-#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1981
 msgid "Forward the selected message quoted like a reply"
 msgstr "åéèèåçéääåèéäæååå"
 
@@ -8501,7 +8621,8 @@ msgstr "çééèçéä(_P)"
 msgid "Checks selected messages for duplicates"
 msgstr "ææéåçéäæåæéè"
 
-#: ../mail/e-mail-reader.c:2182 ../mail/mail.error.xml.h:102
+#: ../mail/e-mail-reader.c:2182
+#: ../mail/mail.error.xml.h:102
 #: ../modules/calendar/e-cal-shell-view-actions.c:1463
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
@@ -8511,7 +8632,8 @@ msgstr "åèææä(_A)"
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æååéçåéåéäçåéæäè"
 
-#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2189
+#: ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "åèèæå(_L)"
 
@@ -8684,18 +8806,20 @@ msgstr "ææéäæé(_H)"
 msgid "Show messages with all email headers"
 msgstr "éçéäåèçæé"
 
-#: ../mail/e-mail-reader.c:2670
+#: ../mail/e-mail-reader.c:2676
 msgid "Unable to retrieve message"
 msgstr "çæææéä"
 
-#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
+#: ../mail/e-mail-reader.c:2737
+#: ../mail/mail-ops.c:2044
 #, 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:3344 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:3350
+#: ../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
@@ -8703,100 +8827,105 @@ msgstr "æåååéäã%sã"
 msgid "Default"
 msgstr "éèå"
 
-#: ../mail/e-mail-reader.c:3524
+#: ../mail/e-mail-reader.c:3530
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "èå(_F)"
 
-#: ../mail/e-mail-reader.c:3525
+#: ../mail/e-mail-reader.c:3531
 msgid "Forward the selected message to someone"
 msgstr "åéåçéäèåçæä"
 
-#: ../mail/e-mail-reader.c:3544
+#: ../mail/e-mail-reader.c:3550
 msgid "Group Reply"
 msgstr "ççåè"
 
-#: ../mail/e-mail-reader.c:3545
+#: ../mail/e-mail-reader.c:3551
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "åèçéäèåïææçææçæäè"
 
-#: ../mail/e-mail-reader.c:3590 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3596
+#: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:744
 msgid "Delete"
 msgstr "åé"
 
-#: ../mail/e-mail-reader.c:3623
+#: ../mail/e-mail-reader.c:3629
 #: ../modules/calendar/e-cal-shell-view-actions.c:1309
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3627
+#: ../mail/e-mail-reader.c:3633
 #: ../modules/calendar/e-cal-shell-view-actions.c:1302
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3637 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3643
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "åè"
 
-#: ../mail/e-mail-reader.c:4274
+#: ../mail/e-mail-reader.c:4280
 #, c-format
 msgid "Folder '%s'"
 msgstr "èæåã%sã"
 
-#: ../mail/e-mail-session.c:644
+#: ../mail/e-mail-session.c:647
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "èèå %s æéçåè"
 
-#: ../mail/e-mail-session.c:646
+#: ../mail/e-mail-session.c:649
 msgid "Enter Passphrase"
 msgstr "èååè"
 
-#: ../mail/e-mail-session.c:649
+#: ../mail/e-mail-session.c:652
 #, c-format
 msgid "Enter Password for %s"
 msgstr "èèå %s æéçåç"
 
-#: ../mail/e-mail-session.c:651
+#: ../mail/e-mail-session.c:654
 msgid "Enter Password"
 msgstr "èååç"
 
-#: ../mail/e-mail-session.c:696
+#: ../mail/e-mail-session.c:702
 #, c-format
 msgid "User canceled operation."
 msgstr "äçèååææäã"
 
-#: ../mail/e-mail-session.c:864
+#: ../mail/e-mail-session.c:870
 #, 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:873
+#: ../mail/e-mail-session.c:879
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æäååäççåèïéäçèååçåæã"
 
-#: ../mail/e-mail-session.c:1262 ../mail/mail-ops.c:1220
+#: ../mail/e-mail-session.c:1268
+#: ../mail/mail-ops.c:1220
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "éåèæåã%sã"
 
-#: ../mail/e-mail-session.c:1278
+#: ../mail/e-mail-session.c:1284
 #, c-format
 msgid "Invalid folder: %s"
 msgstr "çæçèæåï%s"
 
-#: ../mail/e-mail-session-utils.c:477 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:477
+#: ../mail/mail-ops.c:605
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "çæåçååéæåï%s"
 
-#: ../mail/e-mail-session-utils.c:501 ../mail/e-mail-session-utils.c:535
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:501
+#: ../mail/e-mail-session-utils.c:535
+#: ../mail/mail-ops.c:622
+#: ../mail/mail-ops.c:653
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -8805,17 +8934,19 @@ msgstr ""
 "çæéåè %sï%s\n"
 "æéåèæåãåäåãèæåã"
 
-#: ../mail/e-mail-session-utils.c:555 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:555
+#: ../mail/mail-ops.c:673
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "çæéåèæåãåäåãèæåï%s"
 
-#: ../mail/e-mail-session-utils.c:761 ../mail/mail-ops.c:774
+#: ../mail/e-mail-session-utils.c:765
+#: ../mail/mail-ops.c:774
 #: ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "æååééä"
 
-#: ../mail/e-mail-session-utils.c:832
+#: ../mail/e-mail-session-utils.c:836
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "åæèéèæå ã%sã"
@@ -8836,7 +8967,8 @@ 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:567 ../mail/mail-config.ui.h:69
+#: ../mail/em-account-editor.c:567
+#: ../mail/mail-config.ui.h:69
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "ææåå"
@@ -8844,7 +8976,8 @@ 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:571 ../mail/mail-config.ui.h:124
+#: ../mail/em-account-editor.c:571
+#: ../mail/mail-config.ui.h:126
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS åå"
@@ -8852,13 +8985,15 @@ 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:575 ../mail/mail-config.ui.h:91
+#: ../mail/em-account-editor.c:575
+#: ../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:843 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:843
+#: ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "ææ"
@@ -8876,7 +9011,8 @@ msgid "Ask for each message"
 msgstr "æåéäçèå"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:1708
+#: ../widgets/misc/e-account-tree-view.c:131
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "ææ"
@@ -8896,13 +9032,11 @@ msgstr ""
 "æääãååãéåã "
 
 #: ../mail/em-account-editor.c:2096
-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."
+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:2098 ../mail/em-account-editor.c:2260
+#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2260
 msgid "Receiving Email"
 msgstr "ææéåéä"
 
@@ -8910,23 +9044,26 @@ msgstr "ææéåéä"
 msgid "Please configure the following account settings."
 msgstr "èåèåäååèçèååã"
 
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2759
+#: ../mail/em-account-editor.c:2101
+#: ../mail/em-account-editor.c:2759
 msgid "Sending Email"
 msgstr "åééåéä"
 
 #: ../mail/em-account-editor.c:2102
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
+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:2104
-msgid "Account Management"
-msgstr "åèçç"
+#: ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "åèèè"
 
 #: ../mail/em-account-editor.c:2105
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
+"Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
 msgstr ""
 "èåäéççéèåæèéååèçåçã\n"
@@ -8962,54 +9099,55 @@ msgstr "åé(_T)"
 msgid "Please select a folder from the current account."
 msgstr "èéæçååèçèæåã"
 
-#: ../mail/em-account-editor.c:3172 ../mail/mail-config.ui.h:98
+#: ../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:3217 ../mail/em-account-editor.c:3285
+#: ../mail/em-account-editor.c:3217
+#: ../mail/em-account-editor.c:3285
 msgid "Receiving Options"
 msgstr "ææéé"
 
-#: ../mail/em-account-editor.c:3218 ../mail/em-account-editor.c:3286
+#: ../mail/em-account-editor.c:3218
+#: ../mail/em-account-editor.c:3286
 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:1136
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
+#: ../mail/em-composer-utils.c:1137
+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:1146
+#: ../mail/em-composer-utils.c:1147
 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:1804
+#: ../mail/em-composer-utils.c:1805
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "äåç %s äæã%sã (%s) çéäåèéèã"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1854
+#: ../mail/em-composer-utils.c:1855
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "éééçïã%sã"
 
-#: ../mail/em-composer-utils.c:2272
+#: ../mail/em-composer-utils.c:2273
 msgid "an unknown sender"
 msgstr "äæçåäè"
 
-#: ../mail/em-composer-utils.c:2696
+#: ../mail/em-composer-utils.c:2697
 msgid "Posting destination"
 msgstr "åèçççç"
 
-#: ../mail/em-composer-utils.c:2697
+#: ../mail/em-composer-utils.c:2698
 msgid "Choose folders to post the message to."
 msgstr "éåèæåäåèéäã"
 
@@ -9130,7 +9268,8 @@ 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:60
 msgid "Junk"
 msgstr "ååéä"
 
@@ -9179,11 +9318,13 @@ 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:15
 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 "æäè"
 
@@ -9211,11 +9352,13 @@ 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 "åäè"
 
@@ -9310,62 +9453,72 @@ msgid "Folder _name:"
 msgstr "èæååç(_N):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1140 ../mail/mail-vfolder.c:1216
+#: ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167
+#: ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1140
+#: ../mail/mail-vfolder.c:1216
 msgid "Search Folders"
 msgstr "æåèæå"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
+#: ../mail/em-folder-tree-model.c:174
+#: ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "äçå"
 
-#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:836
+#: ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
 msgstr "èåäâ"
 
-#: ../mail/em-folder-tree.c:201
+#: ../mail/em-folder-tree.c:203
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "ææã%sãåçèæå"
 
-#: ../mail/em-folder-tree.c:629
+#: ../mail/em-folder-tree.c:631
 msgid "Folder names cannot contain '/'"
 msgstr "èæååçäèååæçã"
 
-#: ../mail/em-folder-tree.c:1191
+#: ../mail/em-folder-tree.c:1250
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1427
+#: ../mail/em-folder-tree.c:1486
 msgid "Mail Folder Tree"
 msgstr "éäèæåæ"
 
-#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:1934
+#: ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "æåçåèæå %s"
 
-#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1938
+#: ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "æåèèèæå %s"
 
-#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
+#: ../mail/em-folder-tree.c:1947
+#: ../mail/message-list.c:2214
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æååéäçèèæå %s"
 
-#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
+#: ../mail/em-folder-tree.c:1951
+#: ../mail/message-list.c:2216
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æåèèéäèèæå %s"
 
-#: ../mail/em-folder-tree.c:1824
+#: ../mail/em-folder-tree.c:1970
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "çæåéäææåæäåçååå"
@@ -9394,99 +9547,89 @@ msgstr "åçèæå"
 msgid "Specify where to create the folder:"
 msgstr "æåèåçèæåçäçï"
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html.c:1604
 msgid "Unsigned"
 msgstr "æçç"
 
 #: ../mail/em-format-html-display.c:88
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "æéäæççãääèæéäåéèã"
 
-#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
+#: ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html.c:1605
 msgid "Valid signature"
 msgstr "ææççç"
 
 #: ../mail/em-format-html-display.c:89
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+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:90 ../mail/em-format-html.c:1606
+#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html.c:1606
 msgid "Invalid signature"
 msgstr "çæççç"
 
 #: ../mail/em-format-html-display.c:90
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "éäççççææéïåèåååéæèæåäã"
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
+#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html.c:1607
 msgid "Valid signature, but cannot verify sender"
 msgstr "ççææïäæçææéåäè"
 
 #: ../mail/em-format-html-display.c:91
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+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:92 ../mail/em-format-html.c:1608
+#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html.c:1608
 msgid "Signature exists, but need public key"
 msgstr "ççååïäéèåéåçå"
 
 #: ../mail/em-format-html-display.c:92
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "æéäæäåææçççïäæææåæçåéåçåã"
 
-#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
+#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html.c:1614
 msgid "Unencrypted"
 msgstr "æåå"
 
 #: ../mail/em-format-html-display.c:99
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "æéäæååãåçåååééäèçåéåèæèæéã"
 
-#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
+#: ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html.c:1615
 msgid "Encrypted, weak"
 msgstr "åååïäåå"
 
 #: ../mail/em-format-html-display.c:100
-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."
+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:101 ../mail/em-format-html.c:1616
+#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html.c:1616
 msgid "Encrypted"
 msgstr "ååå"
 
 #: ../mail/em-format-html-display.c:101
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+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:102 ../mail/em-format-html.c:1617
+#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html.c:1617
 msgid "Encrypted, strong"
 msgstr "åååïåå"
 
 #: ../mail/em-format-html-display.c:102
-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."
+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:238 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:238
+#: ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æèèæ(_V)"
 
@@ -9495,9 +9638,7 @@ msgid "This certificate is not viewable"
 msgstr "æèæçææè"
 
 #: ../mail/em-format-html-display.c:506
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
+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:749
@@ -9513,7 +9654,8 @@ msgstr "åææ:"
 msgid "by"
 msgstr "æ"
 
-#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
+#: ../mail/em-format-html-display.c:978
+#: ../mail/em-format-html-display.c:1025
 msgid "View _Unformatted"
 msgstr "æéææçç(_U)"
 
@@ -9538,7 +9680,8 @@ msgstr "æååéä"
 msgid "Formatting Message..."
 msgstr "æååéäâ"
 
-#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
+#: ../mail/em-format-html.c:1448
+#: ../mail/em-format-html.c:1458
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æåååã%sã"
@@ -9578,12 +9721,13 @@ 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:2762
+#: ../mail/em-format-html.c:2768
 #, 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:82
+#: ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
 msgid "No HTML stream available"
@@ -9738,16 +9882,14 @@ 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
 #, fuzzy
 #| msgid "Attached message"
 msgid "Attribute message."
-msgstr "ææèæ"
+msgstr "åæèæã"
 
 #: ../mail/evolution-mail.schemas.in.h:17
 msgid "Automatic emoticon recognition"
@@ -9794,15 +9936,11 @@ 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
@@ -9810,9 +9948,7 @@ 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
@@ -9864,9 +10000,7 @@ 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"
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
 msgstr "æåæåååæåçéèéäåæææååéäççéåéääå"
 
 #: ../mail/evolution-mail.schemas.in.h:45
@@ -9874,11 +10008,7 @@ 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."
+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
@@ -9886,16 +10016,11 @@ 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."
+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."
+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
@@ -9939,9 +10064,7 @@ 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."
+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
@@ -9969,21 +10092,15 @@ 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."
+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."
+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."
+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
@@ -9998,16 +10115,13 @@ msgstr "åçæééæèææçèæåäçéäçéäæåæè
 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:73
+#: ../mail/mail-config.ui.h:44
 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."
+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
@@ -10035,16 +10149,11 @@ 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."
+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."
+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
@@ -10052,727 +10161,617 @@ 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."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+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"
+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 sending a "
+#| "private reply to a message which arrived via a mailing list."
+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
 msgid "Last time Empty Junk was run"
 msgstr "äææçååéäçæé"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Trash was run"
 msgstr "äææçåæççæé"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Layout style"
 msgstr "éçæå"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 #: ../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:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of Labels and their associated colors"
 msgstr "æçåçéèåçæå"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME éåæåïææ Bonobo åäæèå"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accepted licenses"
 msgstr "ææçæææå"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accounts"
 msgstr "åèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:109
-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: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:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "List of custom headers and whether they are enabled."
 msgstr "èéæéäåååæååççæå"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of dictionary language codes used for spell checking."
 msgstr "çææåææçååèèçæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:112
-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: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:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "List of protocol names whose license has been accepted."
 msgstr "åçæååææçååæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Load images for HTML messages over HTTP"
 msgstr "éé HTTP èå HTML éäçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:115
-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."
+#: ../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:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions"
 msgstr "èééæååä"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions to the specified log file."
 msgstr "åéæååäèéåæåçèéææã"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions"
 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 "Mail browser height"
 msgstr "éäçèåéå"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser maximized"
 msgstr "éäçèåæåå"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser width"
 msgstr "éäçèåéå"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout"
 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 citations in the message \"Preview\""
 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 "Message text limit for display"
 msgstr "éçéäæåéå"
 
 # (pofilter) gconf: do not translate gconf attribute: "normal", "source"
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "èæéçæå (ãnormalã[äè]ããfull headersã[åææé]ããsourceã[äæ])"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the junk on exit"
 msgstr "çæææçååéäæåééåæ"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the trash on exit"
 msgstr "çæææçåæçæåééåæ"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "çæææçååéäæåééåæã"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "çæææçåæçæåééåæã"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "éçæ TO/CC/BCC ääåçéå"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Original message."
 msgstr "ååéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:135
-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:136
+msgid "Path where image 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:136
+#: ../mail/evolution-mail.schemas.in.h:138
+#| msgid ""
+#| "The following recipients were not recognized as valid mail addresses:\n"
+#| "{0}"
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr "åäçææèåææéåéäååçæäèååæç"
+
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt on empty subject"
 msgstr "ææäæææç"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "çäçèåèæçèæåæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "çäçèåéææäæçéäæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when deleting messages in search folder"
 msgstr "çåéæåèæåäçéäæéçæç"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "çéäèååæçäåèææç"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when replying privately to list messages"
 msgstr "ççäåèéäèåéäææç"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying to many recipients"
 msgstr "çåèçèåæäèææç"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when user expunges"
 msgstr "äçèæçææç"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user only fills Bcc"
 msgstr "çäçèååååäåæææç"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "çäçèåèäæéå 10 åææåéäææçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:146
-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:149
+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:147
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "çäçèåéäåæäèæåææäèçéäæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "çäçèåèåéäæèç HTML ææç"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt while marking multiple messages"
 msgstr "çæèååéäææç"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Put personalized signatures at the top of replies"
 msgstr "ååäåçåæçæåäéç"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put the cursor at the bottom of replies"
 msgstr "åèæåææçæåé"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "èèæåäçèæçèäåäæåçã"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize links in text and replace them."
 msgstr "èèæåäçéçäåäåäã"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Run junk test on incoming mail."
 msgstr "ååéçéäåèååéäææã"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Save directory"
 msgstr "ååçé"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Search for the sender photo in local address books"
 msgstr "åæåçéèéæååäèçç"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Send HTML mail by default"
 msgstr "éèåé HTML éä"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default."
 msgstr "éèåé HTML éäã"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Sender email-address column in the message list"
 msgstr "åéäæåçåäèéåéäæä"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Server synchronization interval"
 msgstr "äæååæéé"
 
-#: ../mail/evolution-mail.schemas.in.h:161
-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:164
+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:162
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "åééäèææéçãåäåæãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "åééäèææéçãåæãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "åèåæèççæéçãåäèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "åèåæèççæéçãåèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "åééäèææéçãåèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show Animations"
 msgstr "éçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show all message headers"
 msgstr "éçææéäæé"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all the headers when viewing a messages."
 msgstr "æèéäæéçæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show animated images as animations."
 msgstr "ææåçåçã"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "åéäæåäéçåéçéä (åäåéè)"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages in the message-list"
 msgstr "åéäæåäéçåéçéä"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show image animations"
 msgstr "éçåçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show original \"Date\" header value."
 msgstr "éçååçãææãæéæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show photo of the sender"
 msgstr "éçåäèççç"
 
-#: ../mail/evolution-mail.schemas.in.h:176
-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: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:177
-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: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 "åééäèææéçãåæãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:178
-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: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 "åèåæèççæéçãåäèãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:179
-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: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 "åèåæèççæéçãåèãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:180
-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: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 "åééäèææéçãåèãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "åéäæåçääåéçæäéçåäèçéåéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:182
-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: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 "éçååçãææãæéïèæåäåææäççåæéïãååæéääçèååçæååæåæåéçãææãæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "åéäéèçæäéçåäèçççã"
 
-#: ../mail/evolution-mail.schemas.in.h:184
-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: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: æéïåææçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Spell check inline"
 msgstr "èåæåææ"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell checking color"
 msgstr "æåææéè"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking languages"
 msgstr "æåææèè"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Terminal font"
 msgstr "ççæåå"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "The default plugin for Junk hook"
 msgstr "ååééçéèåæçå"
 
-#: ../mail/evolution-mail.schemas.in.h:190
-msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "äæåèæçååéäçæéïå 1970 åäæäæ(éèçå)åçèçææã"
 
-#: ../mail/evolution-mail.schemas.in.h:191
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "äæåèæååæççæéïå 1970 åäæäæ(éèçå)åçèçææã"
 
-#: ../mail/evolution-mail.schemas.in.h:192
-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: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ãïåçæèïåéèçææåéäæåæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "The terminal font for mail display."
 msgstr "çæéçéäçççæååã"
 
-#: ../mail/evolution-mail.schemas.in.h:194
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid "The text that is inserted when forwarding a message, saying that the forwarded message follows."
 msgstr "åèåéäæèæåçæåïèææääæèåçéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:195
-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:198
+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:196
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
+#: ../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 "ååèéäæèæåçæåïèæéäçåäèã"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "The variable width font for mail display."
 msgstr "çæéçéäçèåéåååã"
 
-#: ../mail/evolution-mail.schemas.in.h:198
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
+#: ../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ãçééèæã"
 
-#: ../mail/evolution-mail.schemas.in.h:199
-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: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ãèåéæææã"
 
-#: ../mail/evolution-mail.schemas.in.h:200
-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: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 "éæéèçååéäåæçåïåäååçäåäçåæçåãåæåçéèååçéèåæçåïääæåéåäåççåæçåã"
 
-#: ../mail/evolution-mail.schemas.in.h:201
-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: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ããéææåæåæåäåèéäçéåäçéåèèæåçéèã"
 
-#: ../mail/evolution-mail.schemas.in.h:202
-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: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ã"
 
-#: ../mail/evolution-mail.schemas.in.h:203
-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: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ãïæçäæåæåååæåçéèéäæèéåéääåäçæååéäéææãæéåçèçäååçéäãåèã"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "This option would help in improving the speed of fetching."
 msgstr "éåééèåååéææçéåã"
 
-#: ../mail/evolution-mail.schemas.in.h:205
-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:208
+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:206
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr "éåèååæåçééäéèçåéæææççæãEvolution åéèéæååã"
+#: ../mail/evolution-mail.schemas.in.h:209
+#| msgid ""
+#| "This setting specifies whether the threads should be in expanded or "
+#| "collapsed state by default. Evolution requires a restart."
+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:207
-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: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 åéèéæååã"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../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ãéåèæåäæåèåæåäååçèæåæäçã"
+
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid "Thread the message-list based on Subject"
 msgstr "ääæçåçäæéäæå"
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Timeout for marking message as seen"
 msgstr "åéäæçæåéèçæé"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Timeout for marking message as seen."
 msgstr "åéäæçæåéèçæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "UID string of the default account."
 msgstr "éèåèç UID åäã"
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "äçèåæåæææåæéåçåçéèã"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Use SpamAssassin daemon and client"
 msgstr "äç SpamAsssassin äæçåååæç"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../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:215
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "äçèéåå"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts for displaying mail."
 msgstr "äçèéååäéçéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use only local spam tests."
 msgstr "åäçæåååéäæèã"
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid "Use only the local spam tests (no DNS)."
 msgstr "åäçæåååéäæè (ææ DNS)ã"
 
-#: ../mail/evolution-mail.schemas.in.h:219
-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."
+#: ../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:220
-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: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:221
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Variable width font"
 msgstr "èåéååå"
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æåéèåæåéäååèäåæçèæ"
 
-#: ../mail/evolution-mail.schemas.in.h:223
-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: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:224
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
+#: ../mail/evolution-mail.schemas.in.h:228
+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:225
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æååçåéåçèæååçççã"
 
-#: ../mail/evolution-mail.schemas.in.h:226
-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: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:227
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æåææéäççäææçéääæåçééä"
 
-#: ../mail/evolution-mail.schemas.in.h:228
-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: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:229
+#: ../mail/evolution-mail.schemas.in.h:233
 msgid "Width of the message-list pane"
 msgstr "éäæåçæéå"
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid "Width of the message-list pane."
 msgstr "éäæåçæçéåã"
 
@@ -10780,7 +10779,8 @@ msgstr "éäæåçæçéåã"
 msgid "Importing Elm data"
 msgstr "èå Elm èæ"
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
+#: ../mail/importers/elm-importer.c:339
+#: ../mail/importers/pine-importer.c:415
 #: ../modules/mail/e-mail-shell-view.c:1045
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
@@ -10870,7 +10870,8 @@ msgstr "å Pine ååéäã"
 msgid "Mail to %s"
 msgstr "éäéå %s"
 
-#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:233
+#: ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "éääè %s "
@@ -10911,10 +10912,6 @@ msgstr[1] ""
 "%s åçææïåçåååçååååéçèæå\n"
 "ã%sãã"
 
-#: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "åèèè"
-
 #: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "ååæççåæ(_W)â"
@@ -11128,7 +11125,8 @@ msgstr "èå"
 msgid "Inline (Outlook style)"
 msgstr "èåïOutlook éæï"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:61
+#: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æç"
 
@@ -11281,86 +11279,90 @@ msgstr "åéçäåèåéäèå(_P)"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:105
+#| msgid "Sending a message with only _Bcc recipients defined"
+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
 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:107
+#: ../mail/mail-config.ui.h:109
 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:109
+#: ../mail/mail-config.ui.h:111
 msgid "Sending a reply to a large _number of recipients"
 msgstr "åéæåéæäèçéä(_N)"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:112
 msgid "Sent _Messages Folder:"
 msgstr "åééäèæå(_M):"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:113
 msgid "Ser_ver requires authentication"
 msgstr "äæåèæéè(_V)"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:114
 msgid "Server Configuration"
 msgstr "äæåçæ"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
 msgid "Server _Type:"
 msgstr "äæåéå(_T):"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:116
 msgid "Si_gning algorithm:"
 msgstr "ççæçæ(_G):"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Sig_natures"
 msgstr "çåæ(_N)"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 msgid "Sig_ning certificate:"
 msgstr "ççèæ(_N):"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:119
 msgid "Signat_ure:"
 msgstr "çåæ(_U):"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:120
 msgid "Signatures"
 msgstr "çåæ"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:121
 msgid "Signing _algorithm:"
 msgstr "ççæçæ(_A):"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 msgid "Special Folders"
 msgstr "çæèæå"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:123
 msgid "Spell Checking"
 msgstr "æåææ"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:124
 msgid "Start _typing at the bottom on replying"
 msgstr "åèæååééåèå(_T)"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:125
 msgid "Start up"
 msgstr "åå"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:127
 msgid "T_ype:"
 msgstr "éå(_Y):"
 
-#: ../mail/mail-config.ui.h:126
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+#: ../mail/mail-config.ui.h:128
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "éèçèèæåååæååçåèååçèèã"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:129
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11370,13 +11372,11 @@ msgstr ""
 "çåæãäæåçåçåæäç\n"
 "éçäçã"
 
-#: ../mail/mail-config.ui.h:130
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
+#: ../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:131
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11384,141 +11384,144 @@ msgstr ""
 "èåæçääèéååèçåçã\n"
 "äåïãåäãæãåäã"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:135
 msgid "Us_ername:"
 msgstr "äçèåç(_E):"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:136
 msgid "Use Authe_ntication"
 msgstr "äçéè(_N)"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:137
 msgid "User _Name:"
 msgstr "äçèåç(_N):"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:138
 msgid "_Add Signature"
 msgstr "ååçåæ(_A)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:139
 msgid "_Always load images from the Internet"
 msgstr "äåèççäèåç(_A)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:140
 msgid "_Authentication Type"
 msgstr "éèéå(_A)"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:141
 msgid "_Default junk plugin:"
 msgstr "éèååéäåæçå(_D):"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:142
 msgid "_Direct connection to the Internet"
 msgstr "çæéçåäèç(_D)"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:143
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "äççæèéè (ååæ _Outlook)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:144
 msgid "_Forward style:"
 msgstr "èåæå(_F):"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:145
 msgid "_Junk Folder:"
 msgstr "ååéäèæå(_J):"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:146
 msgid "_Keep signature above the original message on replying"
 msgstr "åäæäçååéäççç(_K)"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:147
 msgid "_Languages"
 msgstr "èè(_L)"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:148
 msgid "_Load images only in messages from contacts"
 msgstr "åèåçèçäååéääçåç(_L)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:149
 msgid "_Lookup in local address book only"
 msgstr "ååæåéèéæè(_L)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:150
 msgid "_Make this my default account"
 msgstr "èçæçéèåè(_M)"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:151
 msgid "_Manual proxy configuration:"
 msgstr "æåäçäæåçæ(_M):"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:153
 msgid "_Never load images from the Internet"
 msgstr "äåäèççäèåç(_N)"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:154
 msgid "_Path:"
 msgstr "èå(_P):"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:155
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "çåé HTML éäçäææåéééäçèçäæéçæç(_P)"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:156
 msgid "_Reply style:"
 msgstr "åèæå(_R):"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:157
 msgid "_Script:"
 msgstr "åäç(_S):"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:158
 msgid "_Secure HTTP Proxy:"
 msgstr "åå HTTP äçäæå(_S):"
 
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:160
+#: ../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:160
+#: ../mail/mail-config.ui.h:162
 msgid "_Show animated images"
 msgstr "ææåçåç(_S)"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:163
 msgid "_Show the photograph of sender in the message preview"
 msgstr "åéäéèéçåäèçç(_S)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:164
 msgid "_Trash Folder:"
 msgstr "åæçèæå(_T):"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:165
 msgid "_Use Secure Connection:"
 msgstr "äçååéç(_U):"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:166
 msgid "_Use system defaults"
 msgstr "äçççéèå(_U)"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:167
 msgid "_Use the same fonts as other applications"
 msgstr "äçèåäæççåçåçåå(_U)"
 
-#: ../mail/mail-config.ui.h:166 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:168
+#: ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:169
+#: ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:170
 msgid "color"
 msgstr "èå"
 
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:171
 msgid "description"
 msgstr "æè"
 
@@ -11641,11 +11644,13 @@ msgstr "æååééä %d / %d"
 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:833
+#: ../mail/mail-send-recv.c:788
 msgid "Canceled."
 msgstr "ååæã"
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:835
+#: ../mail/mail-send-recv.c:790
 msgid "Complete."
 msgstr "åæã"
 
@@ -11776,7 +11781,8 @@ msgstr "åéåæ(_A)"
 msgid "Updating..."
 msgstr "ææäâ"
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:653
 msgid "Waiting..."
 msgstr "æåçåâ"
 
@@ -11827,8 +11833,7 @@ msgstr "ææ '%s' çæåèæå"
 #: ../mail/mail-vfolder.c:709
 #, 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"
@@ -11874,29 +11879,22 @@ 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
@@ -11908,20 +11906,15 @@ 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
@@ -11997,9 +11990,7 @@ 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
@@ -12028,9 +12019,7 @@ 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
@@ -12042,104 +12031,107 @@ msgid "Could not save signature file."
 msgstr "çæååççææã"
 
 #: ../mail/mail.error.xml.h:45
-msgid ""
-"Default local store has been changed from mbox to maildir format. Do you "
-"want to migrate now ?\n"
-"\n"
-"A mbox account will be created to preserve the old mbox folders. You can "
-"delete it after ensuring the data is safely migrated. Please make sure there "
-"is enough space if you choose to migrate."
-msgstr ""
-"éèçæåçååååçå mbox æèç maildir æåãäçåæåèèæï\n"
-"\n"
-"çåæåçäå mbox åèääçèç mbox èæåãäåäåçèèæéååèæåååååéãåæäéæèæïèçåæèåççéã"
-
-#: ../mail/mail.error.xml.h:48
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "æååéæåèæåã{0}ãäçéäï"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Disable"
 msgstr "äèåç(_N)"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Send"
 msgstr "äèåé(_N)"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:49
 msgid "Do _Not Synchronize"
 msgstr "äèåæ(_N)"
 
-#: ../mail/mail.error.xml.h:53
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
+#: ../mail/mail.error.xml.h:50
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
 msgstr "æåèåæåçåæéäæèçéçäççèæåï"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "æåèååéçéäæçæåéèï"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "èååæåçææï"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "èååçã"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "èåéæååçæççéèã"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:55
 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:62
+#: ../mail/mail.error.xml.h:59
 msgid "Error while {0}."
 msgstr "ç {0} æççéèã"
 
+#: ../mail/mail.error.xml.h:60
+#| msgid ""
+#| "Default local store has been changed from mbox to maildir format. Do you "
+#| "want to migrate now ?\n"
+#| "\n"
+#| "A mbox account will be created to preserve the old mbox folders. You can "
+#| "delete it after ensuring the data is safely migrated. Please make sure "
+#| "there is enough space if you choose to migrate."
+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"
+"\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."
+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:64
 msgid "Failed to unsubscribe from folder."
 msgstr "çæåæèéèæåã"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "File exists but cannot overwrite it."
 msgstr "ææååäçæèåã"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "File exists but is not a regular file."
 msgstr "ææååääæäèææã"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "èæåã{0}ãäæååääéèçéäã"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "åæäéæççïåçæååéäéäã"
 
-#: ../mail/mail.error.xml.h:69
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
+#: ../mail/mail.error.xml.h:70
+msgid "If you delete the folder, all of its contents and its subfolders' contents will be deleted permanently."
 msgstr "åæäåéèæåïåçææååååèæåååææéåéã"
 
-#: ../mail/mail.error.xml.h:70
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
+#: ../mail/mail.error.xml.h:71
+msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "åæäéæåéèæåïåçææååææéæåã"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "åæççïææçäçäæååèææäåéã"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12147,43 +12139,33 @@ msgstr ""
 "åæççïèåèçèèäå\n"
 "åææçäçäæåææéåéã"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "åæççïåèèèææäåéã"
 
-#: ../mail/mail.error.xml.h:75
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#: ../mail/mail.error.xml.h:76
+msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr "åæäéæçæïåæåå Evolution äåïäæåééäéäã"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Ignore"
 msgstr "åç"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Invalid authentication"
 msgstr "çæçéè"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid "Mail Deletion Failed"
 msgstr "åééäåæ"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Mail filters automatically updated."
 msgstr "éäéæåèåææã"
 
-#: ../mail/mail.error.xml.h:80
-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:81
-msgid "Migrate local mbox folders to maildir"
-msgstr "åæåç mbox èæåèæç maildir"
+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
 msgid "Missing folder."
@@ -12214,15 +12196,12 @@ 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."
+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
 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"
@@ -12285,19 +12264,14 @@ 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."
+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
 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"
@@ -12332,20 +12306,15 @@ msgstr ""
 "éèæïèçèæåèæåçèåïäæåæåæååã"
 
 #: ../mail/mail.error.xml.h:121
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+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"
+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."
+msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr "æäæåäæææéèéåèäææäææéèã"
 
 #: ../mail/mail.error.xml.h:124
@@ -12353,9 +12322,7 @@ 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."
+msgid "This will mark all messages as read in the selected folder and its subfolders."
 msgstr "éæåæçéåçèæååååèæåäææéäçåéèã"
 
 #: ../mail/mail.error.xml.h:126
@@ -12367,9 +12334,7 @@ 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?"
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
 msgstr "çæéåæåèçèçèæåãæåäçççèçèæåäæï"
 
 #: ../mail/mail.error.xml.h:129
@@ -12386,8 +12351,7 @@ 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"
+"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"
@@ -12398,23 +12362,15 @@ 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?"
+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?"
+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?"
+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
@@ -12444,8 +12400,7 @@ msgstr "äåéæåäåèæåã"
 #: ../mail/mail.error.xml.h:144
 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"
 "ååéåèæåïçå/æéåæææåèæåãææéçèæåæäèçéã"
@@ -12478,26 +12433,36 @@ msgid "_Empty Trash"
 msgstr "æçåæç(_E)"
 
 #: ../mail/mail.error.xml.h:152
+#| msgid "Evolution"
+msgid "_Exit Evolution"
+msgstr "çæ _Evolution "
+
+#: ../mail/mail.error.xml.h:153
 msgid "_Expunge"
 msgstr "æé(_E)"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:154
+#| msgid "Migration"
+msgid "_Migrate Now"
+msgstr "çåèç(_M)"
+
+#: ../mail/mail.error.xml.h:155
 msgid "_No"
 msgstr "å(_N)"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:156
 msgid "_Open Messages"
 msgstr "éåéä(_O)"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:159
 msgid "_Send Receipt"
 msgstr "åéåæ(_S)"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:160
 msgid "_Synchronize"
 msgstr "åæå(_S)"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:161
 msgid "_Yes"
 msgstr "æ(_Y)"
 
@@ -12541,13 +12506,15 @@ msgstr "é"
 msgid "Highest"
 msgstr "æé"
 
-#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1837
+#: ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1844
+#: ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "äå %p %l:%M"
 
@@ -12557,33 +12524,33 @@ msgstr "æå %p %l:%M"
 
 #: ../mail/message-list.c:1865
 msgid "%a %l:%M %p"
-msgstr "%A%p %-l:%M"
+msgstr "%a %p %l:%M"
 
 #: ../mail/message-list.c:1873
 msgid "%b %d %l:%M %p"
-msgstr "%mæ%dæ%p %l:%M"
+msgstr "%b %d %p %l:%M"
 
 #: ../mail/message-list.c:1875
 msgid "%b %d %Y"
-msgstr "%Y/%m/%d"
+msgstr "%Y %b %d"
 
 #: ../mail/message-list.c:2642
 msgid "Select all visible messages"
 msgstr "éæåéåèçéä"
 
-#: ../mail/message-list.c:2800 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2800
+#: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "éä"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4468 ../mail/message-list.c:4892
+#: ../mail/message-list.c:4468
+#: ../mail/message-list.c:4892
 msgid "Generating message list"
 msgstr "ççéäæå"
 
 #: ../mail/message-list.c:4707
-msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
 msgstr "ææéäçåäçæåæäãåääçãæå->æéãéåéçäæéæåææèåã"
 
 #: ../mail/message-list.c:4709
@@ -12653,22 +12620,15 @@ msgid "Subject or Addresses contains"
 msgstr "äææéåéääååå"
 
 #: ../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 SSL."
+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:211
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports 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:213
-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."
+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:612
@@ -12680,25 +12640,15 @@ msgid "Copy _book content locally for offline operation"
 msgstr "èèéèéååèæåçæéçäæ(_B)"
 
 #: ../modules/addressbook/addressbook-config.c:756
-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."
+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:830
-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."
+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:905
-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."
+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:1021
@@ -12772,23 +12722,15 @@ 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."
+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."
+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."
+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
@@ -12800,9 +12742,7 @@ 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."
+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
@@ -13076,7 +13016,7 @@ msgstr "ææççèæ"
 #: ../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:1484
-#: ../shell/e-shell-content.c:613
+#: ../shell/e-shell-content.c:616
 msgid "Advanced Search"
 msgstr "ééæå"
 
@@ -13180,9 +13120,7 @@ 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.
@@ -13474,8 +13412,7 @@ 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
@@ -13579,9 +13516,7 @@ 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
@@ -13633,15 +13568,11 @@ 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
@@ -13657,21 +13588,15 @@ 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
@@ -13755,9 +13680,7 @@ 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
@@ -13777,48 +13700,32 @@ 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
@@ -13826,9 +13733,7 @@ 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
@@ -13849,9 +13754,7 @@ 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"
@@ -13861,8 +13764,7 @@ msgstr "éèæéåäïãminutesã(åé)ããhoursã(åæ)æãda
 
 # (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
@@ -13898,9 +13800,7 @@ 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
@@ -13908,8 +13808,7 @@ 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
@@ -13945,8 +13844,7 @@ 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
@@ -14065,20 +13963,20 @@ msgstr "åçæèäæ"
 msgid "Calendar and Tasks"
 msgstr "èäæèåä"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:217
+#: ../modules/calendar/e-cal-shell-sidebar.c:213
 msgid "Loading calendars"
 msgstr "æåèåèäæ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:641
+#: ../modules/calendar/e-cal-shell-sidebar.c:634
 msgid "_New Calendar..."
 msgstr "æåèäæ(_N)â"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:658
+#: ../modules/calendar/e-cal-shell-sidebar.c:651
 msgid "Calendar Selector"
 msgstr "èäæéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1001
+#: ../modules/calendar/e-cal-shell-sidebar.c:994
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "éåå %s çèäæ"
@@ -14090,10 +13988,7 @@ 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."
+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:
@@ -14504,16 +14399,16 @@ msgstr "ååéæå(_S)"
 msgid "Create a new memo list"
 msgstr "åçæååéæå"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:225
+#: ../modules/calendar/e-memo-shell-sidebar.c:221
 msgid "Loading memos"
 msgstr "æåèåååé"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:594
+#: ../modules/calendar/e-memo-shell-sidebar.c:587
 msgid "Memo List Selector"
 msgstr "ååéæåéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:899
+#: ../modules/calendar/e-memo-shell-sidebar.c:892
 #, c-format
 msgid "Opening memos at %s"
 msgstr "éåå %s çååé"
@@ -14631,16 +14526,16 @@ msgstr "åäæå(_K)"
 msgid "Create a new task list"
 msgstr "åçæåäæå"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:225
+#: ../modules/calendar/e-task-shell-sidebar.c:221
 msgid "Loading tasks"
 msgstr "æåèååä"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:594
+#: ../modules/calendar/e-task-shell-sidebar.c:587
 msgid "Task List Selector"
 msgstr "åäæåéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:899
+#: ../modules/calendar/e-task-shell-sidebar.c:892
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "éåå %s çåä"
@@ -14652,8 +14547,7 @@ msgstr "æååä"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:569
 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 ""
@@ -14957,7 +14851,8 @@ msgid "Send queued items and retrieve new items"
 msgstr "åéåéçéçäæææçéç"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1210
-msgid "R_eceive all"
+#| msgid "R_eceive all"
+msgid "R_eceive All"
 msgstr "åéææ(_E)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1212
@@ -14965,7 +14860,8 @@ msgid "Receive new items from all accounts"
 msgstr "ææåææåèåçæéç"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1217
-msgid "_Send all"
+#| msgid "_Send all"
+msgid "_Send All"
 msgstr "åéåé(_S)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1219
@@ -15113,68 +15009,68 @@ msgstr "çåçåè"
 msgid "Current Folder"
 msgstr "çåçèæå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1030
+#: ../modules/mail/e-mail-shell-view-private.c:1049
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "åéæ %d åï"
 msgstr[1] "åéæ %d åï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d åååé"
 msgstr[1] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1047
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1073
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ååå"
 msgstr[1] "%d ååå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1079
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d åèç"
 msgstr[1] "%d åèç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d åæåé"
 msgstr[1] "%d åæåé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../modules/mail/e-mail-shell-view-private.c:1091
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d åååé"
 msgstr[1] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1084
+#: ../modules/mail/e-mail-shell-view-private.c:1103
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d åæèï"
 msgstr[1] "%d åæèï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1087
+#: ../modules/mail/e-mail-shell-view-private.c:1106
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å %d å"
 msgstr[1] "å %d å"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1107
+#: ../modules/mail/e-mail-shell-view-private.c:1126
 msgid "Trash"
 msgstr "åæç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1461
+#: ../modules/mail/e-mail-shell-view-private.c:1485
 msgid "Send / Receive"
 msgstr "åé/ææ"
 
@@ -15198,14 +15094,14 @@ msgstr "Evolution åèåç"
 msgid "Account Editor"
 msgstr "åèçèå"
 
-#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/mail/em-composer-prefs.c:502
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "ååç"
 
-#: ../modules/mail/em-composer-prefs.c:499
+#: ../modules/mail/em-composer-prefs.c:506
 msgid "Language(s)"
 msgstr "èè"
 
@@ -15246,16 +15142,17 @@ msgid "Contains Value"
 msgstr "ååæå"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:764
+#: ../modules/mail/em-mailer-prefs.c:693
+#: ../modules/mail/em-mailer-prefs.c:764
 #, 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:773
+#: ../modules/mail/em-mailer-prefs.c:701
+#: ../modules/mail/em-mailer-prefs.c:773
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s åæçååçæäçãèæææåæåèèåäã"
 
 #: ../modules/mail/em-mailer-prefs.c:737
@@ -15276,8 +15173,7 @@ 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:146
@@ -15299,9 +15195,7 @@ 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
@@ -15383,8 +15277,7 @@ msgstr "æèäç"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:493
 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 ""
@@ -15401,9 +15294,7 @@ 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
@@ -15417,9 +15308,7 @@ 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
@@ -15451,15 +15340,18 @@ msgid "Play audio attachments directly in mail messages."
 msgstr "çæææéääçéæéäã"
 
 #: ../plugins/backup-restore/backup-restore.c:183
-msgid "Select name of the Evolution back up file"
+#| msgid "Select name of the Evolution back up file"
+msgid "Select name of the Evolution backup file"
 msgstr "éæ Evolution åäææçåç"
 
 #: ../plugins/backup-restore/backup-restore.c:216
-msgid "_Restart Evolution after back up"
-msgstr "åäåéæåå Evolution (_R)"
+#| msgid "_Restart Evolution after back up"
+msgid "_Restart Evolution after backup"
+msgstr "åäåéæåå Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:242
-msgid "Select name of the Evolution back up file to restore"
+#| msgid "Select name of the Evolution back up file to restore"
+msgid "Select name of the Evolution backup file to restore"
 msgstr "éæèéåç Evolution åäææåç"
 
 #: ../plugins/backup-restore/backup-restore.c:255
@@ -15467,14 +15359,16 @@ msgid "_Restart Evolution after restore"
 msgstr "éååéæåå Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:323
-msgid ""
-"You can restore Evolution from your back up. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
+#| msgid ""
+#| "You can restore Evolution from your back up. It can restore all the "
+#| "Mails, Calendars, Tasks, Memos, Contacts. It also restores all your "
+#| "personal settings, mail filters etc."
+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
-msgid "_Restore Evolution from the back up file"
+#| msgid "_Restore Evolution from the back up file"
+msgid "_Restore Evolution from the backup file"
 msgstr "ååäææéå Evolution (_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:337
@@ -15486,7 +15380,8 @@ msgid "Choose a file to restore"
 msgstr "éæèéåçææ"
 
 #: ../plugins/backup-restore/backup-restore.c:348
-msgid "Restore from back up"
+#| msgid "Restore from back up"
+msgid "Restore from backup"
 msgstr "ååäææéå"
 
 #: ../plugins/backup-restore/backup-restore.c:386
@@ -15620,8 +15515,7 @@ 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
@@ -15649,20 +15543,15 @@ 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:685
+#: ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "èåååçèçä"
@@ -15702,9 +15591,7 @@ 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"
@@ -15745,9 +15632,7 @@ 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."
+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
@@ -15835,7 +15720,7 @@ msgstr "æåèæåååâ"
 #: ../plugins/caldav/caldav-browse-server.c:1264
 #: ../plugins/caldav/caldav-source.c:255
 msgid "Server _handles meeting invitations"
-msgstr ""
+msgstr "äæåèçæèéè(_H)"
 
 #: ../plugins/caldav/caldav-browse-server.c:1271
 msgid "List of available calendars:"
@@ -15847,10 +15732,9 @@ msgstr "ææ"
 
 #: ../plugins/caldav/caldav-browse-server.c:1336
 #: ../plugins/caldav/caldav-source.c:254
-#, fuzzy
 #| msgid "User _Name:"
 msgid "User e-_mail:"
-msgstr "äçèåç(_N):"
+msgstr "äçè e-_mailï"
 
 #: ../plugins/caldav/caldav-browse-server.c:1408
 #, c-format
@@ -16093,10 +15977,7 @@ 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:319
@@ -16134,17 +16015,17 @@ msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "ææå"
 
-#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/email-custom-header/email-custom-header.c:385
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "ææ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:586
+#: ../plugins/email-custom-header/email-custom-header.c:577
 msgid "_Custom Header"
 msgstr "èéæé(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:845
+#: ../plugins/email-custom-header/email-custom-header.c:836
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16152,11 +16033,11 @@ msgstr ""
 "æåèéæééåçæåï\n"
 "èéæééåçåçèäã;ãééã"
 
-#: ../plugins/email-custom-header/email-custom-header.c:899
+#: ../plugins/email-custom-header/email-custom-header.c:890
 msgid "Key"
 msgstr "èåé"
 
-#: ../plugins/email-custom-header/email-custom-header.c:915
+#: ../plugins/email-custom-header/email-custom-header.c:906
 #: ../plugins/templates/templates.c:417
 msgid "Values"
 msgstr "æå"
@@ -16225,9 +16106,7 @@ 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
@@ -16235,15 +16114,11 @@ 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
@@ -16251,9 +16126,7 @@ 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
@@ -16459,9 +16332,7 @@ 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?"
+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
@@ -16512,9 +16383,7 @@ 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."
+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
@@ -16570,9 +16439,7 @@ 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."
+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")
@@ -16793,8 +16660,7 @@ 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"
@@ -16968,9 +16834,7 @@ 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."
+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
@@ -16982,9 +16846,7 @@ 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"
+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
@@ -16992,9 +16854,7 @@ 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"
+msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "èèçéäåéçéçïæèåæææååååååäçèäæ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2460
@@ -17050,7 +16910,7 @@ msgstr "äå %H:%M:%S"
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
-msgstr "äå%p %l:%M:%S"
+msgstr "äå %p %l:%M:%S"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
@@ -17068,13 +16928,13 @@ msgstr "æå %H:%M:%S"
 #. in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
-msgstr "æå%p %-l:%M"
+msgstr "æå %p %l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "æå%p %-l:%M:%S"
+msgstr "æå %p %l:%M:%S"
 
 #. strftime format of a weekday.
 #: ../plugins/itip-formatter/itip-view.c:256
@@ -17098,73 +16958,73 @@ msgstr "%A %H:%M:%S"
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
-msgstr "%a %p %l:%M"
+msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
-msgstr "%A%p %-l:%M:%S"
+msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
 #: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
-msgstr "%-m æ %d æ (%A)"
+msgstr "%B %e (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
-msgstr "%-m æ %d æ (%A) %H:%M"
+msgstr "%B %e (%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%-m æ %d æ (%A) %H:%M:%S"
+msgstr "%B %e (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
-msgstr "%-m æ %d æ (%A) %p %-l:%M"
+msgstr "%B %e (%A) %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%-m æ %d æ (%A) %p %-l:%M:%S"
+msgstr "%B %e (%A) %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
-msgstr "%Y å %-m æ %-d æ (%A)"
+msgstr "%Y, %B %e (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%Y å %-m æ %-d æ (%A) %H:%M"
+msgstr "%Y, %B %e (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%Y å %-m æ %-d æ (%A) %H:%M:%S"
+msgstr "%Y, %B %e (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Y å %-m æ %-d æ (%A) %p %-l:%M"
+msgstr "%Y, %B %e (%A) %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Y å %-m æ %-d æ (%A) %p %-l:%M:%S"
+msgstr "%Y, %B %e (%A) %p %l:%M:%S"
 
 #: ../plugins/itip-formatter/itip-view.c:362
 #: ../plugins/itip-formatter/itip-view.c:363
@@ -17225,9 +17085,7 @@ 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
@@ -17312,15 +17170,12 @@ 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
@@ -17527,8 +17382,7 @@ 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
@@ -17548,9 +17402,7 @@ 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."
+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
@@ -17691,62 +17543,46 @@ msgstr "å %s çéäæåç"
 
 #: ../plugins/mail-to-task/mail-to-task.c:489
 #, 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:492
 #, 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:495
 #, 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:515
-msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+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:521
-msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+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:527
-msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+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:548
-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?"
+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] "éåçèäæåçååæåéääçääãæåèåååçæçääï"
 
@@ -17754,12 +17590,8 @@ msgstr[1] "éåçèäæåçååæåéääçääãæåèå
 #. 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:557
-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?"
+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] "éåçåäæååçååæåéääçåäãæåèåååçæçåäï"
 
@@ -17767,12 +17599,8 @@ msgstr[1] "éåçåäæååçååæåéääçåäãæåè
 #. 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:566
-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?"
+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] "éåçååéæååçååæåéääçååéãæåèåååçæçååéï"
 
@@ -17795,21 +17623,15 @@ msgid "Cannot open calendar. %s"
 msgstr "çæéåèäæã%s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:743
-msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
+msgid "Selected source is read only, thus cannot create event there. Select other source, please."
 msgstr "éåçäææåèçïåæäèåéèåçääãèéæåäçäæã"
 
 #: ../plugins/mail-to-task/mail-to-task.c:746
-msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+msgid "Selected source is read only, thus cannot create task there. Select other source, please."
 msgstr "éåçäææåèçïåæäèåéèåçåäãèéæåäçäæã"
 
 #: ../plugins/mail-to-task/mail-to-task.c:749
-msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
+msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
 msgstr "éåçäææåèçïåæäèåéèåçååéãèéæåäçäæã"
 
 #: ../plugins/mail-to-task/mail-to-task.c:955
@@ -17919,11 +17741,9 @@ 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"
@@ -17942,9 +17762,7 @@ 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
@@ -17953,8 +17771,7 @@ 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 ""
@@ -17973,9 +17790,7 @@ 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
@@ -17986,25 +17801,23 @@ msgstr "çèéä(_E)"
 msgid "_Send message"
 msgstr "åééä(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:45
 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?"
+#: ../plugins/mark-all-read/mark-all-read.c:47
+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:196
+#: ../plugins/mark-all-read/mark-all-read.c:199
 msgid "In Current Folder and _Subfolders"
 msgstr "æçåçèæååååèæå(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:210
+#: ../plugins/mark-all-read/mark-all-read.c:213
 msgid "In Current _Folder Only"
 msgstr "æçåçèæå(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:447
+#: ../plugins/mark-all-read/mark-all-read.c:450
 msgid "Mark Me_ssages as Read"
 msgstr "æçéäçåè(_S)"
 
@@ -18042,9 +17855,7 @@ msgid "Show plain text if present"
 msgstr "åæäçæååéçå"
 
 #: ../plugins/prefer-plain/prefer-plain.c:226
-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:227
@@ -18052,9 +17863,7 @@ msgid "Only ever show plain text"
 msgstr "åäçæåéç"
 
 #: ../plugins/prefer-plain/prefer-plain.c:227
-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:274
@@ -18104,7 +17913,8 @@ msgid "A_ppointments"
 msgstr "çæ(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:342 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:342
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "åä(_T)"
 
@@ -18462,24 +18272,22 @@ 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 "åæèçççæåæçå"
 
-#: ../plugins/templates/templates.c:631
+#: ../plugins/templates/templates.c:637
 msgid "No Title"
 msgstr "æææé"
 
-#: ../plugins/templates/templates.c:741
+#: ../plugins/templates/templates.c:748
 msgid "Save as _Template"
 msgstr "ååççæ(_T)"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:750
 msgid "Save as Template"
 msgstr "ååççæ"
 
@@ -18584,8 +18392,7 @@ 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
@@ -18613,11 +18420,7 @@ 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
@@ -18633,9 +18436,7 @@ 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
@@ -18643,8 +18444,7 @@ 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
@@ -18676,11 +18476,7 @@ 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
@@ -18691,7 +18487,8 @@ 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:371
 msgid "Start in offline mode"
 msgstr "äéçæååå"
 
@@ -18700,9 +18497,7 @@ 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
@@ -18726,9 +18521,7 @@ 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
@@ -18744,37 +18537,24 @@ 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
@@ -18815,8 +18595,7 @@ 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
@@ -18831,11 +18610,12 @@ msgstr "èçæééæ"
 msgid "Window buttons are visible"
 msgstr "èçæéæåèç"
 
-#: ../shell/e-shell-content.c:674 ../shell/e-shell-content.c:675
+#: ../shell/e-shell-content.c:677
+#: ../shell/e-shell-content.c:678
 msgid "Searches"
 msgstr "æå"
 
-#: ../shell/e-shell-content.c:717
+#: ../shell/e-shell-content.c:720
 msgid "Save Search"
 msgstr "ååæåçæ"
 
@@ -19168,15 +18948,15 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "æå"
 
-#: ../shell/e-shell.c:247
+#: ../shell/e-shell.c:261
 msgid "Preparing to go offline..."
 msgstr "æåéåéçâ"
 
-#: ../shell/e-shell.c:300
+#: ../shell/e-shell.c:314
 msgid "Preparing to go online..."
 msgstr "æåéåäçâ"
 
-#: ../shell/e-shell.c:362
+#: ../shell/e-shell.c:376
 msgid "Preparing to quit..."
 msgstr "æåçæâ"
 
@@ -19230,10 +19010,8 @@ msgstr "äèåéçéåèæ"
 
 #. Translators: Do NOT translate the five component names, they MUST remain in English!
 #: ../shell/main.c:367
-msgid ""
-"Start Evolution showing the specified component. Available options are "
-"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
-msgstr ""
+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
 msgid "Apply the given geometry to the main window"
@@ -19276,7 +19054,8 @@ msgstr "åæåç URI æææåçååçæääçåæã"
 msgid "Request a running Evolution process to quit"
 msgstr "èæåèäç Evolution çåçæ"
 
-#: ../shell/main.c:557 ../shell/main.c:565
+#: ../shell/main.c:557
+#: ../shell/main.c:565
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM èéäåæç"
 
@@ -19311,16 +19090,11 @@ 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
@@ -19339,8 +19113,7 @@ 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"
@@ -19439,17 +19212,11 @@ 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
@@ -19483,7 +19250,8 @@ msgstr "èæåç"
 msgid "Purposes"
 msgstr "çé"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:370
+#: ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "åè"
@@ -19567,12 +19335,11 @@ 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:1086
 msgid "Certificate"
 msgstr "èæ"
 
@@ -19660,11 +19427,13 @@ msgstr "ççåä (OU)"
 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 äæåèæ"
 
@@ -19697,8 +19466,7 @@ 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
@@ -19722,7 +19490,8 @@ 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"
 
@@ -19816,11 +19585,13 @@ 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 "çäççè"
 
@@ -19864,7 +19635,8 @@ 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 "äéè"
 
@@ -19883,7 +19655,8 @@ msgstr "åä"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "èæççæçæ"
 
@@ -19923,7 +19696,8 @@ 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)"
 
@@ -20010,8 +19784,7 @@ 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"
@@ -20116,12 +19889,12 @@ msgstr "åéè(_S)â"
 msgid "Send the selected attachments somewhere"
 msgstr "åééåçéäååè"
 
-#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-icon-view.c:162
 #: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Loading"
 msgstr "èåä"
 
-#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-icon-view.c:174
 #: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Saving"
 msgstr "ååä"
@@ -20151,7 +19924,8 @@ msgstr[1] "ååéä"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:616
-#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
+#: ../widgets/misc/e-attachment.c:1786
+#: ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -20197,11 +19971,13 @@ msgstr "å %s äéåéåéä"
 msgid "Attached message"
 msgstr "éåçéä"
 
-#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
+#: ../widgets/misc/e-attachment.c:1829
+#: ../widgets/misc/e-attachment.c:2630
 msgid "A load operation is already in progress"
 msgstr "èåæäååéèä"
 
-#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
+#: ../widgets/misc/e-attachment.c:1837
+#: ../widgets/misc/e-attachment.c:2638
 msgid "A save operation is already in progress"
 msgstr "ååæäååéèä"
 
@@ -20297,7 +20073,8 @@ msgstr "ææ(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1698 ../widgets/misc/e-dateedit.c:1930
+#: ../widgets/misc/e-dateedit.c:1698
+#: ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "ææ"
@@ -20311,9 +20088,7 @@ msgid "Invalid Time Value"
 msgstr "çæçæåæå"
 
 #: ../widgets/misc/e-import-assistant.c:252
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
+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:269
@@ -20347,10 +20122,7 @@ msgid "Import a _single file"
 msgstr "åååäææ(_S)"
 
 #: ../widgets/misc/e-import-assistant.c:529
-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."
+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.
@@ -20387,8 +20159,7 @@ msgstr "èåäç"
 #: ../widgets/misc/e-import-assistant.c:1298
 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ã"
@@ -20409,14 +20180,12 @@ msgstr "éåææ"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æãåçãéååææååå Evolutionã"
 
-#: ../widgets/misc/e-map.c:752
+#: ../widgets/misc/e-map.c:690
 msgid "World Map"
 msgstr "äçåå"
 
-#: ../widgets/misc/e-map.c:754
-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:692
+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 çåççäæåãæääææéäéèéçåäã"
@@ -20691,11 +20460,13 @@ msgstr "åçéçèåäéåæéç"
 msgid "_Copy Email Address"
 msgstr "èèéåéääå(_C)"
 
-#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
+#: ../widgets/misc/e-web-view.c:422
+#: ../widgets/misc/e-web-view.c:1077
 msgid "Select all text and images"
 msgstr "éææææåååç"
 
-#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:854
+#: ../widgets/misc/e-web-view.c:856
 #: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to call %s"
@@ -20713,7 +20484,7 @@ msgstr "æäääéå %s"
 #: ../widgets/misc/ea-calendar-item.c:299
 #: ../widgets/misc/ea-calendar-item.c:308
 msgid "%d %B %Y"
-msgstr "%Y å %-m æ %-d æ"
+msgstr "%Y %B %d"
 
 #: ../widgets/misc/ea-calendar-item.c:311
 #, c-format
@@ -20757,11 +20528,13 @@ msgstr "æååéæç 0 å 100 çæå"
 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:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(éå)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(éæ)"
 
@@ -20864,7 +20637,7 @@ msgstr "æå(_S)â"
 msgid "Add a Column"
 msgstr "ååäæ"
 
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../widgets/table/e-table-field-chooser.c:154
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -20988,14 +20761,20 @@ msgstr "éé"
 msgid "sort"
 msgstr "æå"
 
-#: ../widgets/text/e-text.c:2289
+#: ../widgets/text/e-text.c:2281
 msgid "Select All"
 msgstr "åééå"
 
-#: ../widgets/text/e-text.c:2301
+#: ../widgets/text/e-text.c:2293
 msgid "Input Methods"
 msgstr "èåæ"
 
+#~ msgid "Account Management"
+#~ msgstr "åèçç"
+
+#~ msgid "Migrate local mbox folders to maildir"
+#~ msgstr "åæåç mbox èæåèæç maildir"
+
 #~ msgid "Start Evolution activating the specified component"
 #~ msgstr "åå Evolution æååæåçåä"
 
@@ -21036,16 +20815,19 @@ msgstr "èåæ"
 #~ 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 éæ"
@@ -21060,16 +20842,19 @@ msgstr "èåæ"
 #~ 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 æ"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index efc5a77..a58069a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,34 +7,27 @@
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
 #
-#: ../shell/main.c:615
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.91.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-09 20:14+0800\n"
-"PO-Revision-Date: 2010-12-09 15:59+0800\n"
+"Project-Id-Version: evolution 2.91.6\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
+"POT-Creation-Date: 2011-01-18 17:03+0000\n"
+"PO-Revision-Date: 2011-01-22 19:55+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"
 
 #. 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
@@ -54,13 +47,8 @@ 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 ""
-"èææäçåæçåçæææçïèäæäççæææççåææãèèåèååçæ"
-"åååååïæåèååäååéåéã"
+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
 msgid "Could not get schema information for LDAP server."
@@ -71,21 +59,16 @@ 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 åäéçä"
-"èæåã"
+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
 msgid "Delete address book '{0}'?"
 msgstr "åééèéã{0}ãï"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:34
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Delete"
 msgstr "äèåé(_N)"
 
@@ -120,18 +103,12 @@ 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?"
+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 çæïåäæææåèïæåèèåéèãèæè"
-"ççåïçèææçæååçã"
+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
 msgid "This address book could not be opened."
@@ -142,9 +119,7 @@ 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."
+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
@@ -172,39 +147,28 @@ 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 ""
-"ææååèåæäåéèéïåéçäçèåäåéèéïäæåçæåäæçéãæ"
-"æèååäååæääæåï"
+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 çåéãæåç"
-"èææææåèäæååçèææççå"
+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
 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?"
+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."
+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:603
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:603
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
@@ -240,7 +204,8 @@ msgstr "éåçåæ"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2083 ../capplet/anjal-settings-main.c:123
+#: ../calendar/gui/e-calendar-view.c:2083
+#: ../capplet/anjal-settings-main.c:124
 #: ../shell/main.c:133
 msgid "Birthday"
 msgstr "çæ"
@@ -278,7 +243,8 @@ msgstr "éçäçèå"
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+#: ../plugins/groupwise-features/junk-settings.c:409
+#: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "éåéä"
 
@@ -511,7 +477,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:368
+#: ../addressbook/gui/widgets/eab-gui-util.c:381
 msgid "Error adding contact"
 msgstr "æåéçäæççéè"
 
@@ -668,7 +634,7 @@ msgid "_List name:"
 msgstr "åååç(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:159
 msgid "_Select..."
 msgstr "éå(_S)â"
 
@@ -701,19 +667,18 @@ msgstr "çéæåæççéè"
 msgid "Changed Contact:"
 msgstr "èæåçéçä:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
 msgid "Conflicting Contact:"
 msgstr "èççéçä:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "åæåéèçéçä"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+#: ../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 "æéçäçåçæéåéäåååçååææèæåãçèåäéèæåååï"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
@@ -738,7 +703,8 @@ msgid "_Merge"
 msgstr "åä(_M)"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:169
-#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#: ../addressbook/util/addressbook.c:245
+#: ../calendar/gui/tasktypes.xml.h:7
 #, c-format
 msgid "Cancelled"
 msgstr "ååæ"
@@ -748,7 +714,8 @@ 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:1691
@@ -1264,42 +1231,28 @@ msgstr "éèæ"
 msgid "Click to mail %s"
 msgstr "æäääåééä %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-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: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:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
 #, 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:111
-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: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:120
-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:126
+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:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid "Detailed error message:"
 msgstr "èççéèèæï"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1311,7 +1264,7 @@ msgstr ""
 "èäçæåæççæèæææéæçéæåççé\n"
 "äæåååèåäççæéåã"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 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"
@@ -1324,49 +1277,49 @@ msgstr ""
 "æéäéã"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 #, 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:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 #, 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:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 #, 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:202
+#: ../addressbook/gui/widgets/eab-gui-util.c:214
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:242
+#: ../addressbook/gui/widgets/eab-gui-util.c:254
 msgid "Select Address Book"
 msgstr "éæéèé"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 msgid "list"
 msgstr "æå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:441
+#: ../addressbook/gui/widgets/eab-gui-util.c:455
 msgid "Move contact to"
 msgstr "åéçäçå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Copy contact to"
 msgstr "èèéçäå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
+#: ../addressbook/gui/widgets/eab-gui-util.c:460
 msgid "Move contacts to"
 msgstr "åéçäçå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:448
+#: ../addressbook/gui/widgets/eab-gui-util.c:462
 msgid "Copy contacts to"
 msgstr "èèéçäå"
 
@@ -1378,7 +1331,8 @@ msgstr "åçæèæå"
 #: ../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
+#: ../calendar/importers/icalendar-importer.c:764
+#: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ååâ"
 
@@ -1468,9 +1422,7 @@ 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."
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
 msgstr "éåææåäïäåèåææäçåçæçïéèååæ 100ã"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:75
@@ -1478,8 +1430,7 @@ msgid "NUMBER"
 msgstr "æé"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:137
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "æäååæéèïèäç --help ééäæççæã"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:151
@@ -1525,30 +1476,20 @@ 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
@@ -1560,9 +1501,7 @@ 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
@@ -1570,13 +1509,11 @@ 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
@@ -1686,14 +1623,11 @@ 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
@@ -1715,45 +1649,31 @@ 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
@@ -1841,13 +1761,8 @@ 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."
@@ -1882,7 +1797,8 @@ msgstr "éæåå Evolution äåïçæäçæçåäã"
 msgid "_Discard Changes"
 msgstr "ææèæ(_D)"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:271
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "åå(_S)"
 
@@ -1891,7 +1807,8 @@ msgid "_Save Changes"
 msgstr "ååèæ(_S)"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:33
+#: ../mail/mail.error.xml.h:158
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "åé(_S)"
@@ -1927,8 +1844,8 @@ msgstr "åéèé(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
 #: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "äç:"
@@ -1937,7 +1854,8 @@ msgstr "äç:"
 msgid "Snooze _time:"
 msgstr "åçæé(_T):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:882
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../e-util/e-alert.c:887
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "èé(_D)"
@@ -1948,7 +1866,8 @@ msgstr "åæ(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
+#: ../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:375
 msgid "hours"
@@ -1961,39 +1880,41 @@ msgstr "çæçåé"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../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
+#: ../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:374
 msgid "minutes"
 msgstr "åé"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1585
 msgid "No summary available."
 msgstr "ææåççæèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
 msgid "No description available."
 msgstr "ææääæèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
 msgid "No location information available."
 msgstr "ææåççåéèèã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1523
 #, 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:1698
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
 msgid "Warning"
 msgstr "èå"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1706
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2005,11 +1926,10 @@ msgstr ""
 "éåéåéäã  Evolution æéç\n"
 "æéçæéåèçääæã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
 #, 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"
@@ -2022,7 +1942,7 @@ msgstr ""
 "\n"
 "æçåèåèéåçåï"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1752
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1756
 msgid "Do not ask me about this program again."
 msgstr "äèåèåæéæéåçåã"
 
@@ -2031,7 +1951,8 @@ 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:406
+#: ../calendar/gui/alarm-notify/util.c:69
+#: ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2040,7 +1961,8 @@ 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:412
+#: ../calendar/gui/alarm-notify/util.c:75
+#: ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2051,7 +1973,8 @@ 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:418
+#: ../calendar/gui/alarm-notify/util.c:79
+#: ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2079,13 +2002,16 @@ msgstr "éæè"
 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 "éä"
 
@@ -2095,66 +2021,85 @@ 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:240
-#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
-#: ../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:780
+#: ../calendar/gui/e-task-table.c:495
+#: ../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
+#: ../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:524
 #: ../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
 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:239
-#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.c:239
+#: ../calendar/gui/e-cal-model.c:778
+#: ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "çä"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-cal-model.c:776
-#: ../calendar/gui/e-task-table.c:493 ../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:769
+#: ../calendar/gui/e-cal-model.c:776
+#: ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "åé"
 
@@ -2168,34 +2113,44 @@ 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
 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 "äæ"
 
@@ -2244,7 +2199,8 @@ 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:72
 msgid "Options"
 msgstr "éé"
 
@@ -2290,8 +2246,10 @@ msgstr "å"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../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:336
+#: ../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:336
 #: ../plugins/google-account-setup/google-contacts-source.c:376
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "days"
@@ -2341,7 +2299,8 @@ msgstr "éå:"
 msgid "_Type:"
 msgstr "éå(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:150
+#: ../calendar/gui/dialogs/calendar-setup.c:232
+#: ../mail/mail-config.ui.h:152
 #: ../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
@@ -2368,7 +2327,8 @@ 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
+#: ../mail/em-folder-properties.c:200
+#: ../mail/mail-config.ui.h:51
 #: ../modules/addressbook/addressbook-config.c:1015
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
 #: ../plugins/itip-formatter/itip-formatter.c:2818
@@ -2508,23 +2468,29 @@ msgstr "æåäæååéçï"
 msgid "Click here to close the current window"
 msgstr "æéèäééçåèç"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1020 ../mail/e-mail-browser.c:139
+#: ../calendar/gui/dialogs/comp-editor.c:1020
+#: ../mail/e-mail-browser.c:139
 #: ../shell/e-shell-window-actions.c:1434
-#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
+#: ../widgets/misc/e-focus-tracker.c:118
+#: ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:412
+#: ../widgets/misc/e-web-view.c:1065
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1027 ../mail/e-mail-browser.c:146
+#: ../calendar/gui/dialogs/comp-editor.c:1027
+#: ../mail/e-mail-browser.c:146
 #: ../shell/e-shell-window-actions.c:1441
-#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-focus-tracker.c:111
+#: ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:1059
 msgid "Cut the selection"
 msgstr "åäéåçå"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1034
 #: ../shell/e-shell-window-actions.c:1448
-#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:565
+#: ../widgets/misc/e-focus-tracker.c:132
+#: ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "åééåçå"
 
@@ -2532,9 +2498,11 @@ msgstr "åééåçå"
 msgid "Click here to view help available"
 msgstr "æéèäæèåççèæ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1048 ../mail/e-mail-browser.c:153
+#: ../calendar/gui/dialogs/comp-editor.c:1048
+#: ../mail/e-mail-browser.c:153
 #: ../shell/e-shell-window-actions.c:1483
-#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-focus-tracker.c:125
+#: ../widgets/misc/e-focus-tracker.c:560
 #: ../widgets/misc/e-web-view.c:1071
 msgid "Paste the clipboard"
 msgstr "èäåèççåå"
@@ -2543,9 +2511,11 @@ msgstr "èäåèççåå"
 msgid "Click here to save the current window"
 msgstr "æéèäååçåèç"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076 ../mail/e-mail-browser.c:160
+#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../mail/e-mail-browser.c:160
 #: ../shell/e-shell-window-actions.c:1553
-#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:570
+#: ../widgets/misc/e-focus-tracker.c:139
+#: ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "éåæææå"
 
@@ -2554,7 +2524,8 @@ msgid "_Classification"
 msgstr "æé(_C)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1090
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+#: ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:174
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1581
@@ -2562,7 +2533,8 @@ msgstr "æé(_C)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:167
+#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../mail/e-mail-browser.c:167
 #: ../shell/e-shell-window-actions.c:1588
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
@@ -2582,8 +2554,10 @@ msgstr "æå(_I)"
 msgid "_Options"
 msgstr "éé(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125 ../mail/e-mail-browser.c:181
-#: ../shell/e-shell-window-actions.c:1630 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../mail/e-mail-browser.c:181
+#: ../shell/e-shell-window-actions.c:1630
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æè(_V)"
 
@@ -2669,12 +2643,12 @@ msgid "Toggles whether the Attendee Type is displayed"
 msgstr "åææåéçãåæèéåãæä"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1238
-#: ../composer/e-composer-private.c:70
+#: ../composer/e-composer-private.c:73
 msgid "Recent _Documents"
 msgstr "æèäçæä(_D)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1923
-#: ../composer/e-composer-actions.c:461
+#: ../composer/e-composer-actions.c:469
 msgid "Attach"
 msgstr "éå"
 
@@ -2841,7 +2815,8 @@ msgstr "çé/åç(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "æèæåæèççé/åçèè"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
+#: ../calendar/gui/dialogs/event-editor.c:318
+#: ../calendar/gui/print.c:3142
 msgid "Appointment"
 msgstr "çæ"
 
@@ -2980,7 +2955,7 @@ msgstr "ææ"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "Atte_ndees..."
 msgstr "åæè(_N)â"
 
@@ -3051,7 +3026,8 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "çå"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
+#: ../calendar/gui/dialogs/memo-editor.c:109
+#: ../calendar/gui/print.c:3146
 msgid "Memo"
 msgstr "ååé"
 
@@ -3076,10 +3052,14 @@ msgstr "äèåæççèååéïåçæäæåéä"
 msgid "Unable to open memos in '%s'."
 msgstr "çæåã%sãéåååéã"
 
-#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:282
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2401
-#: ../mail/em-format-html.c:2460 ../mail/em-format-html.c:2484
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:75
+#: ../calendar/gui/dialogs/memo-page.c:1081
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1052
+#: ../mail/em-format-html.c:2401
+#: ../mail/em-format-html.c:2466
+#: ../mail/em-format-html.c:2490
+#: ../mail/message-list.etspec.h:20
+#: ../modules/mail/em-mailer-prefs.c:75
 msgid "To"
 msgstr "æäè"
 
@@ -3317,7 +3297,8 @@ 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:79
 msgid "Preview"
 msgstr "éè"
 
@@ -3388,10 +3369,14 @@ msgstr "çé"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:298
 #: ../calendar/gui/e-cal-model-tasks.c:442
-#: ../calendar/gui/e-cal-model-tasks.c:716 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3230 ../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:716
+#: ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229
+#: ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:3232
+#: ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180
+#: ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "ååæ"
@@ -3401,18 +3386,24 @@ msgstr "ååæ"
 #: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:440
 #: ../calendar/gui/e-cal-model-tasks.c:714
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
-#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:592 ../calendar/gui/print.c:3227
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:232
+#: ../calendar/gui/e-task-table.c:212
+#: ../calendar/gui/e-task-table.c:227
+#: ../calendar/gui/e-task-table.c:592
+#: ../calendar/gui/print.c:3229
+#: ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
 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:317
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-task-table.c:516
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1226
+#: ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "é"
 
@@ -3421,25 +3412,31 @@ msgstr "é"
 #: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:438
 #: ../calendar/gui/e-cal-model-tasks.c:712
-#: ../calendar/gui/e-cal-model-tasks.c:789 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3224
+#: ../calendar/gui/e-cal-model-tasks.c:789
+#: ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225
+#: ../calendar/gui/e-task-table.c:591
+#: ../calendar/gui/print.c:3226
 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:321
-#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-task-table.c:518
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1224
+#: ../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:319
-#: ../calendar/gui/e-cal-model.c:1524 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1225
+#: ../calendar/gui/e-cal-model.c:1526
+#: ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/message-list.c:1225
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "äè"
@@ -3448,9 +3445,12 @@ msgstr "äè"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:302
 #: ../calendar/gui/e-cal-model-tasks.c:436
-#: ../calendar/gui/e-cal-model-tasks.c:710 ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:590
-#: ../calendar/gui/print.c:3221 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:710
+#: ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223
+#: ../calendar/gui/e-task-table.c:590
+#: ../calendar/gui/print.c:3223
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æéå"
 
@@ -3469,14 +3469,16 @@ msgstr "çæ(_U):"
 #: ../calendar/gui/e-calendar-view.c:1837
 #: ../calendar/gui/e-meeting-list-view.c:596
 #: ../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:519
+#: ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "ææå"
@@ -3507,7 +3509,8 @@ msgstr "æéèæè/æèèåäççæèçèæ"
 msgid "_Send Options"
 msgstr "åééé(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:331 ../calendar/gui/print.c:3142
+#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/print.c:3144
 #: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "åä"
@@ -3638,7 +3641,8 @@ msgstr "%s å %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s çæççèçéå"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:674
+#: ../calendar/gui/e-cal-component-preview.c:192
+#: ../filter/e-filter-rule.c:674
 msgid "Untitled"
 msgstr "çæé"
 
@@ -3669,7 +3673,8 @@ msgstr "çæï"
 msgid "Priority:"
 msgstr "ååççï"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "æèï"
 
@@ -3705,7 +3710,8 @@ msgid "Free"
 msgstr "çé"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "åç"
 
@@ -3725,39 +3731,46 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "ææ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model-tasks.c:1064
+#: ../calendar/gui/e-cal-model.c:1532
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-meeting-store.c:191
 #: ../calendar/gui/e-meeting-store.c:1029
 msgid "Yes"
 msgstr "æ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model-tasks.c:1064
+#: ../calendar/gui/e-cal-model.c:1532
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:193
 msgid "No"
 msgstr "å"
 
-#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:782
+#: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1073
-#: ../calendar/gui/print.c:1090 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:237
+#: ../calendar/gui/print.c:1073
+#: ../calendar/gui/print.c:1090
+#: ../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
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../calendar/gui/e-cal-model.c:1526
+#: ../calendar/gui/e-cal-model.c:1528
 msgid "Recurring"
 msgstr "éæææå"
 
-#: ../calendar/gui/e-cal-model.c:1528
+#: ../calendar/gui/e-cal-model.c:1530
 msgid "Assigned"
 msgstr "åæå"
 
-#: ../calendar/gui/e-cal-model.c:2608
+#: ../calendar/gui/e-cal-model.c:2610
 #, c-format
 msgid "Opening %s"
 msgstr "æåéå %s"
@@ -3817,40 +3830,46 @@ msgstr "ååèçèäää"
 msgid "Delete selected events"
 msgstr "åééåçää"
 
-#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:467
+#: ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "åééåççä"
 
-#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-memo-table.c:855
 #: ../calendar/gui/e-task-table.c:1078
 msgid "Updating objects"
 msgstr "ææçä"
 
 #: ../calendar/gui/e-calendar-view.c:1784
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/e-meeting-store.c:224
 #: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "æå"
 
 #: ../calendar/gui/e-calendar-view.c:1785
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:226
 #: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "åæ"
 
 #: ../calendar/gui/e-calendar-view.c:1786
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "Tentative"
 msgstr "æè"
 
 #: ../calendar/gui/e-calendar-view.c:1787
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:230
 #: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "ååæ"
@@ -3861,7 +3880,8 @@ 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:1932 ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-calendar-view.c:1932
+#: ../calendar/gui/e-memo-table.c:538
 #: ../calendar/gui/e-task-table.c:753
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -3869,14 +3889,16 @@ 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:1936 ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-calendar-view.c:1936
+#: ../calendar/gui/e-memo-table.c:543
 #: ../calendar/gui/e-task-table.c:756
 #, c-format
 msgid "Organizer: %s"
 msgstr "æèåéä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1952 ../calendar/gui/print.c:3176
+#: ../calendar/gui/e-calendar-view.c:1952
+#: ../calendar/gui/print.c:3178
 #, c-format
 msgid "Location: %s"
 msgstr "äçï%s"
@@ -3940,10 +3962,12 @@ 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:877 ../calendar/gui/e-day-view.c:1802
-#: ../calendar/gui/e-week-view-main-item.c:214 ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-day-view-top-item.c:877
+#: ../calendar/gui/e-day-view.c:1802
+#: ../calendar/gui/e-week-view-main-item.c:214
+#: ../calendar/gui/print.c:1847
 msgid "%A %d %B"
-msgstr "%A %d %B"
+msgstr "%B %d %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
@@ -3951,36 +3975,44 @@ msgstr "%A %d %B"
 #. %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:881 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-day-view-top-item.c:881
+#: ../calendar/gui/e-day-view.c:1819
 #: ../calendar/gui/e-week-view-main-item.c:223
 #: ../calendar/gui/ea-gnome-calendar.c:203
 #: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
-msgstr "%-m æ %-d æ (%a)"
+msgstr "%b %d (%a)"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #. 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:885 ../calendar/gui/e-day-view.c:1835
+#: ../calendar/gui/e-day-view-top-item.c:885
+#: ../calendar/gui/e-day-view.c:1835
 #: ../calendar/gui/e-week-view-main-item.c:237
 #: ../calendar/gui/ea-gnome-calendar.c:233
 #: ../modules/calendar/e-cal-shell-view-private.c:1041
 msgid "%d %b"
-msgstr "%-m æ %-d æ"
+msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:904 ../calendar/gui/print.c:920
-#: ../calendar/gui/print.c:2341 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-day-view.c:1005
+#: ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:904
+#: ../calendar/gui/print.c:920
+#: ../calendar/gui/print.c:2341
+#: ../calendar/gui/print.c:2358
 msgid "am"
 msgstr "äå"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1008 ../calendar/gui/e-week-view.c:763
-#: ../calendar/gui/print.c:906 ../calendar/gui/print.c:922
-#: ../calendar/gui/print.c:2343 ../calendar/gui/print.c:2360
+#: ../calendar/gui/e-day-view.c:1008
+#: ../calendar/gui/e-week-view.c:763
+#: ../calendar/gui/print.c:906
+#: ../calendar/gui/print.c:922
+#: ../calendar/gui/print.c:2343
+#: ../calendar/gui/print.c:2360
 msgid "pm"
 msgstr "äå"
 
@@ -4007,55 +4039,67 @@ msgid "Resources"
 msgstr "èæ"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1023 ../calendar/gui/print.c:1069
+#: ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:1023
+#: ../calendar/gui/print.c:1069
 msgid "Individual"
 msgstr "åå"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1070 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1070
+#: ../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:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:135
 #: ../calendar/gui/print.c:1071
 msgid "Resource"
 msgstr "èæ"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:137
 #: ../calendar/gui/print.c:1072
 msgid "Room"
 msgstr "æèå"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:166
 #: ../calendar/gui/print.c:1086
 msgid "Chair"
 msgstr "äå"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1026 ../calendar/gui/print.c:1087
+#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:1026
+#: ../calendar/gui/print.c:1087
 msgid "Required Participant"
 msgstr "ååè"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:170
 #: ../calendar/gui/print.c:1088
 msgid "Optional Participant"
 msgstr "ååè"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:172
 #: ../calendar/gui/print.c:1089
 msgid "Non-Participant"
 msgstr "çåè"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-store.c:222
 #: ../calendar/gui/e-meeting-store.c:1036
 msgid "Needs Action"
 msgstr "éèåä"
@@ -4071,35 +4115,36 @@ msgstr "åæè"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:234
 msgid "In Process"
 msgstr "éèä"
 
 #: ../calendar/gui/e-meeting-store.c:1760
-#, fuzzy, c-format
+#, c-format
 #| msgid "Enter password for user %s on server %s"
 msgid "Enter password to access free/busy information on server %s as user %s"
-msgstr "èåäçè %s åäæå %s äçåç "
+msgstr "èåäçè %2$s åäæå %1$s äååçé/åçèèçåç "
 
 #: ../calendar/gui/e-meeting-store.c:1767
-#, fuzzy, c-format
+#, c-format
 #| msgid "Failed to create thread: %s"
 msgid "Failure reason: %s"
-msgstr "çæåçåèçï%s"
+msgstr "åæååï%s"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:434
-#: ../calendar/gui/e-meeting-time-sel.c:2397
+#: ../calendar/gui/e-meeting-time-sel.c:2400
 msgid "%A, %B %d, %Y"
-msgstr "%Y å %-m æ %-d æ (%A)"
+msgstr "%Y, %B %d (%A)"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:438
-#: ../calendar/gui/e-meeting-time-sel.c:2428
+#: ../calendar/gui/e-meeting-time-sel.c:2431
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -4109,63 +4154,63 @@ msgstr "%Y/%m/%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:553
 msgid "Out of Office"
 msgstr "äåèåå"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "No Information"
 msgstr "ææèè"
 
-#: ../calendar/gui/e-meeting-time-sel.c:587
+#: ../calendar/gui/e-meeting-time-sel.c:590
 msgid "O_ptions"
 msgstr "éé(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:605
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _only working hours"
 msgstr "åéçåäæé(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:616
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "Show _zoomed out"
 msgstr "éççå(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:635
 msgid "_Update free/busy"
 msgstr "ææçé/åç(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:647
+#: ../calendar/gui/e-meeting-time-sel.c:650
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:665
+#: ../calendar/gui/e-meeting-time-sel.c:668
 msgid "_Autopick"
 msgstr "èåéæ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:680
+#: ../calendar/gui/e-meeting-time-sel.c:683
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:698
+#: ../calendar/gui/e-meeting-time-sel.c:701
 msgid "_All people and resources"
 msgstr "ææäååèæ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:708
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "All _people and one resource"
 msgstr "ææäååäåèæ(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:721
 msgid "_Required people"
 msgstr "åèçäå(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:727
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "Required people and _one resource"
 msgstr "åèäååäåèæ(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:776
+#: ../calendar/gui/e-meeting-time-sel.c:779
 msgid "_Start time:"
 msgstr "éåæå(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:816
+#: ../calendar/gui/e-meeting-time-sel.c:819
 msgid "_End time:"
 msgstr "çææå(_E):"
 
@@ -4202,17 +4247,20 @@ msgstr "æå"
 msgid "Memos"
 msgstr "ååé"
 
-#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:717
+#: ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:717
 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:797
+#: ../calendar/gui/e-memo-table.c:585
+#: ../calendar/gui/e-task-table.c:797
 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:815
+#: ../calendar/gui/e-memo-table.c:604
+#: ../calendar/gui/e-task-table.c:815
 msgid "Due: "
 msgstr "åæ:"
 
@@ -4250,7 +4298,8 @@ msgstr "èæéèååæçååé"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
+#: ../calendar/gui/e-task-table.c:636
+#: ../calendar/gui/print.c:2140
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
@@ -4292,7 +4341,8 @@ 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:231 ../calendar/gui/print.c:1828
+#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/print.c:1828
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -4350,7 +4400,8 @@ msgstr "çèææ"
 msgid "a table to view and select the current time range"
 msgstr "çäæèèéææåçåçèæ"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:151
+#: ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4359,7 +4410,8 @@ 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:156 ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-day-view.c:156
+#: ../calendar/gui/ea-week-view.c:153
 msgid "It has no events."
 msgstr "åææääã"
 
@@ -4396,7 +4448,7 @@ msgstr "Gnome èäæ"
 #: ../calendar/gui/ea-gnome-calendar.c:200
 #: ../modules/calendar/e-cal-shell-view-private.c:1001
 msgid "%A %d %b %Y"
-msgstr "%Y/%m/%d (%a)"
+msgstr "%Y, %b %d (%A)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:205
 #: ../calendar/gui/ea-gnome-calendar.c:210
@@ -4405,7 +4457,7 @@ msgstr "%Y/%m/%d (%a)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1014
 #: ../modules/calendar/e-cal-shell-view-private.c:1017
 msgid "%a %d %b %Y"
-msgstr "%Y å %-m æ %-d æ (%a)"
+msgstr "%Y, %b %d (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:229
 #: ../calendar/gui/ea-gnome-calendar.c:235
@@ -4416,7 +4468,7 @@ msgstr "%Y å %-m æ %-d æ (%a)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1052
 #: ../modules/calendar/e-cal-shell-view-private.c:1055
 msgid "%d %b %Y"
-msgstr "%Y å %-m æ %-d æ"
+msgstr "%Y, %b %d"
 
 #: ../calendar/gui/ea-jump-button.c:147
 msgid "Jump button"
@@ -4505,7 +4557,8 @@ msgstr "éæäå(_T)"
 msgid "September"
 msgstr "äæ"
 
-#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
+#: ../calendar/gui/itip-utils.c:407
+#: ../calendar/gui/itip-utils.c:458
 #: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "åéæåäååéäã"
@@ -4514,19 +4567,23 @@ msgstr "åéæåäååéäã"
 msgid "At least one attendee is necessary"
 msgstr "èåéèäååæè"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:631
+#: ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "ääèè"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "åäèè"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:637
+#: ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "ååéèè"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "çé/åçèè"
 
@@ -4559,7 +4616,8 @@ 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:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:691
+#: ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "åæç"
@@ -4778,61 +4836,61 @@ msgstr "ä"
 msgid "Sa"
 msgstr "å"
 
-#: ../calendar/gui/print.c:2969
+#: ../calendar/gui/print.c:2971
 msgid " to "
 msgstr " å "
 
-#: ../calendar/gui/print.c:2979
+#: ../calendar/gui/print.c:2981
 msgid " (Completed "
 msgstr " (ååæ) "
 
-#: ../calendar/gui/print.c:2985
+#: ../calendar/gui/print.c:2987
 msgid "Completed "
 msgstr "ååæ "
 
-#: ../calendar/gui/print.c:2995
+#: ../calendar/gui/print.c:2997
 msgid " (Due "
 msgstr "(æé)"
 
-#: ../calendar/gui/print.c:3002
+#: ../calendar/gui/print.c:3004
 msgid "Due "
 msgstr "æé "
 
-#: ../calendar/gui/print.c:3167
+#: ../calendar/gui/print.c:3169
 #, c-format
 msgid "Summary: %s"
 msgstr "æèï%s"
 
-#: ../calendar/gui/print.c:3194
+#: ../calendar/gui/print.c:3196
 msgid "Attendees: "
 msgstr "åæè:"
 
-#: ../calendar/gui/print.c:3237
+#: ../calendar/gui/print.c:3239
 #, c-format
 msgid "Status: %s"
 msgstr "çæ(_S): %s"
 
-#: ../calendar/gui/print.c:3252
+#: ../calendar/gui/print.c:3254
 #, c-format
 msgid "Priority: %s"
 msgstr "ååéå(_P): %s"
 
-#: ../calendar/gui/print.c:3270
+#: ../calendar/gui/print.c:3272
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "åæçåæ: %i"
 
-#: ../calendar/gui/print.c:3281
+#: ../calendar/gui/print.c:3283
 #, c-format
 msgid "URL: %s"
 msgstr "çå: %s"
 
-#: ../calendar/gui/print.c:3294
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Categories: %s"
 msgstr "åé: %s"
 
-#: ../calendar/gui/print.c:3305
+#: ../calendar/gui/print.c:3307
 msgid "Contacts: "
 msgstr "éçä: "
 
@@ -4845,11 +4903,13 @@ msgstr "% ååæ"
 msgid "In progress"
 msgstr "æåéè"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28
+#: ../mail/em-filter-i18n.h: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 "åæ"
 
@@ -6643,7 +6703,8 @@ msgstr "ååçèç(_D)"
 msgid "Save as draft"
 msgstr "ååçèç"
 
-#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:318
+#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-private.c:347
 msgid "S_end"
 msgstr "åé(_E)"
 
@@ -6668,62 +6729,70 @@ msgid "Sign this message with your PGP key"
 msgstr "çæç PGP ééçéäåäæäçç"
 
 #: ../composer/e-composer-actions.c:358
+msgid "_Picture Gallery"
+msgstr "åçé(_P)"
+
+#: ../composer/e-composer-actions.c:360
+msgid "Show a collection of pictures that you can drag to your message"
+msgstr "çæåäææåéääçåçé"
+
+#: ../composer/e-composer-actions.c:366
 msgid "_Prioritize Message"
 msgstr "éäååæ(_P)"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:368
 msgid "Set the message priority to high"
 msgstr "åéäååæèçãéã"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:374
 msgid "Re_quest Read Receipt"
 msgstr "èæèäåæ(_Q)"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:376
 msgid "Get delivery notification when your message is read"
 msgstr "åæçéäèéèæååéäéç"
 
-#: ../composer/e-composer-actions.c:374
+#: ../composer/e-composer-actions.c:382
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME åå"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:384
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "äçæç S/MIME ååæèåéåéäåå"
 
-#: ../composer/e-composer-actions.c:382
+#: ../composer/e-composer-actions.c:390
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME åç"
 
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:392
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "çæç S/MIME çåæèçéäåäæäçç"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:398
 msgid "_Bcc Field"
 msgstr "åäåææä(_B)"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:400
 msgid "Toggles whether the BCC field is displayed"
 msgstr "åæåäåææäçéççæ"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:406
 msgid "_Cc Field"
 msgstr "åææä(_C)"
 
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:408
 msgid "Toggles whether the CC field is displayed"
 msgstr "åæåææäçéççæ"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:414
 msgid "_Reply-To Field"
 msgstr "åèæä(_R)"
 
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:416
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "åæåèæäçéççæ"
 
-#: ../composer/e-composer-actions.c:464
+#: ../composer/e-composer-actions.c:475
 msgid "Save Draft"
 msgstr "ååèç"
 
@@ -6736,11 +6805,8 @@ msgid "Enter the addresses that will receive a carbon copy 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 ""
-"èåéäåäåæçæäèïäåææåéåéäääæåçåéäçæäèæå"
+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:1006
 msgid "Fr_om:"
@@ -6782,55 +6848,51 @@ msgstr "æéèæåçéæå"
 msgid "Click here to select folders to post to"
 msgstr "æääéèïéåèåèçèæå"
 
-#: ../composer/e-composer-private.c:217
+#: ../composer/e-composer-private.c:245
 msgid "Undo the last action"
 msgstr "ååääæçåä"
 
-#: ../composer/e-composer-private.c:221
+#: ../composer/e-composer-private.c:249
 msgid "Redo the last undone action"
 msgstr "åæääæååçåä"
 
-#: ../composer/e-composer-private.c:225
+#: ../composer/e-composer-private.c:253
 msgid "Search for text"
 msgstr "æåæå"
 
-#: ../composer/e-composer-private.c:229
+#: ../composer/e-composer-private.c:257
 msgid "Search for and replace text"
 msgstr "æåååäæå"
 
-#: ../composer/e-composer-private.c:338
+#: ../composer/e-composer-private.c:367
 msgid "Save draft"
 msgstr "ååèç"
 
 #: ../composer/e-msg-composer.c:784
 #, 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
 #, 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:2014
+#: ../composer/e-msg-composer.c:1675
+#: ../composer/e-msg-composer.c:2043
 msgid "Compose Message"
 msgstr "çèéä"
 
-#: ../composer/e-msg-composer.c:4085
+#: ../composer/e-msg-composer.c:4118
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "éäçèåååäèçèçéæåçéäåæã"
 
-#: ../composer/e-msg-composer.c:4790
+#: ../composer/e-msg-composer.c:4823
 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
@@ -6850,9 +6912,7 @@ 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
@@ -6864,22 +6924,12 @@ 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."
@@ -6910,11 +6960,8 @@ 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."
@@ -6924,14 +6971,13 @@ 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:117
 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
@@ -6971,24 +7017,24 @@ msgstr "ååååäå(_S)"
 msgid "_Try Again"
 msgstr "åèäæ(_T)"
 
-#: ../capplet/anjal-settings-main.c:223
+#: ../capplet/anjal-settings-main.c:224
 msgid "Run Anjal in a window"
 msgstr "äååèçåè Anjal"
 
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:225
 msgid "Make Anjal the default email client"
 msgstr "ä Anjal åçéèéäåæç"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:231
+#: ../capplet/anjal-settings-main.c:232
 msgid "ID of the socket to embed in"
 msgstr "socket ç IDïååæ"
 
-#: ../capplet/anjal-settings-main.c:232
+#: ../capplet/anjal-settings-main.c:233
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:245
+#: ../capplet/anjal-settings-main.c:246
 msgid "Anjal email client"
 msgstr "Anjal éåéäåæç"
 
@@ -7065,48 +7111,32 @@ 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 ""
-"èäçéåéåéäçåæéèåèåäååèãèåäéæäæçéåéääååå"
-"çïæåæåèäæåææçèååãåææåçæèååæéåæéïæåéèäç"
-"èååèçäæåèçèæã"
+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 ""
-"ææïæåçæèåæåæçéäèååãèåäéèåååãæåæäæååèåç"
-"èçèæèèéåïäææäæåèéèæèååã"
+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
 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 ""
-"çåæåéèæçèååæèåééäãæååçèèçæéåèåïäæææèææ"
-"ååäéèçèã"
+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
 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."
+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:2095 ../mail/em-account-editor.c:2216
+#: ../mail/em-account-editor.c:2095
+#: ../mail/em-account-editor.c:2216
 msgid "Identity"
 msgstr "èå"
 
@@ -7199,13 +7229,8 @@ msgid "Setup Yahoo calendar with Evolution"
 msgstr "å Yahoo èäæåå Evolution"
 
 #: ../capplet/settings/mail-account-view.c:770
-msgid ""
-"Yahoo calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. So please confirm and re-enter the calendar name if it is not "
-"correct."
-msgstr ""
-"Yahoo èäææååç åå_åæãæåååèçæéåèäæçåçãåæèçè"
-"åïåææéèèéæèåèäæçåçã"
+msgid "Yahoo 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:777
 msgid "Yahoo account settings:"
@@ -7233,11 +7258,16 @@ msgid "Evolution account assistant"
 msgstr "Evolution åèåç"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:358 ../mail/e-mail-migrate.c:677
-#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:148
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:218
+#: ../capplet/settings/mail-capplet-shell.c:358
+#: ../mail/e-mail-migrate.c:680
+#: ../mail/e-mail-store.c:225
+#: ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165
+#: ../mail/mail-vfolder.c:218
 #: ../mail/message-list.c:1709
 #: ../modules/addressbook/e-book-shell-backend.c:96
 #: ../modules/addressbook/e-book-shell-migrate.c:135
@@ -7275,7 +7305,8 @@ msgstr "èäæääéç"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution éééç"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:959
+#: ../data/evolution.desktop.in.in.h:1
+#: ../mail/e-mail-browser.c:959
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
@@ -7285,7 +7316,8 @@ 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:652
 msgid "Groupware Suite"
 msgstr "Groupware åèèé"
 
@@ -7393,12 +7425,16 @@ 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 "çé"
@@ -7422,7 +7458,8 @@ msgid "Today"
 msgstr "äå"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:210
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æå"
 
@@ -7440,7 +7477,8 @@ msgid_plural "Next %a"
 msgstr[0] "ä%a"
 msgstr[1] "ä%a"
 
-#: ../e-util/e-datetime-format.c:295 ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:295
+#: ../e-util/e-datetime-format.c:305
 #: ../e-util/e-datetime-format.c:314
 msgid "Use locale default"
 msgstr "äçååèåéèå"
@@ -7466,7 +7504,8 @@ msgstr "æåååã%sã"
 msgid "Writing \"%s\" to %s"
 msgstr "æåååã%sãè %s"
 
-#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:429
+#: ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:377
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
@@ -7481,8 +7520,7 @@ 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."
+msgid "The printing system did not report any additional details about the error."
 msgstr "ååççææååääéææéèçéåèèã"
 
 #: ../e-util/e-signature.c:707
@@ -7509,7 +7547,8 @@ msgstr "èèåå?"
 msgid "File exists \"{0}\"."
 msgstr "ææåååã{0}ãã"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:155
+#: ../e-util/e-system.error.xml.h:6
+#: ../mail/mail.error.xml.h:157
 msgid "_Overwrite"
 msgstr "èå(_O)"
 
@@ -7530,58 +7569,77 @@ msgstr "GConf éèï%s"
 msgid "All further errors shown only on terminal."
 msgstr "ææéäæçéèèæåæåççæäéçã"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
-#: ../mail/e-mail-tag-editor.c:329 ../mail/message-list.etspec.h:7
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1050
+#: ../mail/e-mail-tag-editor.c:329
+#: ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:73
 msgid "From"
 msgstr "åäè"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1051
 #: ../modules/mail/em-mailer-prefs.c:74
 msgid "Reply-To"
 msgstr "åè"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2464
-#: ../mail/em-format-html.c:2487 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2402
+#: ../mail/em-format-html.c:2470
+#: ../mail/em-format-html.c:2493
+#: ../modules/mail/em-mailer-prefs.c:76
 msgid "Cc"
 msgstr "åæ"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2403 ../mail/em-format-html.c:2468
-#: ../mail/em-format-html.c:2490 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2403
+#: ../mail/em-format-html.c:2474
+#: ../mail/em-format-html.c:2496
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "Bcc"
 msgstr "åäåæ"
 
-#: ../em-format/em-format-quote.c:426 ../em-format/em-format.c:1055
-#: ../mail/e-mail-tag-editor.c:334 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:427
+#: ../em-format/em-format.c:1055
+#: ../mail/e-mail-tag-editor.c:334
+#: ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18
+#: ../modules/mail/em-mailer-prefs.c:78
 #: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
+#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "äæ"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:437 ../mail/em-format-html.c:2584
+#: ../em-format/em-format-quote.c:438
+#: ../mail/em-format-html.c:2590
 #: ../modules/mail/em-mailer-prefs.c:1117
 msgid "Mailer"
 msgstr "åäè"
 
-#: ../em-format/em-format-quote.c:518 ../mail/em-composer-utils.c:1141
+#: ../em-format/em-format-quote.c:519
+#: ../mail/em-composer-utils.c:1142
 msgid "-------- Forwarded Message --------"
 msgstr "-------- èéçéä --------"
 
-#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:79 ../widgets/misc/e-dateedit.c:529
+#: ../em-format/em-format.c:1056
+#: ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:79
+#: ../widgets/misc/e-dateedit.c:529
 #: ../widgets/misc/e-dateedit.c:551
 msgid "Date"
 msgstr "ææ"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1057
+#: ../modules/mail/em-mailer-prefs.c:80
 msgid "Newsgroups"
 msgstr "æèçç"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format.c:1058
+#: ../modules/mail/em-mailer-prefs.c:81
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "éè"
@@ -7595,7 +7653,8 @@ msgstr "%s éä"
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "çæåæ S/MIME éä:æççéè"
 
-#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
+#: ../em-format/em-format.c:1729
+#: ../em-format/em-format.c:1926
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "çæèæ MIME æåçéäãååéçååæã"
 
@@ -7615,11 +7674,13 @@ msgstr "çæåæ PGP/MIME éäïæççéè"
 msgid "Unsupported signature format"
 msgstr "äææççåæå"
 
-#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
+#: ../em-format/em-format.c:1964
+#: ../em-format/em-format.c:2137
 msgid "Error verifying signature"
 msgstr "æéçåççéè"
 
-#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
+#: ../em-format/em-format.c:1965
+#: ../em-format/em-format.c:2124
 #: ../em-format/em-format.c:2138
 msgid "Unknown error verifying signature"
 msgstr "æéçåççäæéè"
@@ -7628,9 +7689,12 @@ msgstr "æéçåççäæéè"
 msgid "Could not parse PGP message: "
 msgstr "çæèæ PGP éäï"
 
-#: ../em-format/em-format.c:2235 ../mail/mail-ops.c:624
+#: ../em-format/em-format.c:2235
+#: ../mail/em-folder-tree.c:662
+#: ../mail/mail-ops.c:624
 #: ../plugins/caldav/caldav-browse-server.c:211
-#: ../plugins/caldav/caldav-browse-server.c:1408 ../plugins/face/face.c:169
+#: ../plugins/caldav/caldav-browse-server.c:1408
+#: ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "äæçéè"
@@ -7739,7 +7803,8 @@ msgstr[1] "%d åå"
 msgid "<click here to select a date>"
 msgstr "<æéèéæææ>"
 
-#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:136
+#: ../filter/e-filter-datespec.c:147
 #: ../filter/e-filter-datespec.c:158
 msgid "now"
 msgstr "çå"
@@ -7787,7 +7852,8 @@ msgstr "ææ"
 msgid "All related"
 msgstr "ææçéç"
 
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:759
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "åè"
 
@@ -7807,12 +7873,14 @@ msgstr "åæéäçç(_N)"
 msgid "A_dd Condition"
 msgstr "ååæä(_D)"
 
-#: ../filter/e-filter-rule.c:1136 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:1136
+#: ../filter/filter.ui.h:2
 #: ../mail/em-utils.c:317
 msgid "Incoming"
 msgstr "åé"
 
-#: ../filter/e-filter-rule.c:1136 ../mail/em-utils.c:318
+#: ../filter/e-filter-rule.c:1136
+#: ../mail/em-utils.c:318
 msgid "Outgoing"
 msgstr "åå"
 
@@ -7844,7 +7912,8 @@ 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:83
 msgid "Missing name."
 msgstr "çååçã"
 
@@ -7900,7 +7969,8 @@ 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)"
 
@@ -7937,9 +8007,12 @@ msgstr "ææåçæå"
 msgid "years"
 msgstr "å"
 
-#: ../mail/e-mail-attachment-bar.c:93 ../mail/e-mail-attachment-bar.c:98
-#: ../mail/em-format-html-display.c:1053 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:131
+#: ../mail/e-mail-attachment-bar.c:93
+#: ../mail/e-mail-attachment-bar.c:98
+#: ../mail/em-format-html-display.c:1053
+#: ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:131
 #: ../widgets/misc/e-attachment-paned.c:136
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -7956,7 +8029,8 @@ msgstr "åçæè"
 msgid "List View"
 msgstr "æåæè"
 
-#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1406
+#: ../mail/e-mail-browser.c:132
+#: ../shell/e-shell-window-actions.c:1406
 #: ../shell/e-shell-window-actions.c:1413
 #: ../shell/e-shell-window-actions.c:1420
 msgid "Close this window"
@@ -8045,32 +8119,38 @@ msgstr "éè"
 msgid "Name"
 msgstr "åç"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree.c:2986
-#: ../modules/mail/e-mail-shell-view-private.c:1099
-#: ../modules/mail/e-mail-shell-view-private.c:1110
+#: ../mail/e-mail-local.c:35
+#: ../mail/em-folder-properties.c:285
+#: ../mail/em-folder-tree-model.c:766
+#: ../mail/em-folder-tree.c:3132
+#: ../modules/mail/e-mail-shell-view-private.c:1118
+#: ../modules/mail/e-mail-shell-view-private.c:1129
 msgid "Inbox"
 msgstr "æäå"
 
-#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:1007
+#: ../mail/e-mail-local.c:36
+#: ../mail/e-mail-migrate.c:1000
 #: ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1097
+#: ../modules/mail/e-mail-shell-view-private.c:1116
 msgid "Drafts"
 msgstr "èç"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
-#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../mail/e-mail-local.c:37
+#: ../mail/em-folder-tree-model.c:770
+#: ../modules/mail/e-mail-shell-view-private.c:1120
 msgid "Outbox"
 msgstr "åäå"
 
-#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:1000
+#: ../mail/e-mail-local.c:38
+#: ../mail/e-mail-migrate.c:994
 #: ../mail/em-folder-tree-model.c:772
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1122
 msgid "Sent"
 msgstr "ååé"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1105
+#: ../mail/e-mail-local.c:39
+#: ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1124
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:581
 msgid "Templates"
@@ -8089,14 +8169,13 @@ msgstr "çè"
 msgid "Migrating '%s':"
 msgstr "æåçèã%sãï"
 
-#: ../mail/e-mail-migrate.c:657
+#: ../mail/e-mail-migrate.c:660
 msgid "Migrating Folders"
 msgstr "æåèçèæå"
 
-#: ../mail/e-mail-migrate.c:658
+#: ../mail/e-mail-migrate.c:661
 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 ""
@@ -8104,7 +8183,7 @@ msgstr ""
 "\n"
 "ç Evolution çèæçèæåæïèèåçå..."
 
-#: ../mail/e-mail-migrate.c:1147
+#: ../mail/e-mail-migrate.c:1131
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "çæåã%sãåçæåéäèæåï%s"
@@ -8121,11 +8200,13 @@ msgstr "èéæèæå"
 msgid "Do not ask me again"
 msgstr "äèåèåæ"
 
-#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:309
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "èèèèæå"
 
-#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:309
+#: ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "èè(_O)"
 
@@ -8133,25 +8214,24 @@ msgstr "èè(_O)"
 #. %d with count of duplicate messages.
 #: ../mail/e-mail-reader.c:510
 #, 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?"
+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:969 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:969
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "çèèæå"
 
-#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:969
+#: ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "çå(_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1404
 #: ../mail/e-mail-reader.c:1446
 msgid "_Do not ask me again."
 msgstr "äèåèåæ(_D)ã"
@@ -8288,7 +8368,8 @@ msgstr "åéåçéäåäèéææ"
 msgid "_Attached"
 msgstr "éä(_A)"
 
-#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1953
 msgid "Forward the selected message to someone as an attachment"
 msgstr "åéåçéääéäååèåçæä"
 
@@ -8300,7 +8381,8 @@ msgstr "äéäèå(_A)"
 msgid "_Inline"
 msgstr "èå(_I)"
 
-#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1967
 msgid "Forward the selected message in the body of a new message"
 msgstr "åéèèåçéäåéææéäçåæä"
 
@@ -8312,7 +8394,8 @@ msgstr "äèåèå(_I)"
 msgid "_Quoted"
 msgstr "åæ(_Q)"
 
-#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1981
 msgid "Forward the selected message quoted like a reply"
 msgstr "åéèèåçéääåèéäæååå"
 
@@ -8538,7 +8621,8 @@ msgstr "çééèçéä(_P)"
 msgid "Checks selected messages for duplicates"
 msgstr "ææéåçéäæåæéè"
 
-#: ../mail/e-mail-reader.c:2182 ../mail/mail.error.xml.h:102
+#: ../mail/e-mail-reader.c:2182
+#: ../mail/mail.error.xml.h:102
 #: ../modules/calendar/e-cal-shell-view-actions.c:1463
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
@@ -8548,7 +8632,8 @@ msgstr "åèææä(_A)"
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æååéçåéåéäçåéæäè"
 
-#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2189
+#: ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "åèèæå(_L)"
 
@@ -8721,18 +8806,20 @@ msgstr "ææéäæé(_H)"
 msgid "Show messages with all email headers"
 msgstr "éçéäåèçæé"
 
-#: ../mail/e-mail-reader.c:2670
+#: ../mail/e-mail-reader.c:2676
 msgid "Unable to retrieve message"
 msgstr "çæææéä"
 
-#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
+#: ../mail/e-mail-reader.c:2737
+#: ../mail/mail-ops.c:2044
 #, 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:3344 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:3350
+#: ../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
@@ -8740,100 +8827,105 @@ msgstr "æåååéäã%sã"
 msgid "Default"
 msgstr "éèå"
 
-#: ../mail/e-mail-reader.c:3524
+#: ../mail/e-mail-reader.c:3530
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "èå(_F)"
 
-#: ../mail/e-mail-reader.c:3525
+#: ../mail/e-mail-reader.c:3531
 msgid "Forward the selected message to someone"
 msgstr "åéåçéäèåçæä"
 
-#: ../mail/e-mail-reader.c:3544
+#: ../mail/e-mail-reader.c:3550
 msgid "Group Reply"
 msgstr "ççåè"
 
-#: ../mail/e-mail-reader.c:3545
+#: ../mail/e-mail-reader.c:3551
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "åèçéäèåïææçææçæäè"
 
-#: ../mail/e-mail-reader.c:3590 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3596
+#: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:744
 msgid "Delete"
 msgstr "åé"
 
-#: ../mail/e-mail-reader.c:3623
+#: ../mail/e-mail-reader.c:3629
 #: ../modules/calendar/e-cal-shell-view-actions.c:1309
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3627
+#: ../mail/e-mail-reader.c:3633
 #: ../modules/calendar/e-cal-shell-view-actions.c:1302
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3637 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3643
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "åè"
 
-#: ../mail/e-mail-reader.c:4274
+#: ../mail/e-mail-reader.c:4280
 #, c-format
 msgid "Folder '%s'"
 msgstr "èæåã%sã"
 
-#: ../mail/e-mail-session.c:644
+#: ../mail/e-mail-session.c:647
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "èèå %s æéçåè"
 
-#: ../mail/e-mail-session.c:646
+#: ../mail/e-mail-session.c:649
 msgid "Enter Passphrase"
 msgstr "èååè"
 
-#: ../mail/e-mail-session.c:649
+#: ../mail/e-mail-session.c:652
 #, c-format
 msgid "Enter Password for %s"
 msgstr "èèå %s æéçåç"
 
-#: ../mail/e-mail-session.c:651
+#: ../mail/e-mail-session.c:654
 msgid "Enter Password"
 msgstr "èååç"
 
-#: ../mail/e-mail-session.c:696
+#: ../mail/e-mail-session.c:702
 #, c-format
 msgid "User canceled operation."
 msgstr "äçèååææäã"
 
-#: ../mail/e-mail-session.c:864
+#: ../mail/e-mail-session.c:870
 #, 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:873
+#: ../mail/e-mail-session.c:879
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æäååäççåèïéäçèååçåæã"
 
-#: ../mail/e-mail-session.c:1262 ../mail/mail-ops.c:1220
+#: ../mail/e-mail-session.c:1268
+#: ../mail/mail-ops.c:1220
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "éåèæåã%sã"
 
-#: ../mail/e-mail-session.c:1278
+#: ../mail/e-mail-session.c:1284
 #, c-format
 msgid "Invalid folder: %s"
 msgstr "çæçèæåï%s"
 
-#: ../mail/e-mail-session-utils.c:477 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:477
+#: ../mail/mail-ops.c:605
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "çæåçååéæåï%s"
 
-#: ../mail/e-mail-session-utils.c:501 ../mail/e-mail-session-utils.c:535
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:501
+#: ../mail/e-mail-session-utils.c:535
+#: ../mail/mail-ops.c:622
+#: ../mail/mail-ops.c:653
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -8842,17 +8934,19 @@ msgstr ""
 "çæéåè %sï%s\n"
 "æéåèæåãåäåãèæåã"
 
-#: ../mail/e-mail-session-utils.c:555 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:555
+#: ../mail/mail-ops.c:673
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "çæéåèæåãåäåãèæåï%s"
 
-#: ../mail/e-mail-session-utils.c:761 ../mail/mail-ops.c:774
+#: ../mail/e-mail-session-utils.c:765
+#: ../mail/mail-ops.c:774
 #: ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "æååééä"
 
-#: ../mail/e-mail-session-utils.c:832
+#: ../mail/e-mail-session-utils.c:836
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "åæèéèæå ã%sã"
@@ -8873,7 +8967,8 @@ 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:567 ../mail/mail-config.ui.h:69
+#: ../mail/em-account-editor.c:567
+#: ../mail/mail-config.ui.h:69
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "ææåå"
@@ -8881,7 +8976,8 @@ 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:571 ../mail/mail-config.ui.h:124
+#: ../mail/em-account-editor.c:571
+#: ../mail/mail-config.ui.h:126
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS åå"
@@ -8889,13 +8985,15 @@ 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:575 ../mail/mail-config.ui.h:91
+#: ../mail/em-account-editor.c:575
+#: ../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:843 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:843
+#: ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "ææ"
@@ -8913,7 +9011,8 @@ msgid "Ask for each message"
 msgstr "æåéäçèå"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:1708
+#: ../widgets/misc/e-account-tree-view.c:131
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "ææ"
@@ -8933,15 +9032,11 @@ msgstr ""
 "æääãååãéåã "
 
 #: ../mail/em-account-editor.c:2096
-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 ""
-"èåäéèåæçåçåééååããéææãçæäääåèåïééæåæåéå"
-"çéäåååéäèèã"
+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:2098 ../mail/em-account-editor.c:2260
+#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2260
 msgid "Receiving Email"
 msgstr "ææéåéä"
 
@@ -8949,25 +9044,26 @@ msgstr "ææéåéä"
 msgid "Please configure the following account settings."
 msgstr "èåèåäååèçèååã"
 
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2759
+#: ../mail/em-account-editor.c:2101
+#: ../mail/em-account-editor.c:2759
 msgid "Sending Email"
 msgstr "åééåéä"
 
 #: ../mail/em-account-editor.c:2102
-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 ""
-"èèåääéæåééäæåçèèãåææäææïèèçççççåæçèæåä"
-"æåã"
+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:2104
-msgid "Account Management"
-msgstr "åèçç"
+#: ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "åèèè"
 
 #: ../mail/em-account-editor.c:2105
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
+"Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
 msgstr ""
 "èåäéççéèåæèéååèçåçã\n"
@@ -9003,56 +9099,55 @@ msgstr "åé(_T)"
 msgid "Please select a folder from the current account."
 msgstr "èéæçååèçèæåã"
 
-#: ../mail/em-account-editor.c:3172 ../mail/mail-config.ui.h:98
+#: ../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:3217 ../mail/em-account-editor.c:3285
+#: ../mail/em-account-editor.c:3217
+#: ../mail/em-account-editor.c:3285
 msgid "Receiving Options"
 msgstr "ææéé"
 
-#: ../mail/em-account-editor.c:3218 ../mail/em-account-editor.c:3286
+#: ../mail/em-account-editor.c:3218
+#: ../mail/em-account-editor.c:3286
 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:1136
-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:1137
+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:1146
+#: ../mail/em-composer-utils.c:1147
 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:1804
+#: ../mail/em-composer-utils.c:1805
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "æåç %s äæã%sã (%s) çéäåèéèã"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1854
+#: ../mail/em-composer-utils.c:1855
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "éééçïã%sã"
 
-#: ../mail/em-composer-utils.c:2272
+#: ../mail/em-composer-utils.c:2273
 msgid "an unknown sender"
 msgstr "äæçåäè"
 
-#: ../mail/em-composer-utils.c:2696
+#: ../mail/em-composer-utils.c:2697
 msgid "Posting destination"
 msgstr "åèçççç"
 
-#: ../mail/em-composer-utils.c:2697
+#: ../mail/em-composer-utils.c:2698
 msgid "Choose folders to post the message to."
 msgstr "éåèæåäåèéäã"
 
@@ -9173,7 +9268,8 @@ 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:60
 msgid "Junk"
 msgstr "ååéä"
 
@@ -9222,11 +9318,13 @@ 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:15
 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 "æäè"
 
@@ -9254,11 +9352,13 @@ 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 "åäè"
 
@@ -9353,62 +9453,72 @@ msgid "Folder _name:"
 msgstr "èæååç(_N):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1140 ../mail/mail-vfolder.c:1216
+#: ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167
+#: ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1140
+#: ../mail/mail-vfolder.c:1216
 msgid "Search Folders"
 msgstr "æåèæå"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
+#: ../mail/em-folder-tree-model.c:174
+#: ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "äçå"
 
-#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:836
+#: ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
 msgstr "èåäâ"
 
-#: ../mail/em-folder-tree.c:201
+#: ../mail/em-folder-tree.c:203
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "ææã%sãåçèæå"
 
-#: ../mail/em-folder-tree.c:629
+#: ../mail/em-folder-tree.c:631
 msgid "Folder names cannot contain '/'"
 msgstr "èæååçäèååæçã"
 
-#: ../mail/em-folder-tree.c:1191
+#: ../mail/em-folder-tree.c:1250
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1427
+#: ../mail/em-folder-tree.c:1486
 msgid "Mail Folder Tree"
 msgstr "éäèæåæ"
 
-#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:1934
+#: ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "æåçåèæå %s"
 
-#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1938
+#: ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "æåèèèæå %s"
 
-#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
+#: ../mail/em-folder-tree.c:1947
+#: ../mail/message-list.c:2214
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æååéäçèèæå %s"
 
-#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
+#: ../mail/em-folder-tree.c:1951
+#: ../mail/message-list.c:2216
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æåèèéäèèæå %s"
 
-#: ../mail/em-folder-tree.c:1824
+#: ../mail/em-folder-tree.c:1970
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "çæåéäææåæäåçååå"
@@ -9437,103 +9547,89 @@ msgstr "åçèæå"
 msgid "Specify where to create the folder:"
 msgstr "æåèåçèæåçäçï"
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html.c:1604
 msgid "Unsigned"
 msgstr "æçå"
 
 #: ../mail/em-format-html-display.c:88
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "æéäæçåãääèæéäåéèã"
 
-#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
+#: ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html.c:1605
 msgid "Valid signature"
 msgstr "ææççå"
 
 #: ../mail/em-format-html-display.c:89
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+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:90 ../mail/em-format-html.c:1606
+#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html.c:1606
 msgid "Invalid signature"
 msgstr "çæççå"
 
 #: ../mail/em-format-html-display.c:90
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "éäççåçææéïåèåååéæèæåäã"
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
+#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html.c:1607
 msgid "Valid signature, but cannot verify sender"
 msgstr "çåææïäæçææéåäè"
 
 #: ../mail/em-format-html-display.c:91
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+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:92 ../mail/em-format-html.c:1608
+#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html.c:1608
 msgid "Signature exists, but need public key"
 msgstr "ççååïäéèåééé"
 
 #: ../mail/em-format-html-display.c:92
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "æéäæäåææççåïäæææåæçåéééã"
 
-#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
+#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html.c:1614
 msgid "Unencrypted"
 msgstr "æåå"
 
 #: ../mail/em-format-html-display.c:99
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "æéäæååãåçåååééçéçèåéåèæèæéã"
 
-#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
+#: ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html.c:1615
 msgid "Encrypted, weak"
 msgstr "åååïäåå"
 
 #: ../mail/em-format-html-display.c:100
-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 ""
-"æéäåååïäæäçäååçååæçæãåéçäåéæéååïäåèääæ"
-"æïääæçææèæéäçååã"
+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:101 ../mail/em-format-html.c:1616
+#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html.c:1616
 msgid "Encrypted"
 msgstr "ååå"
 
 #: ../mail/em-format-html-display.c:101
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+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:102 ../mail/em-format-html.c:1617
+#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html.c:1617
 msgid "Encrypted, strong"
 msgstr "åååïåå"
 
 #: ../mail/em-format-html-display.c:102
-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 ""
-"æéäåååïäçååçååæçæãçäçéäææéïåéçäåéæéæéä"
-"çååã"
+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:238 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:238
+#: ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æèæè(_V)"
 
@@ -9542,12 +9638,8 @@ msgid "This certificate is not viewable"
 msgstr "ææèçææè"
 
 #: ../mail/em-format-html-display.c:506
-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 çæéçæåéåéäïåçååèåèèççååãæåäçäæççæ"
-"åæäçåéæåçèåäéèåã"
+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:749
 msgid "Completed on"
@@ -9562,7 +9654,8 @@ msgstr "åææ:"
 msgid "by"
 msgstr "æ"
 
-#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
+#: ../mail/em-format-html-display.c:978
+#: ../mail/em-format-html-display.c:1025
 msgid "View _Unformatted"
 msgstr "æéææçç(_U)"
 
@@ -9587,7 +9680,8 @@ msgstr "æååéä"
 msgid "Formatting Message..."
 msgstr "æååéäâ"
 
-#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
+#: ../mail/em-format-html.c:1448
+#: ../mail/em-format-html.c:1458
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æåååã%sã"
@@ -9627,12 +9721,13 @@ 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:2762
+#: ../mail/em-format-html.c:2768
 #, 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:82
+#: ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
 msgid "No HTML stream available"
@@ -9787,16 +9882,14 @@ 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
 #, fuzzy
 #| msgid "Attached message"
 msgid "Attribute message."
-msgstr "ææèæ"
+msgstr "åæèæã"
 
 #: ../mail/evolution-mail.schemas.in.h:17
 msgid "Automatic emoticon recognition"
@@ -9843,15 +9936,11 @@ 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
@@ -9859,11 +9948,8 @@ 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"
@@ -9914,9 +10000,7 @@ 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"
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
 msgstr "æåæåååæåçéèéäåæææååéäççéåéääå"
 
 #: ../mail/evolution-mail.schemas.in.h:45
@@ -9924,33 +10008,19 @@ 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."
-msgstr ""
-"æåæååéèéäåæåäèéåéäåèãåææååïåäåæçååéäãå"
-"ææåæèçèåèéçéèéãäèæèçèåèéçæéçéèéïå LDAPïïå"
-"éååèæåæã"
+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
 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."
-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:49
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
+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
@@ -9994,12 +10064,8 @@ 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 éääçåçåçãèåäçèèçåçåçåçäïåèååäéæåç"
-"äæã"
+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 caret mode, so that you can see a cursor when reading mail."
@@ -10026,24 +10092,16 @@ 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."
+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."
+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."
-msgstr ""
-"åçååæéçäèéãmessage_text_part_limitãèåéäæåççååçéäæ"
-"åã"
+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
 msgid "Enable to use a similar message list view settings for all folders"
@@ -10057,20 +10115,14 @@ msgstr "åçæééæèææçèæåäçéäçéäæåæè
 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:73
+#: ../mail/mail-config.ui.h:44
 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 ææã"
+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 "Flush Outbox after filtering"
@@ -10097,809 +10149,629 @@ 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."
+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 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
 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."
+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."
+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."
-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:87
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
+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."
-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: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 \"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."
-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: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 \"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."
+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."
+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."
-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:95
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+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."
-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: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 "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."
+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."
+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"
-msgstr ""
-"åæåç/åçéèæçèåææèèåèçäääçéééäèåååçäãèéäè"
-"åèåç Reply-To: æéæåæçåäéæååèéäèåäçæææå"
+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 sending a "
+#| "private reply to a message which arrived via a mailing list."
+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
 msgid "Last time Empty Junk was run"
 msgstr "äææçååéäçæé"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Trash was run"
 msgstr "äææçåæççæé"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Layout style"
 msgstr "éçæå"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 #: ../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:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of Labels and their associated colors"
 msgstr "æçåçéèåçæå"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME éåæåïææ Bonobo åäæèå"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accepted licenses"
 msgstr "ææçæææå"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accounts"
 msgstr "åèæå"
 
-#: ../mail/evolution-mail.schemas.in.h:109
-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: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 custom headers and whether they are enabled."
 msgstr "èèæéäåååæååççæå"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of dictionary language codes used for spell checking."
 msgstr "çææåææçååèèçæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:112
-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: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 protocol names whose license has been accepted."
 msgstr "åçæååææçååæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Load images for HTML messages over HTTP"
 msgstr "éé HTTP èå HTML éäçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:115
-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: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 "Log filter actions"
 msgstr "èééæååä"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions to the specified log file."
 msgstr "åéæååäèéåæåçèéææã"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions"
 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 "Mail browser height"
 msgstr "éäçèåéå"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser maximized"
 msgstr "éäçèåæåå"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser width"
 msgstr "éäçèååå"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout"
 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 citations in the message \"Preview\""
 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 "Message text limit for display"
 msgstr "éçéäæåéå"
 
 # (pofilter) gconf: do not translate gconf attribute: "normal", "source"
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-"èæéçæå (ãnormalã[äè]ããfull headersã[åææé]ããsourceã[äæ])"
+msgstr "èæéçæå (ãnormalã[äè]ããfull headersã[åææé]ããsourceã[äæ])"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the junk on exit"
 msgstr "çæææçååéäæåééåæ"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the trash on exit"
 msgstr "çæææçåæçæåééåæ"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "çæææçååéäæåééåæã"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "çæææçåæçæåééåæã"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "éçæ TO/CC/BCC ääåçéå"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Original message."
 msgstr "ååéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:135
-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:136
+msgid "Path where image 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 ""
+#| "The following recipients were not recognized as valid mail addresses:\n"
+#| "{0}"
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr "åäçææèåææéääåçæäèååæç"
+
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt on empty subject"
 msgstr "ææäæææç"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "çäçèåèæçèæåæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "çäçèåéææäæçéäæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when deleting messages in search folder"
 msgstr "çåéæåèæåäçéäæéçæç"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "çéäèååæçäåèææç"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when replying privately to list messages"
 msgstr "ççäåèéäèåéäææç"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying to many recipients"
 msgstr "çåèçèåæäèææç"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when user expunges"
 msgstr "äçèæçææç"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user only fills Bcc"
 msgstr "çäçèååååäåæææç"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "çäçèåèäæéå 10 åææåéäææçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:146
-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:149
+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:147
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "çäçèåéäåæäèæåææäèçéäæïæçäçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "çäçèåèåéäæèç HTML ææç"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt while marking multiple messages"
 msgstr "çæèååéäææç"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Put personalized signatures at the top of replies"
 msgstr "ååäåçåæçæåäéç"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put the cursor at the bottom of replies"
 msgstr "åèæåææçæåé"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "èèæåäçèæçèäåäæåçã"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize links in text and replace them."
 msgstr "èèæåäçéçäåäåäã"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Run junk test on incoming mail."
 msgstr "ååéçéäåèååéäææã"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Save directory"
 msgstr "ååçé"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Search for the sender photo in local address books"
 msgstr "åæåçéèéæååäèçç"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Send HTML mail by default"
 msgstr "éèåé HTML éä"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default."
 msgstr "éèåé HTML éäã"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Sender email-address column in the message list"
 msgstr "åéäæåçåäèéåéäæä"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Server synchronization interval"
 msgstr "äæååæéé"
 
-#: ../mail/evolution-mail.schemas.in.h:161
-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:164
+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:162
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "åééäèææéçãåäåæãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "åééäèææéçãåæãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "åèåæèççæéçãåäèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "åèåæèççæéçãåèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "åééäèææéçãåèãæä"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show Animations"
 msgstr "éçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show all message headers"
 msgstr "éçææéäæé"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all the headers when viewing a messages."
 msgstr "æèéäæéçæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show animated images as animations."
 msgstr "ææåçåçã"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "åéäæåäéçåéçéä (åäåéè)"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages in the message-list"
 msgstr "åéäæåäéçåéçéä"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show image animations"
 msgstr "éçåçåç"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show original \"Date\" header value."
 msgstr "éçååçãææãæéæåã"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show photo of the sender"
 msgstr "éçåäèççç"
 
-#: ../mail/evolution-mail.schemas.in.h:176
-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: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:177
-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: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 "åééäèææéçãåæãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:178
-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: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 "åèåæèççæéçãåäèãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:179
-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: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 "åèåæèççæéçãåèãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:180
-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: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 "åééäèææéçãåèãæäãéæåéåéäåèæçæèéåææåã"
 
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "åéäæåçääåéçæäéçåäèçéåéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:182
-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: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 "éçååçãææãæéïèæåäåææäççåæéïãååæéääçèååçæååæåæåéçãææãæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "åéäéèçæäéçåäèçççã"
 
-#: ../mail/evolution-mail.schemas.in.h:184
-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: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: æéïåææçèã"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Spell check inline"
 msgstr "èåæåææ"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell checking color"
 msgstr "æåææéè"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking languages"
 msgstr "æåææèè"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Terminal font"
 msgstr "ççæåå"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "The default plugin for Junk hook"
 msgstr "ååééçéèåæçå"
 
-#: ../mail/evolution-mail.schemas.in.h:190
-msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "äæåèæçååéäçæéïå 1970 åäæäæ(éèçå)åçèçææã"
 
-#: ../mail/evolution-mail.schemas.in.h:191
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "äæåèæååæççæéïå 1970 åäæäæ(éèçå)åçèçææã"
 
-#: ../mail/evolution-mail.schemas.in.h:192
-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: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ãïåçæèïåéèçææåéäæåæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "The terminal font for mail display."
 msgstr "çæéçéäçççæååã"
 
-#: ../mail/evolution-mail.schemas.in.h:194
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid "The text that is inserted when forwarding a message, saying that the forwarded message follows."
 msgstr "åèåéäæèæåçæåïèææääæèåçéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:195
-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:198
+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:196
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
+#: ../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 "ååèéäæèæåçæåïèæéäçåäèã"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "The variable width font for mail display."
 msgstr "çæéçéäçèåååååã"
 
-#: ../mail/evolution-mail.schemas.in.h:198
-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:199
-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:200
-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:201
-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 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 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 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 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 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 option would help in improving the speed of fetching."
-msgstr "éåééèåååéææçéåã"
+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 sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-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:206
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr ""
-"éåèååæåçééäéèçåéæææççæãEvolution åéèéæååã"
+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
-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 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."
+msgstr "éæèååéèéäæåæèäéçäåçéåïèéçéåæéçãâãã"
+
+#: ../mail/evolution-mail.schemas.in.h:209
+#| msgid ""
+#| "This setting specifies whether the threads should be in expanded or "
+#| "collapsed state by default. Evolution requires a restart."
+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."
+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."
+msgstr "éåæååäæçåäïäèèäçççåçèæåïéåèåå ~/Picturesãéåèæåäæåèåæåäååçèæåæäçã"
+
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid "Thread the message-list based on Subject"
 msgstr "ääæçåçäæéäæå"
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Timeout for marking message as seen"
 msgstr "åéäæçæåéèçæé"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Timeout for marking message as seen."
 msgstr "åéäæçæåéèçæéã"
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "UID string of the default account."
 msgstr "éèåèç UID åäã"
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "äçèåæåæææåæéåçåçéèã"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Use SpamAssassin daemon and client"
 msgstr "äç SpamAsssassin äæçåååæç"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../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:215
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "äçèèåå"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts for displaying mail."
 msgstr "äçèèååäéçéäã"
 
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use only local spam tests."
 msgstr "åäçæåååéäæèã"
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid "Use only the local spam tests (no DNS)."
 msgstr "åäçæåååéäæè (ææ DNS)ã"
 
-#: ../mail/evolution-mail.schemas.in.h:219
-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: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:220
-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: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:221
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Variable width font"
 msgstr "èååååå"
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æåéèåæåéäååèäåæçèæ"
 
-#: ../mail/evolution-mail.schemas.in.h:223
-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: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:224
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
+#: ../mail/evolution-mail.schemas.in.h:228
+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:225
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æååçåéåçèæååçççã"
 
-#: ../mail/evolution-mail.schemas.in.h:226
-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: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:227
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æåäéäççäææçéääæåçééä"
 
-#: ../mail/evolution-mail.schemas.in.h:228
-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: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:229
+#: ../mail/evolution-mail.schemas.in.h:233
 msgid "Width of the message-list pane"
 msgstr "éäæåçæåå"
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid "Width of the message-list pane."
 msgstr "éäæåçæçååã"
 
@@ -10907,7 +10779,8 @@ msgstr "éäæåçæçååã"
 msgid "Importing Elm data"
 msgstr "èå Elm èæ"
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
+#: ../mail/importers/elm-importer.c:339
+#: ../mail/importers/pine-importer.c:415
 #: ../modules/mail/e-mail-shell-view.c:1045
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
@@ -10997,7 +10870,8 @@ msgstr "å Pine ååéäã"
 msgid "Mail to %s"
 msgstr "éäéå %s"
 
-#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:233
+#: ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "éääè %s "
@@ -11038,10 +10912,6 @@ msgstr[1] ""
 "%s åçææïåçåååçååååéçèæå\n"
 "ã%sãã"
 
-#: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "åèèè"
-
 #: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "ååæççåæ(_W)â"
@@ -11255,7 +11125,8 @@ msgstr "èå"
 msgid "Inline (Outlook style)"
 msgstr "èåïOutlook éæï"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:61
+#: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æç"
 
@@ -11408,86 +11279,90 @@ msgstr "åéçäåèåéäèå(_P)"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:105
+#| msgid "Sending a message with only _Bcc recipients defined"
+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
 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:107
+#: ../mail/mail-config.ui.h:109
 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:109
+#: ../mail/mail-config.ui.h:111
 msgid "Sending a reply to a large _number of recipients"
 msgstr "åéæåéæäèçéä(_N)"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:112
 msgid "Sent _Messages Folder:"
 msgstr "åééäèæå(_M):"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:113
 msgid "Ser_ver requires authentication"
 msgstr "äæåèæéè(_V)"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:114
 msgid "Server Configuration"
 msgstr "äæåçæ"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
 msgid "Server _Type:"
 msgstr "äæåéå(_T):"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:116
 msgid "Si_gning algorithm:"
 msgstr "ççæçæ(_G):"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Sig_natures"
 msgstr "çåæ(_N)"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 msgid "Sig_ning certificate:"
 msgstr "çåæè(_N):"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:119
 msgid "Signat_ure:"
 msgstr "çåæ(_U):"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:120
 msgid "Signatures"
 msgstr "çåæ"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:121
 msgid "Signing _algorithm:"
 msgstr "ççæçæ(_A):"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 msgid "Special Folders"
 msgstr "çæèæå"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:123
 msgid "Spell Checking"
 msgstr "æåææ"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:124
 msgid "Start _typing at the bottom on replying"
 msgstr "åèæååééåèå(_T)"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:125
 msgid "Start up"
 msgstr "åå"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:127
 msgid "T_ype:"
 msgstr "éå(_Y):"
 
-#: ../mail/mail-config.ui.h:126
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+#: ../mail/mail-config.ui.h:128
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "éèçèèæåååæååçåèååçèèã"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:129
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11497,15 +11372,11 @@ msgstr ""
 "çåæãææåçåçåæäç\n"
 "éçäçã"
 
-#: ../mail/mail-config.ui.h:130
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
-msgstr ""
-"èéåéåéäåçæåæääéåçææïåéèäååæååäæèåäçèäå"
-"åçèï"
+#: ../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:131
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11513,141 +11384,144 @@ msgstr ""
 "èåæçääèéååèçåçã\n"
 "äåïãåäãæãåäã"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:135
 msgid "Us_ername:"
 msgstr "äçèåç(_E):"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:136
 msgid "Use Authe_ntication"
 msgstr "äçéè(_N)"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:137
 msgid "User _Name:"
 msgstr "äçèåç(_N):"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:138
 msgid "_Add Signature"
 msgstr "ååçåæ(_A)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:139
 msgid "_Always load images from the Internet"
 msgstr "äåèçèäèåç(_A)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:140
 msgid "_Authentication Type"
 msgstr "éèéå(_A)"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:141
 msgid "_Default junk plugin:"
 msgstr "éèååéäåæçå(_D):"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:142
 msgid "_Direct connection to the Internet"
 msgstr "çæéçåçéçè(_D)"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:143
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "äççæèéè (çåæ _Outlook)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:144
 msgid "_Forward style:"
 msgstr "èåæå(_F):"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:145
 msgid "_Junk Folder:"
 msgstr "ååéäèæå(_J):"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:146
 msgid "_Keep signature above the original message on replying"
 msgstr "åäæäçååéäççå(_K)"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:147
 msgid "_Languages"
 msgstr "èè(_L)"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:148
 msgid "_Load images only in messages from contacts"
 msgstr "åèåçéçäååéääçåç(_L)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:149
 msgid "_Lookup in local address book only"
 msgstr "ååæåéèéæè(_L)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:150
 msgid "_Make this my default account"
 msgstr "èçæçéèåè(_M)"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:151
 msgid "_Manual proxy configuration:"
 msgstr "æåäçäæåçæ(_M):"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:153
 msgid "_Never load images from the Internet"
 msgstr "äåäèçèäèåç(_N)"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:154
 msgid "_Path:"
 msgstr "èå(_P):"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:155
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "çåé HTML éäçäææåéééäçéçäæéçæç(_P)"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:156
 msgid "_Reply style:"
 msgstr "åèæå(_R):"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:157
 msgid "_Script:"
 msgstr "åäç(_S):"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:158
 msgid "_Secure HTTP Proxy:"
 msgstr "åå HTTP äçäæå(_S):"
 
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:160
+#: ../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:160
+#: ../mail/mail-config.ui.h:162
 msgid "_Show animated images"
 msgstr "ææåçåç(_S)"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:163
 msgid "_Show the photograph of sender in the message preview"
 msgstr "åéäéèéçåäèçç(_S)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:164
 msgid "_Trash Folder:"
 msgstr "åæçèæå(_T):"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:165
 msgid "_Use Secure Connection:"
 msgstr "äçååéç(_U):"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:166
 msgid "_Use system defaults"
 msgstr "äçççéèå(_U)"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:167
 msgid "_Use the same fonts as other applications"
 msgstr "äçèåäæççåçåçåå(_U)"
 
-#: ../mail/mail-config.ui.h:166 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:168
+#: ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:169
+#: ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:170
 msgid "color"
 msgstr "èå"
 
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:171
 msgid "description"
 msgstr "æè"
 
@@ -11770,11 +11644,13 @@ msgstr "æååééä %d / %d"
 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:833
+#: ../mail/mail-send-recv.c:788
 msgid "Canceled."
 msgstr "ååæã"
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:835
+#: ../mail/mail-send-recv.c:790
 msgid "Complete."
 msgstr "åæã"
 
@@ -11905,7 +11781,8 @@ msgstr "åéåæ(_A)"
 msgid "Updating..."
 msgstr "ææäâ"
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:653
 msgid "Waiting..."
 msgstr "æåçåâ"
 
@@ -11956,8 +11833,7 @@ msgstr "ææ '%s' çæåèæå"
 #: ../mail/mail-vfolder.c:709
 #, 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"
@@ -12003,29 +11879,22 @@ 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
@@ -12037,20 +11906,15 @@ 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
@@ -12126,12 +11990,8 @@ 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}\"."
@@ -12159,120 +12019,119 @@ 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."
 msgstr "éééäèçã"
 
 #: ../mail/mail.error.xml.h:44
-msgid "Could not save signature file."
-msgstr "çæååççææã"
-
-#: ../mail/mail.error.xml.h:45
-msgid ""
-"Default local store has been changed from mbox to maildir format. Do you "
-"want to migrate now ?\n"
-"\n"
-"A mbox account will be created to preserve the old mbox folders. You can "
-"delete it after ensuring the data is safely migrated. Please make sure there "
-"is enough space if you choose to migrate."
-msgstr ""
-"éèçæåçååååçå mbox æèç maildir æåãæçåæåèèæï\n"
-"\n"
-"çåæåçäå mbox åèääçèç mbox èæåãæåäåçèèæéååèæå"
-"ååååéãåææéæèæïèçåæèåççéã"
+msgid "Could not save signature file."
+msgstr "çæååççææã"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:45
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "æååéæåèæåã{0}ãäçéäï"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Disable"
 msgstr "äèåç(_N)"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Send"
 msgstr "äèåé(_N)"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:49
 msgid "Do _Not Synchronize"
 msgstr "äèåæ(_N)"
 
-#: ../mail/mail.error.xml.h:53
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
+#: ../mail/mail.error.xml.h:50
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
 msgstr "æåèåæåçåæéäæèçéçäççèæåï"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "æåèååéçéäæçæåéèï"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "èååæåçèæï"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "èååçã"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "èåéæååçæççéèã"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:55
 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:62
+#: ../mail/mail.error.xml.h:59
 msgid "Error while {0}."
 msgstr "ç {0} æççéèã"
 
+#: ../mail/mail.error.xml.h:60
+#| msgid ""
+#| "Default local store has been changed from mbox to maildir format. Do you "
+#| "want to migrate now ?\n"
+#| "\n"
+#| "A mbox account will be created to preserve the old mbox folders. You can "
+#| "delete it after ensuring the data is safely migrated. Please make sure "
+#| "there is enough space if you choose to migrate."
+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"
+"\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."
+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:64
 msgid "Failed to unsubscribe from folder."
 msgstr "çæåæèéèæåã"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "File exists but cannot overwrite it."
 msgstr "ææååäçæèåã"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "File exists but is not a regular file."
 msgstr "ææååääæäèææã"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "èæåã{0}ãäæååääéèçéäã"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "åææéæççïåçæååéäéäã"
 
-#: ../mail/mail.error.xml.h:69
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
+#: ../mail/mail.error.xml.h:70
+msgid "If you delete the folder, all of its contents and its subfolders' contents will be deleted permanently."
 msgstr "åææåéèæåïåçææååååèæåååææéåéã"
 
-#: ../mail/mail.error.xml.h:70
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
+#: ../mail/mail.error.xml.h:71
+msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "åææéæåéèæåïåçææååææéæåã"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "åæççïææçäçäæååèææäåéã"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12280,46 +12139,33 @@ msgstr ""
 "åæççïèåèçèèäå\n"
 "åææçäçäæåææéåéã"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "åæççïåèèèææäåéã"
 
-#: ../mail/mail.error.xml.h:75
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#: ../mail/mail.error.xml.h:76
+msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr "åææéæçæïåæåå Evolution äåïäæåééäéäã"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Ignore"
 msgstr "åç"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Invalid authentication"
 msgstr "çæçéè"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid "Mail Deletion Failed"
 msgstr "åééäåæ"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Mail filters automatically updated."
 msgstr "éäéæåèåææã"
 
-#: ../mail/mail.error.xml.h:80
-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:81
-msgid "Migrate local mbox folders to maildir"
-msgstr "åæåç mbox èæåèæç maildir"
+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
 msgid "Missing folder."
@@ -12350,17 +12196,12 @@ 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 ""
-"èåãæäèïãæäèåäåææçéåéäååãæåäæääèåæåæéç"
-"ãæäèïãæéïæåéåéäååã"
+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
 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"
@@ -12423,27 +12264,18 @@ 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 éèççèæåæèæåäæïèäèèæåäåäéæååãçåæå"
-"éã"
+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
 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
 msgid ""
@@ -12474,20 +12306,15 @@ msgstr ""
 "éèæïèçèæåèæåçèåïäæåæåæååã"
 
 #: ../mail/mail.error.xml.h:121
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+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"
+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."
+msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr "æäæåäæææéèéåèäææäææéèã"
 
 #: ../mail/mail.error.xml.h:124
@@ -12495,9 +12322,7 @@ 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."
+msgid "This will mark all messages as read in the selected folder and its subfolders."
 msgstr "éæåæçéåçèæååååèæåäææéäçåéèã"
 
 #: ../mail/mail.error.xml.h:126
@@ -12509,9 +12334,7 @@ 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?"
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
 msgstr "çæéåæåèçèçèæåãæåäçççèçèæåäæï"
 
 #: ../mail/mail.error.xml.h:129
@@ -12528,8 +12351,7 @@ 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"
+"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"
@@ -12540,27 +12362,15 @@ 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 ""
-"ææäçäåèäèéäèåçéäïäæéåéäèååèåæçåäååèåãæ"
-"çåèççåï"
+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 ""
-"ææååèäèéäèåçéäïäææäçäåèæååçååäèïèéååéä"
-"èåãæçåèççåï"
+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?"
+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
@@ -12590,8 +12400,7 @@ msgstr "æåéæåäåèæåã"
 #: ../mail/mail.error.xml.h:144
 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"
 "ååéåèæåïçå/æéåæææåèæåãææéçèæåæäèçéã"
@@ -12624,26 +12433,36 @@ msgid "_Empty Trash"
 msgstr "æçåæç(_E)"
 
 #: ../mail/mail.error.xml.h:152
+#| msgid "Evolution"
+msgid "_Exit Evolution"
+msgstr "çæ _Evolution "
+
+#: ../mail/mail.error.xml.h:153
 msgid "_Expunge"
 msgstr "æé(_E)"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:154
+#| msgid "Migration"
+msgid "_Migrate Now"
+msgstr "çåèç(_M)"
+
+#: ../mail/mail.error.xml.h:155
 msgid "_No"
 msgstr "å(_N)"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:156
 msgid "_Open Messages"
 msgstr "éåéä(_O)"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:159
 msgid "_Send Receipt"
 msgstr "åéåæ(_S)"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:160
 msgid "_Synchronize"
 msgstr "åæå(_S)"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:161
 msgid "_Yes"
 msgstr "æ(_Y)"
 
@@ -12687,13 +12506,15 @@ msgstr "é"
 msgid "Highest"
 msgstr "æé"
 
-#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1837
+#: ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1844
+#: ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "äå %p %l:%M"
 
@@ -12703,35 +12524,34 @@ msgstr "æå %p %l:%M"
 
 #: ../mail/message-list.c:1865
 msgid "%a %l:%M %p"
-msgstr "%A%p %-l:%M"
+msgstr "%a %p %l:%M"
 
 #: ../mail/message-list.c:1873
 msgid "%b %d %l:%M %p"
-msgstr "%mæ%dæ%p %l:%M"
+msgstr "%b %d %p %l:%M"
 
 #: ../mail/message-list.c:1875
 msgid "%b %d %Y"
-msgstr "%Y/%m/%d"
+msgstr "%Y %b %d"
 
 #: ../mail/message-list.c:2642
 msgid "Select all visible messages"
 msgstr "éæåéåèçéä"
 
-#: ../mail/message-list.c:2800 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2800
+#: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "éä"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4468 ../mail/message-list.c:4892
+#: ../mail/message-list.c:4468
+#: ../mail/message-list.c:4892
 msgid "Generating message list"
 msgstr "ççéäæå"
 
 #: ../mail/message-list.c:4707
-msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
-msgstr ""
-"ææéäçåæçæåæäãåääçãæå->æéãéåéçäæéæåææèåã"
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgstr "ææéäçåæçæåæäãåääçãæå->æéãéåéçäæéæåææèåã"
 
 #: ../mail/message-list.c:4709
 msgid "There are no messages in this folder."
@@ -12800,29 +12620,16 @@ msgid "Subject or Addresses contains"
 msgstr "äææéåéääååå"
 
 #: ../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 SSL."
-msgstr ""
-"éåæééèçïEvolution åæéçåæç LDAP äæå (åææç LDAP äæåæ"
-"æ SSL)ã"
+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:211
-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 TLS."
+msgstr "éåæééèçïEvolution åæéçåæç LDAP äæå (åææç LDAP äæåææ TLS)ã"
 
 #: ../modules/addressbook/addressbook-config.c:213
-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 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:612
 msgid "U_se in Birthday & Anniversaries calendar"
@@ -12833,32 +12640,16 @@ msgid "Copy _book content locally for offline operation"
 msgstr "èèéèéååèæåçæéçäæ(_B)"
 
 #: ../modules/addressbook/addressbook-config.c:756
-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 æåèéçåéååæãåæäææåæåãè"
-"æèæçççççåïçèææèæåçåã"
+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:830
-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 äæåã"
+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:905
-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ã(åä)çæåçååæåæåçåäçäååçã"
+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:1021
 msgid "Server Information"
@@ -12931,25 +12722,15 @@ 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."
+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."
-msgstr ""
-"éçæåæåäåéçäæåäéèçæçäçãã0ãïæææèïåéèçææåé"
-"çäæåäæãã1ãïåçæèïåéèçææåéçäæåæéã"
+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."
+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
@@ -12961,9 +12742,7 @@ 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."
+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
@@ -13237,7 +13016,7 @@ msgstr "ææççèæ"
 #: ../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:1484
-#: ../shell/e-shell-content.c:613
+#: ../shell/e-shell-content.c:616
 msgid "Advanced Search"
 msgstr "ééæå"
 
@@ -13341,12 +13120,8 @@ 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
@@ -13637,8 +13412,7 @@ 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
@@ -13742,9 +13516,7 @@ 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
@@ -13796,18 +13568,12 @@ 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."
@@ -13822,24 +13588,16 @@ 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"
@@ -13922,11 +13680,8 @@ 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"
@@ -13945,66 +13700,40 @@ 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
@@ -14025,12 +13754,8 @@ 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
@@ -14039,10 +13764,8 @@ msgstr "éèæéåäïãminutesã(åé)ããhoursã(åæ)æãda
 
 # (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"
@@ -14077,9 +13800,7 @@ 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
@@ -14087,8 +13808,7 @@ 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
@@ -14124,8 +13844,7 @@ 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
@@ -14244,20 +13963,20 @@ msgstr "åçæèäæ"
 msgid "Calendar and Tasks"
 msgstr "èäæèåä"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:217
+#: ../modules/calendar/e-cal-shell-sidebar.c:213
 msgid "Loading calendars"
 msgstr "æåèåèäæ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:641
+#: ../modules/calendar/e-cal-shell-sidebar.c:634
 msgid "_New Calendar..."
 msgstr "æåèäæ(_N)â"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:658
+#: ../modules/calendar/e-cal-shell-sidebar.c:651
 msgid "Calendar Selector"
 msgstr "èäæéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1001
+#: ../modules/calendar/e-cal-shell-sidebar.c:994
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "éåå %s çèäæ"
@@ -14269,12 +13988,8 @@ 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 ""
-"æäæææäæåéæéåæééèçææääãåææççïåçæååéäääã"
+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"
@@ -14684,16 +14399,16 @@ msgstr "ååéæå(_S)"
 msgid "Create a new memo list"
 msgstr "åçæååéæå"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:225
+#: ../modules/calendar/e-memo-shell-sidebar.c:221
 msgid "Loading memos"
 msgstr "æåèåååé"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:594
+#: ../modules/calendar/e-memo-shell-sidebar.c:587
 msgid "Memo List Selector"
 msgstr "ååéæåéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:899
+#: ../modules/calendar/e-memo-shell-sidebar.c:892
 #, c-format
 msgid "Opening memos at %s"
 msgstr "éåå %s çååé"
@@ -14811,16 +14526,16 @@ msgstr "åäæå(_K)"
 msgid "Create a new task list"
 msgstr "åçæåäæå"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:225
+#: ../modules/calendar/e-task-shell-sidebar.c:221
 msgid "Loading tasks"
 msgstr "æåèååä"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:594
+#: ../modules/calendar/e-task-shell-sidebar.c:587
 msgid "Task List Selector"
 msgstr "åäæåéæå"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:899
+#: ../modules/calendar/e-task-shell-sidebar.c:892
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "éåå %s çåä"
@@ -14832,13 +14547,11 @@ msgstr "åååä"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:569
 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"
 "çåæééäåäï"
 
@@ -15138,7 +14851,8 @@ msgid "Send queued items and retrieve new items"
 msgstr "åéåéçéçäæææçéç"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1210
-msgid "R_eceive all"
+#| msgid "R_eceive all"
+msgid "R_eceive All"
 msgstr "åéææ(_E)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1212
@@ -15146,7 +14860,8 @@ msgid "Receive new items from all accounts"
 msgstr "ææåææåèåçæéç"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1217
-msgid "_Send all"
+#| msgid "_Send all"
+msgid "_Send All"
 msgstr "åéåé(_S)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1219
@@ -15294,68 +15009,68 @@ msgstr "çåçåè"
 msgid "Current Folder"
 msgstr "çåçèæå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1030
+#: ../modules/mail/e-mail-shell-view-private.c:1049
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "åéæ %d åï"
 msgstr[1] "åéæ %d åï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d åååé"
 msgstr[1] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1047
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1073
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ååå"
 msgstr[1] "%d ååå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1079
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d åèç"
 msgstr[1] "%d åèç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d åæåé"
 msgstr[1] "%d åæåé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../modules/mail/e-mail-shell-view-private.c:1091
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d åååé"
 msgstr[1] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1084
+#: ../modules/mail/e-mail-shell-view-private.c:1103
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d åæèï"
 msgstr[1] "%d åæèï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1087
+#: ../modules/mail/e-mail-shell-view-private.c:1106
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å %d å"
 msgstr[1] "å %d å"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1107
+#: ../modules/mail/e-mail-shell-view-private.c:1126
 msgid "Trash"
 msgstr "åæç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1461
+#: ../modules/mail/e-mail-shell-view-private.c:1485
 msgid "Send / Receive"
 msgstr "åé/ææ"
 
@@ -15379,14 +15094,14 @@ msgstr "Evolution åèåç"
 msgid "Account Editor"
 msgstr "åèçèå"
 
-#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/mail/em-composer-prefs.c:502
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "ååç"
 
-#: ../modules/mail/em-composer-prefs.c:499
+#: ../modules/mail/em-composer-prefs.c:506
 msgid "Language(s)"
 msgstr "èè"
 
@@ -15427,16 +15142,17 @@ msgid "Contains Value"
 msgstr "ååæå"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:764
+#: ../modules/mail/em-mailer-prefs.c:693
+#: ../modules/mail/em-mailer-prefs.c:764
 #, 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:773
+#: ../modules/mail/em-mailer-prefs.c:701
+#: ../modules/mail/em-mailer-prefs.c:773
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s åæçååçæäçãèæææåæåèèåäã"
 
 #: ../modules/mail/em-mailer-prefs.c:737
@@ -15457,8 +15173,7 @@ 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:146
@@ -15480,9 +15195,7 @@ 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
@@ -15564,13 +15277,11 @@ msgstr "æèäç"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:493
 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"
 "èæääãääæãæéççã "
 
@@ -15583,9 +15294,7 @@ 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
@@ -15599,9 +15308,7 @@ 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
@@ -15633,15 +15340,18 @@ msgid "Play audio attachments directly in mail messages."
 msgstr "çæææéääçéæéäã"
 
 #: ../plugins/backup-restore/backup-restore.c:183
-msgid "Select name of the Evolution back up file"
+#| msgid "Select name of the Evolution back up file"
+msgid "Select name of the Evolution backup file"
 msgstr "éæ Evolution åäææçåç"
 
 #: ../plugins/backup-restore/backup-restore.c:216
-msgid "_Restart Evolution after back up"
-msgstr "åäåéæåå Evolution (_R)"
+#| msgid "_Restart Evolution after back up"
+msgid "_Restart Evolution after backup"
+msgstr "åäåéæåå Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:242
-msgid "Select name of the Evolution back up file to restore"
+#| msgid "Select name of the Evolution back up file to restore"
+msgid "Select name of the Evolution backup file to restore"
 msgstr "éæèéåç Evolution åäææåç"
 
 #: ../plugins/backup-restore/backup-restore.c:255
@@ -15649,16 +15359,16 @@ msgid "_Restart Evolution after restore"
 msgstr "éååéæåå Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:323
-msgid ""
-"You can restore Evolution from your back up. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
-msgstr ""
-"æåäååääéå Evolutionãååäéåææçéäãèäæãåäãååéãé"
-"çäãåäåäéåæææçåäèåãéäéæåçã"
+#| msgid ""
+#| "You can restore Evolution from your back up. It can restore all the "
+#| "Mails, Calendars, Tasks, Memos, Contacts. It also restores all your "
+#| "personal settings, mail filters etc."
+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
-msgid "_Restore Evolution from the back up file"
+#| msgid "_Restore Evolution from the back up file"
+msgid "_Restore Evolution from the backup file"
 msgstr "ååäææéå Evolution (_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:337
@@ -15670,7 +15380,8 @@ msgid "Choose a file to restore"
 msgstr "éæèéåçææ"
 
 #: ../plugins/backup-restore/backup-restore.c:348
-msgid "Restore from back up"
+#| msgid "Restore from back up"
+msgid "Restore from backup"
 msgstr "ååäææéå"
 
 #: ../plugins/backup-restore/backup-restore.c:386
@@ -15804,8 +15515,7 @@ 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
@@ -15833,25 +15543,15 @@ 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:685
+#: ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "èåååçéçä"
@@ -15891,14 +15591,11 @@ 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 "
-"éçäèèã"
+"åèéäæèååéèéäååååèéåéääåãåæäæåååæåäåå IM éçäèèã"
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
 #, c-format
@@ -15935,9 +15632,7 @@ 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."
+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
@@ -16025,7 +15720,7 @@ msgstr "æåèæåååâ"
 #: ../plugins/caldav/caldav-browse-server.c:1264
 #: ../plugins/caldav/caldav-source.c:255
 msgid "Server _handles meeting invitations"
-msgstr ""
+msgstr "äæåèçæèéè(_H)"
 
 #: ../plugins/caldav/caldav-browse-server.c:1271
 msgid "List of available calendars:"
@@ -16037,10 +15732,9 @@ msgstr "ææ"
 
 #: ../plugins/caldav/caldav-browse-server.c:1336
 #: ../plugins/caldav/caldav-source.c:254
-#, fuzzy
 #| msgid "User _Name:"
 msgid "User e-_mail:"
-msgstr "äçèåç(_N):"
+msgstr "äçè e-_mailï"
 
 #: ../plugins/caldav/caldav-browse-server.c:1408
 #, c-format
@@ -16283,13 +15977,8 @@ 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:319
 msgctxt "email-custom-header-Security"
@@ -16326,17 +16015,17 @@ msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "ææå"
 
-#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/email-custom-header/email-custom-header.c:385
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "ææ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:586
+#: ../plugins/email-custom-header/email-custom-header.c:577
 msgid "_Custom Header"
 msgstr "èèæé(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:845
+#: ../plugins/email-custom-header/email-custom-header.c:836
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16344,11 +16033,11 @@ msgstr ""
 "æåèèæééåçæåï\n"
 "èèæééåçåçèäã;ãééã"
 
-#: ../plugins/email-custom-header/email-custom-header.c:899
+#: ../plugins/email-custom-header/email-custom-header.c:890
 msgid "Key"
 msgstr "èåé"
 
-#: ../plugins/email-custom-header/email-custom-header.c:915
+#: ../plugins/email-custom-header/email-custom-header.c:906
 #: ../plugins/templates/templates.c:417
 msgid "Values"
 msgstr "æå"
@@ -16417,9 +16106,7 @@ 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
@@ -16427,29 +16114,20 @@ 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 png picture (the best 48*48 of size < 720 bytes)"
@@ -16654,9 +16332,7 @@ 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?"
+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
@@ -16707,11 +16383,8 @@ 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; çåäçäæååæãèæææçéåéääåäåèäæã"
+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
@@ -16766,11 +16439,8 @@ 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 ""
-"éæäçæåçæèèçèæåçæçæèãåäéææèåçéåéèéæèåã"
+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
@@ -16990,8 +16660,7 @@ 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"
@@ -17165,9 +16834,7 @@ 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."
+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
@@ -17179,20 +16846,15 @@ 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 ""
-"æéäçååæèäæååïäèååäæååääääãåäæçé/åçèè"
+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
 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"
+msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "èèçéäåéçéçïæèåæææååååååäçèäæ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2460
@@ -17248,7 +16910,7 @@ msgstr "äå %H:%M:%S"
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
-msgstr "äå%p %l:%M:%S"
+msgstr "äå %p %l:%M:%S"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
@@ -17266,13 +16928,13 @@ msgstr "æå %H:%M:%S"
 #. in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
-msgstr "æå%p %-l:%M"
+msgstr "æå %p %l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "æå%p %-l:%M:%S"
+msgstr "æå %p %l:%M:%S"
 
 #. strftime format of a weekday.
 #: ../plugins/itip-formatter/itip-view.c:256
@@ -17296,73 +16958,73 @@ msgstr "%A %H:%M:%S"
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
-msgstr "%a %p %l:%M"
+msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
-msgstr "%A%p %-l:%M:%S"
+msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
 #: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
-msgstr "%-m æ %d æ (%A)"
+msgstr "%B %e (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
-msgstr "%-m æ %d æ (%A) %H:%M"
+msgstr "%B %e (%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%-m æ %d æ (%A) %H:%M:%S"
+msgstr "%B %e (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
-msgstr "%-m æ %d æ (%A) %p %-l:%M"
+msgstr "%B %e (%A) %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%-m æ %d æ (%A) %p %-l:%M:%S"
+msgstr "%B %e (%A) %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
-msgstr "%Y å %-m æ %-d æ (%A)"
+msgstr "%Y, %B %e (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%Y å %-m æ %-d æ (%A) %H:%M"
+msgstr "%Y, %B %e (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%Y å %-m æ %-d æ (%A) %H:%M:%S"
+msgstr "%Y, %B %e (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Y å %-m æ %-d æ (%A) %p %-l:%M"
+msgstr "%Y, %B %e (%A) %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Y å %-m æ %-d æ (%A) %p %-l:%M:%S"
+msgstr "%Y, %B %e (%A) %p %l:%M:%S"
 
 #: ../plugins/itip-formatter/itip-view.c:362
 #: ../plugins/itip-formatter/itip-view.c:363
@@ -17423,9 +17085,7 @@ 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
@@ -17510,15 +17170,12 @@ 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
@@ -17725,8 +17382,7 @@ 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
@@ -17746,9 +17402,7 @@ 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."
+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
@@ -17889,63 +17543,46 @@ msgstr "å %s çéäæåç"
 
 #: ../plugins/mail-to-task/mail-to-task.c:489
 #, 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:492
 #, 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:495
 #, 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:515
-msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+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:521
-msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+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:527
-msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
-msgstr ""
-"éåçååéæååçååæäæåéääçååéãæåèåååçæçååéï"
+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:548
-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?"
+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] "éåçèäæåçååæåéääçääãæåèåååçæçääï"
 
@@ -17953,12 +17590,8 @@ msgstr[1] "éåçèäæåçååæåéääçääãæåèå
 #. 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:557
-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?"
+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] "éåçåäæååçååæåéääçåäãæåèåååçæçåäï"
 
@@ -17966,16 +17599,10 @@ msgstr[1] "éåçåäæååçååæåéääçåäãæåè
 #. 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:566
-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] ""
-"éåçååéæååçååæåéääçååéãæåèåååçæçååéï"
+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:625
 msgid "[No Summary]"
@@ -17996,21 +17623,15 @@ msgid "Cannot open calendar. %s"
 msgstr "çæéåèäæã%s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:743
-msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
+msgid "Selected source is read only, thus cannot create event there. Select other source, please."
 msgstr "éåçäææåèçïåæäèåéèåçääãèéæåäçäæã"
 
 #: ../plugins/mail-to-task/mail-to-task.c:746
-msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+msgid "Selected source is read only, thus cannot create task there. Select other source, please."
 msgstr "éåçäææåèçïåæäèåéèåçåäãèéæåäçäæã"
 
 #: ../plugins/mail-to-task/mail-to-task.c:749
-msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
+msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
 msgstr "éåçäææåèçïåæäèåéèåçååéãèéæåäçäæã"
 
 #: ../plugins/mail-to-task/mail-to-task.c:955
@@ -18120,14 +17741,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"
+"ååååäåéåéäè URL \"{0}\"ãæåäèåéåéäïææåæçäåäæèã\n"
 "\n"
 "åéåéäéååääææèææåäèéäèåçåæã"
 
@@ -18144,12 +17762,8 @@ 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?"
@@ -18157,8 +17771,7 @@ 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 ""
@@ -18177,9 +17790,7 @@ 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
@@ -18190,27 +17801,23 @@ msgstr "çèéä(_E)"
 msgid "_Send message"
 msgstr "åééä(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:45
 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 ""
-"æèåçåçèæåäçéäåéèïææååçåçèæååååèæåäææé"
-"äã"
+#: ../plugins/mark-all-read/mark-all-read.c:47
+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:196
+#: ../plugins/mark-all-read/mark-all-read.c:199
 msgid "In Current Folder and _Subfolders"
 msgstr "æçåçèæååååèæå(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:210
+#: ../plugins/mark-all-read/mark-all-read.c:213
 msgid "In Current _Folder Only"
 msgstr "æçåçèæå(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:447
+#: ../plugins/mark-all-read/mark-all-read.c:450
 msgid "Mark Me_ssages as Read"
 msgstr "æçéäçåè(_S)"
 
@@ -18248,9 +17855,7 @@ msgid "Show plain text if present"
 msgstr "åæäçæååéçå"
 
 #: ../plugins/prefer-plain/prefer-plain.c:226
-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:227
@@ -18258,9 +17863,7 @@ msgid "Only ever show plain text"
 msgstr "åäçæåéç"
 
 #: ../plugins/prefer-plain/prefer-plain.c:227
-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:274
@@ -18310,7 +17913,8 @@ msgid "A_ppointments"
 msgstr "çæ(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:342 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:342
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "åä(_T)"
 
@@ -18668,24 +18272,22 @@ 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 "åæèçççæåæçå"
 
-#: ../plugins/templates/templates.c:631
+#: ../plugins/templates/templates.c:637
 msgid "No Title"
 msgstr "æææé"
 
-#: ../plugins/templates/templates.c:741
+#: ../plugins/templates/templates.c:748
 msgid "Save as _Template"
 msgstr "ååççæ(_T)"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:750
 msgid "Save as Template"
 msgstr "ååççæ"
 
@@ -18790,8 +18392,7 @@ 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
@@ -18819,15 +18420,8 @@ 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"
@@ -18842,9 +18436,7 @@ 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
@@ -18852,8 +18444,7 @@ 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
@@ -18885,15 +18476,8 @@ 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"
@@ -18903,7 +18487,8 @@ 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:371
 msgid "Start in offline mode"
 msgstr "äéçæååå"
 
@@ -18912,11 +18497,8 @@ 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."
@@ -18939,12 +18521,8 @@ 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."
@@ -18959,50 +18537,25 @@ 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"
@@ -19042,8 +18595,7 @@ 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
@@ -19058,11 +18610,12 @@ msgstr "èçæééæ"
 msgid "Window buttons are visible"
 msgstr "èçæéæåèç"
 
-#: ../shell/e-shell-content.c:674 ../shell/e-shell-content.c:675
+#: ../shell/e-shell-content.c:677
+#: ../shell/e-shell-content.c:678
 msgid "Searches"
 msgstr "æå"
 
-#: ../shell/e-shell-content.c:717
+#: ../shell/e-shell-content.c:720
 msgid "Save Search"
 msgstr "ååæåçæ"
 
@@ -19395,15 +18948,15 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "æå"
 
-#: ../shell/e-shell.c:247
+#: ../shell/e-shell.c:261
 msgid "Preparing to go offline..."
 msgstr "æåéåéçâ"
 
-#: ../shell/e-shell.c:300
+#: ../shell/e-shell.c:314
 msgid "Preparing to go online..."
 msgstr "æåéåäçâ"
 
-#: ../shell/e-shell.c:362
+#: ../shell/e-shell.c:376
 msgid "Preparing to quit..."
 msgstr "æåçæâ"
 
@@ -19457,10 +19010,8 @@ msgstr "äèåéçéåèæ"
 
 #. Translators: Do NOT translate the five component names, they MUST remain in English!
 #: ../shell/main.c:367
-msgid ""
-"Start Evolution showing the specified component. Available options are "
-"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
-msgstr ""
+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
 msgid "Apply the given geometry to the main window"
@@ -19503,7 +19054,8 @@ msgstr "åæåç URI æææåçååçæääçåæã"
 msgid "Request a running Evolution process to quit"
 msgstr "èæåèäç Evolution çåçæ"
 
-#: ../shell/main.c:557 ../shell/main.c:565
+#: ../shell/main.c:557
+#: ../shell/main.c:565
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM èéäåæç"
 
@@ -19538,20 +19090,12 @@ 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"
@@ -19569,8 +19113,7 @@ 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"
@@ -19669,22 +19212,12 @@ 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 ""
-"åçæäääçåææèçæèåäïæäééåææçïååæåäääææèçæ"
-"ææã"
+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
@@ -19717,7 +19250,8 @@ msgstr "æèåç"
 msgid "Purposes"
 msgstr "çé"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:370
+#: ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "åè"
@@ -19801,14 +19335,11 @@ 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:1086
 msgid "Certificate"
 msgstr "æè"
 
@@ -19896,11 +19427,13 @@ msgstr "ççåä (OU)"
 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 äæåæè"
 
@@ -19933,8 +19466,7 @@ 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
@@ -19958,7 +19490,8 @@ 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"
 
@@ -20052,11 +19585,13 @@ 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 "çäççè"
 
@@ -20100,7 +19635,8 @@ 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 "äéè"
 
@@ -20119,7 +19655,8 @@ msgstr "åä"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "æèççæçæ"
 
@@ -20159,7 +19696,8 @@ 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)"
 
@@ -20246,8 +19784,7 @@ 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"
@@ -20352,12 +19889,12 @@ msgstr "åéè(_S)â"
 msgid "Send the selected attachments somewhere"
 msgstr "åééåçéäååè"
 
-#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-icon-view.c:162
 #: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Loading"
 msgstr "èåä"
 
-#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-icon-view.c:174
 #: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Saving"
 msgstr "ååä"
@@ -20387,7 +19924,8 @@ msgstr[1] "ååéä"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:616
-#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
+#: ../widgets/misc/e-attachment.c:1786
+#: ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -20433,11 +19971,13 @@ msgstr "å %s äéåéåéä"
 msgid "Attached message"
 msgstr "éåçéä"
 
-#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
+#: ../widgets/misc/e-attachment.c:1829
+#: ../widgets/misc/e-attachment.c:2630
 msgid "A load operation is already in progress"
 msgstr "èåæäååéèä"
 
-#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
+#: ../widgets/misc/e-attachment.c:1837
+#: ../widgets/misc/e-attachment.c:2638
 msgid "A save operation is already in progress"
 msgstr "ååæäååéèä"
 
@@ -20533,7 +20073,8 @@ msgstr "ææ(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1698 ../widgets/misc/e-dateedit.c:1930
+#: ../widgets/misc/e-dateedit.c:1698
+#: ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "ææ"
@@ -20547,9 +20088,7 @@ msgid "Invalid Time Value"
 msgstr "çæçæåæå"
 
 #: ../widgets/misc/e-import-assistant.c:252
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
+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:269
@@ -20583,13 +20122,8 @@ msgid "Import a _single file"
 msgstr "åååäææ(_S)"
 
 #: ../widgets/misc/e-import-assistant.c:529
-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ãæäååäèåçèååãåæææåèäæïèæääãååãæéã"
+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:769
@@ -20625,8 +20159,7 @@ msgstr "èåäç"
 #: ../widgets/misc/e-import-assistant.c:1298
 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ã"
@@ -20647,17 +20180,13 @@ msgstr "éåææ"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æãåçãéååææååå Evolutionã"
 
-#: ../widgets/misc/e-map.c:752
+#: ../widgets/misc/e-map.c:690
 msgid "World Map"
 msgstr "äçåå"
 
-#: ../widgets/misc/e-map.c:754
-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:692
+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:27
@@ -20931,11 +20460,13 @@ msgstr "åçéçèåäéåæéç"
 msgid "_Copy Email Address"
 msgstr "èèéåéääå(_C)"
 
-#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
+#: ../widgets/misc/e-web-view.c:422
+#: ../widgets/misc/e-web-view.c:1077
 msgid "Select all text and images"
 msgstr "éææææåååç"
 
-#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:854
+#: ../widgets/misc/e-web-view.c:856
 #: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to call %s"
@@ -20953,7 +20484,7 @@ msgstr "æäääéå %s"
 #: ../widgets/misc/ea-calendar-item.c:299
 #: ../widgets/misc/ea-calendar-item.c:308
 msgid "%d %B %Y"
-msgstr "%Y å %-m æ %-d æ"
+msgstr "%Y %B %d"
 
 #: ../widgets/misc/ea-calendar-item.c:311
 #, c-format
@@ -20997,11 +20528,13 @@ msgstr "æååéæç 0 å 100 çæå"
 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:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(éå)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(éæ)"
 
@@ -21104,7 +20637,7 @@ msgstr "æå(_S)â"
 msgid "Add a Column"
 msgstr "ååäæ"
 
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../widgets/table/e-table-field-chooser.c:154
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -21228,14 +20761,20 @@ msgstr "åæ"
 msgid "sort"
 msgstr "æå"
 
-#: ../widgets/text/e-text.c:2289
+#: ../widgets/text/e-text.c:2281
 msgid "Select All"
 msgstr "åééå"
 
-#: ../widgets/text/e-text.c:2301
+#: ../widgets/text/e-text.c:2293
 msgid "Input Methods"
 msgstr "èåæ"
 
+#~ msgid "Account Management"
+#~ msgstr "åèçç"
+
+#~ msgid "Migrate local mbox folders to maildir"
+#~ msgstr "åæåç mbox èæåèæç maildir"
+
 #~ msgid "Start Evolution activating the specified component"
 #~ msgstr "åå Evolution æååæåçåä"
 
@@ -21276,16 +20815,19 @@ msgstr "èåæ"
 #~ 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 éæ"
@@ -21300,16 +20842,19 @@ msgstr "èåæ"
 #~ 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 æ"



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