[evolution/wip/gsettings] Updated Arabic translation



commit 1976c750475c390fb76382e7dcc9bf0d741f3960
Author: Abderrahim Kitouni <a kitouni gmail com>
Date:   Thu Sep 22 18:16:29 2011 +0100

    Updated Arabic translation

 po/ar.po |11066 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 5596 insertions(+), 5470 deletions(-)
---
diff --git a/po/ar.po b/po/ar.po
index c394bcd..4f07e01 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12,22 +12,22 @@
 # Usama Akkad <uak aya sy>, 2008.
 # Osama Khalid <OsamaK WFM gmail com>, 2008.
 # Abderrahim Kitouni <a kitouni gmail com>, 2011.
-#: ../shell/main.c:628
+#: ../shell/main.c:570
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 17:13+0200\n"
-"PO-Revision-Date: 2011-03-23 21:56+0100\n"
+"POT-Creation-Date: 2011-09-14 10:51+0100\n"
+"PO-Revision-Date: 2011-09-22 18:15+0100\n"
 "Last-Translator: Abderrahim Kitouni <a kitouni gmail com>\n"
 "Language-Team: Arabic <doc arabeyes org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
+"Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.0\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -47,22 +47,35 @@ msgstr ""
 "ØÙ ØØÙØ"
 
 #: ../addressbook/addressbook.error.xml.h:4
+#, fuzzy
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"ØÙØØÙ ØÙ ØÙØÙÙØÙ ØÙØØÙØÙ ÙÙØØ ØÙÙØØØØÙ ÙÙØÙØ ÙØØÙÙØ\n"
+"ÙÙ ÙØØ ØÙÙØÙÙØ.  ÙÙ ØÙØÙ ØØØÙØÙ ØÙÙ ÙÙ ØØÙØ"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "ØÙØÙÙØÙ '{0}' ÙÙØÙØ ØØÙÙØÙ."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "ÙØ ÙÙÙÙ ØØØÙØ ÙØØØØÙ ØØÙØ"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "ÙØ ÙÙÙÙ ÙÙÙ ØÙÙØØØØÙ."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "ÙØØÙØ ØÙÙØØØ ØÙØ ÙØÙÙÙØ."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -71,15 +84,15 @@ msgstr ""
 "ØØÙØ ÙÙ ÙØØØ ÙÙÙØ ØÙØØ ØØÙÙ ØØÙØ ÙØÙÙ ØØØØØÙ ØØÙÙØ ÙÙÙØ ÙØØÙÙØ. ØØÙØ ØÙ ÙØÙØ "
 "ÙÙ ÙÙÙØØ ØÙØØ ØØØØØ ÙØØÙØ ØÙØØØÙØ ÙØ ÙÙÙÙ ØØ caps lock ÙÙØÙØ."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "ÙÙ ØØØØØ ØÙØ ÙØÙÙÙØØ ØÙÙØØØ ÙÙ ØØØÙÙ LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "ØØØØ ØØØÙØ ØÙØØ ØÙØÙØÙÙÙ."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 #, fuzzy
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
@@ -90,51 +103,62 @@ msgstr ""
 "ØØØØØÙ ØÙÙÙ ØØÙØ GroupWise ØØØ ÙØØ ÙØØØØØ ÙÙØØÙÙ ØÙÙ ÙØØØØÙÙ GroupWise "
 "ØÙÙØÙØØÙÙ ÙÙØÙØØØ ÙØØØØÙÙ GroupWise ØÙØØØÙÙÙ."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "ØØÙ ØÙØØ ØÙØÙØÙÙÙ '{0}'Ø"
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "_ÙØ ØØØÙ"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "ØØØ ØÙØ ØÙØ {0} Ù {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "ÙØÙ ØÙØÙÙØÙÙ ÙØ ØØØÙÙ LDAP."
 
-#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "ÙØÙ ØØÙ ØÙÙØÙØØÙ"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "ØÙØØØ ØÙØØ ØÙØÙÙÙ GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "ÙÙ ÙØØØØ ØØØÙÙ LDAP ØÙØÙÙÙØØ ÙØØÙØ ØÙÙÙØ."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
 msgstr "ÙØ ÙØ ØØÙÙ ØØØ ØÙÙÙÙØØØ ØÙØØ ÙØ ØØØÙÙÙ ØÙØØÙÙ"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "ØÙÙÙÙ ØÙØØ ØÙØÙÙÙ ØÙÙÙÙÙÙØÙÙ ØØÙÙ ÙÙ ÙÙÙ ÙÙ ØÙØØØØÙ."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "ÙÙØ ØØØØØ ØÙØØ ÙØÙØØ. ØØØØØ ØØØØÙÙÙØ ÙØØØÙÙÙØØ"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -143,15 +167,15 @@ msgstr ""
 "ØØÙØ ÙØØØØÙ ØØØÙÙ LDAP ÙØØ ÙØØØ ÙØÙÙØ ÙÙ LDAP ÙØ ØØØÙ ÙØÙ ØÙØØØÙØ ØÙ ØÙ "
 "ØØØØØÙØ ØØÙÙ ØÙØ. ØØÙØ ÙÙ ÙØÙØ ÙØØÙÙ ÙÙØØØ ØØØ ÙØØÙÙØ."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "ÙØ ÙÙÙÙ ÙØØ ØÙØØ ØÙØÙØÙÙÙ ÙØØ."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr "ÙØ ÙÙÙÙ ØØØÙÙ ØÙØØ ØÙØÙØÙÙÙ ÙØØ ØÙ ÙÙØØØ ØØØ ÙÙØØØØ."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -159,31 +183,31 @@ msgstr ""
 "ØØØÙÙ ØÙØØ ØÙØÙØÙÙÙ ÙØØ ÙØ ÙÙÙÙ ÙÙ ØÙØ ØÙÙÙÙÙ ØÙÙØÙÙ ØÙÙÙ ØÙ ÙÙØÙ ØØØ ÙÙ "
 "ØÙØØØ ØØÙ ØÙØØØÙÙ ØÙ ØÙ ØØØØÙÙ ØÙØØÙÙ ÙØ ÙØÙÙ."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "ØÙØØÙ ØÙØØ ØÙØÙØÙÙÙ ÙØØ ÙÙØØØ."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "ÙØ ÙØØÙ ÙØØ ØÙØØØÙÙ ÙØÙÙÙØØ ÙØØÙØ LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "ÙÙ ÙÙÙÙ ÙØØ ØÙØØ ØÙØÙØÙÙÙ"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "ÙØ ÙÙÙÙ ØØØÙØ ØÙØØØ."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "ÙØ ÙÙÙÙ ØÙØ {0}."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "ØØØØØ ÙÙ ØÙØ ØØÙÙØØØÙØ"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -191,7 +215,7 @@ msgstr ""
 "ØØØÙÙ ÙÙÙ ÙØØØØÙ ÙÙ ØÙØØ ØÙØÙÙÙ ÙØØØØ ÙÙÙ ÙØ ÙÙÙÙ ØØÙÙ ÙÙ ØÙÙØØØ. ØØØØØ ÙÙ "
 "ØÙØ ÙØØØ ÙÙÙ ØØÙØ ØÙ ÙØØØ"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:38
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -200,48 +224,55 @@ msgstr ""
 "ØØØÙÙ ØÙØØØØÙ ØØØØÙÙ GroupWise ØÙØ ÙØØÙÙ ÙÙØ ØÙØØÙ ØØØ ØÙÙØØÙÙ ÙÙ ØØØØØØÙ "
 "ØÙÙÙÙÙÙØÙÙ. ÙØØØÙ ØÙÙ ØÙØÙ ØÙÙØØØØ ÙÙØÙ ØØÙÙØ ØÙØØØØ ÙÙØØØ ÙØØÙÙØ."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:39
+#, fuzzy
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"ØÙØØÙ ØÙ ØÙØÙÙØÙ ØÙØØÙØÙ ÙÙØØ ØÙÙØØØØÙ ÙÙØÙØ ÙØØÙÙØ\n"
+"ÙÙ ÙØØ ØÙÙØÙÙØ.  ÙÙ ØÙØÙ ØØØÙØÙ ØÙÙ ÙÙ ØØÙØ"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ÙÙØØ ÙØÙÙ ØØØØÙØ ÙØØÙ ØÙÙØØØØÙÙÙ ÙÙ ØÙØØ ØÙØÙØÙÙÙ ÙØØ."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "ÙÙØ ÙÙØ ØØØØÙÙØØ ØÙÙ ÙØØ ØÙÙØØØØÙ. ØØØØØ ÙÙ ØÙØ ØÙØØØÙÙØØØ"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:43
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ØØØØÙØØÙ ÙØ {0} ÙÙ ØØÙÙØ ØÙØ ØØØ ØØØØØ ØØØÙÙ ØÙÙÙÙÙÙØÙÙ."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:610
-#: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "Ø_ØÙ"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "Ø_ØØÙÙ"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "_ÙØ ØØÙØ"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "_ØÙÙÙØ ØÙØØÙ"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "ØØØ_ØØÙÙ ÙÙØ ÙÙ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
-#: ../calendar/gui/e-calendar-view.c:2078
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../calendar/gui/e-calendar-view.c:2104
 msgid "Anniversary"
 msgstr "ØÙØÙØÙ ØÙØÙÙÙÙØ"
 
@@ -251,9 +282,9 @@ msgstr "ØÙØÙØÙ ØÙØÙÙÙÙØ"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:85
-#: ../shell/main.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../calendar/gui/e-calendar-view.c:2103 ../capplet/anjal-settings-main.c:79
+#: ../shell/main.c:140
 msgid "Birthday"
 msgstr "ØÙØ ØÙÙÙÙØØ"
 
@@ -264,7 +295,7 @@ msgid "Blog:"
 msgstr "ÙØÙÙÙØ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "ØÙ_ÙØØØ..."
@@ -275,24 +306,24 @@ msgid "Calendar:"
 msgstr "ØÙØÙÙÙÙ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:950
+#: ../addressbook/importers/evolution-vcard-importer.c:991
 msgid "Contact"
 msgstr "ØÙÙØØØØÙ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:623
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2925
 msgid "Contact Editor"
 msgstr "ÙØØÙØ ØÙÙØØØØÙÙÙ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:386
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:502
-#: ../addressbook/gui/widgets/eab-contact-display.c:844
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:1019
+#: ../smime/lib/e-cert.c:837
 msgid "Email"
 msgstr "ØÙØØÙØ ØÙØÙÙØØÙÙÙ"
 
@@ -305,8 +336,10 @@ msgid "Full _Name..."
 msgstr "ØÙØ_ØÙ ØÙÙØÙÙ..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+#: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "ØÙÙÙØÙ"
 
@@ -340,18 +373,14 @@ msgid "Nic_kname:"
 msgstr "ØÙØØÙ ØÙ_ÙØØØØØ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:429
-#: ../plugins/groupwise-features/camel-gw-listener.c:454
-#: ../plugins/groupwise-features/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "ÙÙØØØØØ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
-#: ../calendar/gui/e-calendar-view.c:1783
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:409
+#: ../calendar/gui/e-calendar-view.c:1806
 msgid "Other"
 msgstr "ØÙØØÙ"
 
@@ -376,9 +405,11 @@ msgid "Web addresses"
 msgstr "ØÙØÙÙÙ ØÙÙØ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:67
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:1320
+#: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "ØÙØÙÙ"
 
@@ -403,9 +434,9 @@ msgid "_Blog:"
 msgstr "ØÙÙ_ØÙÙÙØ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:881
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/itip-formatter/itip-view.c:1922
+#: ../calendar/gui/dialogs/event-page.c:710
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../plugins/itip-formatter/itip-view.c:1963
 msgid "_Calendar:"
 msgstr "ØÙ_ØÙÙÙÙ:"
 
@@ -483,74 +514,74 @@ msgstr "Ø_ÙÙ:"
 msgid "_Zip/Postal Code:"
 msgstr "ØÙ_ØÙØ ØÙØØÙØÙ:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Jabber"
 msgstr "ØØØØ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "Yahoo"
 msgstr "ÙØÙÙ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
 msgid "Gadu-Gadu"
 msgstr "ØØØÙ-ØØØÙ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "ICQ"
 msgstr "ÙØØØÙ ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:523
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
 msgid "Skype"
 msgstr "ØÙÙØÙ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:381
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:469
 msgid "Error adding contact"
 msgstr "ØØØ ØØÙØØ ØØØÙØ ØÙÙØØØØÙ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "ØØØ ØØÙØØ ØØÙÙØ ØÙÙØØØØÙ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "ØØØ ØØÙØØ ØØØÙØ ØÙÙØØØØÙ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:638
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2649
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ÙØØÙØ ØÙÙØØØØÙÙÙ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
 msgid "Please select an image for this contact"
 msgstr "ØØØØ ØØØØ ØÙØØ ÙÙØØ ØÙÙØØØØÙ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
 msgid "_No image"
 msgstr "_ÙØ ØÙØØ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -558,43 +589,43 @@ msgstr ""
 "ØÙØÙØØ ØÙÙØØØØÙ ØÙØ ØØÙØØ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3356
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "ØÙØÙÙ '%s' ØÙØ ØØÙØ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3363
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "ØÙØÙÙ %s'%s' ØÙØ ØØÙØ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3378
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3389
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ÙØØØ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3404
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
 msgid "Invalid contact."
 msgstr "ÙØØØØÙ ØÙØ ØØÙØ."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:392
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
 msgid "Contact Quick-Add"
 msgstr "ØØØÙØ ØØÙØØ ÙÙØØØØÙ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:395
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
 msgid "_Edit Full"
 msgstr "_ØØÙÙØ ÙØÙÙØ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:443
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
 msgid "_Full name"
 msgstr "ØÙØ_ØÙ ØÙÙØÙÙ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
 msgid "E_mail"
 msgstr "ØØÙØ ØÙ_ÙØØÙÙÙ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:465
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
 msgid "_Select Address Book"
 msgstr "Ø_ØØØ ØÙØØ ØÙØÙÙÙ"
 
@@ -664,7 +695,7 @@ msgid "_Suffix:"
 msgstr "ØÙ_ÙÙØØÙØ:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:652
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
 msgid "Contact List Editor"
 msgstr "ÙØØÙØ ÙØØÙØ ØÙÙØØØØÙÙÙ"
 
@@ -681,7 +712,7 @@ msgid "_List name:"
 msgstr "ØØÙ ØÙ_ÙØØÙØ:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "ØÙØ_Ù..."
 
@@ -689,27 +720,26 @@ msgstr "ØÙØ_Ù..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "ØØØÙÙ ØÙÙØÙÙØ ØØÙØÙÙØ ØÙ ØØØØ ÙØØØØÙÙØ ØÙÙ ØÙÙÙØØØØ ØØÙØÙ:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
 msgid "Contact List Members"
 msgstr "ØØØØØ ÙØØÙØ ØÙÙØØØØÙÙÙ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1316
-msgid "_Members"
-msgstr "ØÙØ_ØØØØ"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1153
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
 msgid "Error adding list"
 msgstr "ØØØ ØØÙØØ ØØØÙØ ØÙÙØØÙØ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
 msgid "Error modifying list"
 msgstr "ØØØ ØØÙØØ ØØÙÙØ ØÙÙØØÙØ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
 msgid "Error removing list"
 msgstr "ØØØ ØØÙØØ ØØØÙØ ØÙÙØØÙØ"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
+msgid "_Members"
+msgstr "ØÙØ_ØØØØ"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "ØÙÙØØØØÙ ØÙÙØÙÙÙØ:"
@@ -725,9 +755,10 @@ msgid "Duplicate Contact Detected"
 msgstr "ØÙØÙØÙÙ ÙØØØØÙ ÙØÙØØ"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#, fuzzy
 msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
 msgstr ""
 "ØÙØØÙ ØÙ ØÙØÙÙØÙ ØÙØØÙØÙ ÙÙØØ ØÙÙØØØØÙ ÙÙØÙØ ÙØØÙÙØ\n"
 "ÙÙ ÙØØ ØÙÙØÙÙØ.  ÙÙ ØÙØÙ ØØØÙØÙ ØÙÙ ÙÙ ØØÙØ"
@@ -749,45 +780,39 @@ msgstr ""
 "ÙÙ ÙØØ ØÙÙØÙÙØ.  ÙÙ ØÙØÙ ØØØÙØÙ ØÙÙ ÙÙ ØØÙØ"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:332
 msgid "_Merge"
 msgstr "Ø_ØÙØ"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
-#: ../calendar/gui/tasktypes.xml.h:7
-#, c-format
-msgid "Cancelled"
-msgstr "ÙÙØÙ"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:315
 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/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1693
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Any field contains"
 msgstr "ØÙ ØÙÙ ÙØÙÙ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Email begins with"
 msgstr "ÙØØØ ØÙØØÙØ ØÙØÙÙØØÙÙÙ ØÙ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Name contains"
 msgstr "ØÙØØÙ ÙØÙÙ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:145
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "ÙØ ÙØØØØÙÙÙ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -798,15 +823,15 @@ msgstr[3] "%d ÙØØØØÙÙÙ"
 msgstr[4] "%d ÙØØØØÙÙØ"
 msgstr[5] "%d ÙØØØØÙ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:342
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
 msgid "Error getting book view"
 msgstr "ØØØ ØØÙØØ ØÙØØÙÙ ØÙÙ ÙØÙØ ØÙØÙØØ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:756
+#: ../addressbook/gui/widgets/e-addressbook-model.c:771
 msgid "Search Interrupted"
 msgstr "ÙÙØØ ØÙØØØ"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
 msgid "Error modifying card"
 msgstr "ØØØ ØÙØ ØØØÙÙ ØÙØØØÙØ"
 
@@ -823,7 +848,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "ØÙØÙ ÙØØØØÙÙÙ ÙÙ ØÙØØÙØØ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
 msgstr "ØØÙ ØÙÙØØØØÙÙÙ ØÙÙÙØÙÙÙÙÙ"
 
@@ -832,34 +857,34 @@ msgstr "ØØÙ ØÙÙØØØØÙÙÙ ØÙÙÙØÙÙÙÙÙ"
 msgid "Select all visible contacts"
 msgstr "ØÙØÙ ØÙÙØ ØÙÙØØØØÙÙÙ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "ØÙØØÙÙØ ØÙÙÙ ØØÙØ ØØÙ ÙÙØØÙ ØÙÙØØØØÙÙÙ ÙØÙØ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 msgid "Are you sure you want to delete this contact list?"
 msgstr "ØÙØØÙÙØ ØÙÙÙ ØØÙØ ØØÙ ÙØØÙØ ØÙÙØØØØÙÙÙ ÙØÙØ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+#, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr "ØÙØØÙÙØ ØÙÙÙ ØØÙØ ØØÙ ÙØØÙØ ØÙÙØØØØÙÙÙ (%s)Ø"
+msgstr "ØÙØØÙÙØ ØÙÙÙ ØØÙØ ØØÙ ÙØØÙØ ØÙÙØØØØÙÙÙ ÙØÙ (%s)Ø"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
 msgid "Are you sure you want to delete these contacts?"
 msgstr "ØÙØØÙÙØ ØÙÙÙ ØØÙØ ØØÙ ÙØÙØØ ØÙÙØØØØÙÙÙØ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
 msgid "Are you sure you want to delete this contact?"
 msgstr "ØÙØØÙÙØ ØÙÙÙ ØØÙØ ØØÙ ÙØØ ØÙÙØØØØÙØ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
+#, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
-msgstr "ØÙØØÙÙØ ØÙÙÙ ØØÙØ ØØÙ ØÙÙØØØØÙ (%s)Ø"
+msgstr "ØÙØØÙÙØ ØÙÙÙ ØØÙØ ØØÙ ÙØØ ØÙÙØØØØÙ (%s)Ø"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -880,16 +905,16 @@ msgstr[5] ""
 "ÙØØ %d ÙØØØØÙ ØÙÙØØ ØÙØÙØ %d ÙØÙØØ ØØÙØØ.\n"
 "ÙÙ ØØÙØ ÙØÙÙØ ØØÙØØ ÙÙ ÙØÙØØ ØÙÙØØØØÙÙÙØ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
 msgid "_Don't Display"
 msgstr "_ÙØ ØØØØ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 msgid "Display _All Contacts"
 msgstr "ØØØØ _ÙÙ ØÙÙØØØØÙÙÙ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
 msgid "Assistant"
 msgstr "ØÙÙØØØØ"
 
@@ -918,7 +943,7 @@ msgid "Car Phone"
 msgstr "ÙØØÙ ØÙØÙÙØØØ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -926,7 +951,7 @@ msgid "Categories"
 msgstr "ØÙÙØØØ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Company"
 msgstr "ØÙØØÙØ"
 
@@ -975,22 +1000,22 @@ msgid "Journal"
 msgstr "ØÙØØÙ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
 msgid "Manager"
 msgstr "ØÙÙØÙØ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:712
 msgid "Mobile Phone"
 msgstr "ØÙÙØØÙ ØÙØÙØÙ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:509
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Nickname"
 msgstr "ØÙØØÙ ØÙÙØØØØØ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:739
 msgid "Note"
 msgstr "ÙÙØØØØ"
 
@@ -1019,13 +1044,13 @@ msgid "Radio"
 msgstr "ØÙÙØÙØØ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:571
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "ØÙØÙÙØ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
 msgid "Spouse"
 msgstr "ØÙØÙÙØ"
 
@@ -1055,7 +1080,7 @@ msgstr "ØÙÙØØØ"
 msgid "Web Site"
 msgstr "ÙÙÙØ ØÙÙÙØ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1065,7 +1090,7 @@ msgstr ""
 "\n"
 "ØÙØØØ ØÙ ØÙÙØØØØÙÙÙ..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1079,7 +1104,7 @@ msgstr ""
 "\n"
 "ØÙ ØÙÙØ ÙÙØÙØ ÙØØÙØÙØ ÙÙØ ÙØÙØØØ ÙØØØØÙ ØØÙØ."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1093,7 +1118,7 @@ msgstr ""
 "\n"
 "ØÙÙØ ÙÙØÙØ ÙØØÙØÙØ ÙÙØ ÙØÙØØØ ÙØØØØÙ ØØÙØ."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1103,7 +1128,7 @@ msgstr ""
 "\n"
 "ØØØØ ØÙ ØÙÙØØØØÙ."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
 msgid ""
 "\n"
 "\n"
@@ -1113,34 +1138,34 @@ msgstr ""
 "\n"
 "ÙØ ØÙØØ ØÙÙØ ØÙØØØ ÙØØØÙØ ÙÙ ÙØØ ØÙÙØÙØ."
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "ØÙØØÙØ ØÙØÙÙØØÙÙÙ ÙÙØÙÙ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "ØÙØØÙØ ØÙØÙÙØØÙÙÙ ÙÙÙÙØÙ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:805
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:819
 msgid "Other Email"
 msgstr "ØØÙØ ØÙÙØØÙÙÙ ØØØ"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:184
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
 msgid "evolution address book"
 msgstr "ØÙØØ ØÙØÙÙÙ ØÙÙÙÙÙÙØÙ"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact"
 msgstr "ÙØØØØÙ ØØÙØ"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
 msgid "New Contact List"
 msgstr "ÙØØÙØ ÙØØØØÙÙÙ ØØÙØØ"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:167
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1151,102 +1176,103 @@ msgstr[3] "ÙØÙØ ØÙØØØ ØÙØÙØÙÙÙ ØÙØØÙÙ %s ÙÙÙ %d ØØØ
 msgstr[4] "ÙØÙØ ØÙØØØ ØÙØÙØÙÙÙ ØÙØØÙÙ %s ÙÙÙ %d ØØØÙØ"
 msgstr[5] "ÙØÙØ ØÙØØØ ØÙØÙØÙÙÙ ØÙØØÙÙ %s ÙÙÙ %d ØØØÙØ"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:31
+#: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "ØÙØØ"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:153
+#: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
 msgstr "ÙØØÙØ ØÙÙØØØØÙÙÙ:"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:154
+#: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
 msgstr "ÙØØØØÙ:"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:180
+#: ../addressbook/gui/widgets/ea-minicard.c:183
 msgid "evolution minicard"
 msgstr "ØØØÙØ ØÙÙÙÙÙÙØÙÙ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "ØÙØØ ØÙÙØÙ ØÙ_ØØÙØ ØÙØÙÙØØÙÙÙ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../widgets/misc/e-web-view.c:397
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "ØÙØØ ØÙØÙÙØÙ ØÙÙ ØÙØØÙØØ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:179
-#: ../widgets/misc/e-web-view.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "ØØ_ØÙ ØØØÙØ ØØÙØØ ØÙÙ..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:404
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "ØØØÙ ØØØÙØ ØÙÙ ÙØØ ØÙØÙÙØ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:424
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
-msgid "List Members"
-msgstr "ØØØØØ ØÙÙØØÙØ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:215
+msgid "Open map"
+msgstr "Ø_ÙØØ ØÙØØÙØØ"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
+msgid "List Members:"
+msgstr "ØØØØØ ØÙÙØØÙØ:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Department"
 msgstr "ØÙÙÙØÙÙ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Profession"
 msgstr "ØÙÙÙÙØ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
 msgid "Position"
 msgstr "ØÙØØØØ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Video Chat"
 msgstr "ÙØØØØØ ØØÙÙÙØÙÙ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:427
-#: ../plugins/groupwise-features/camel-gw-listener.c:452
-#: ../plugins/groupwise-features/camel-gw-listener.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view.c:513
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
 msgstr "ØÙØÙÙÙÙ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ÙØÙØÙØ/ÙØØÙÙ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Phone"
 msgstr "ÙØØÙ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
 msgid "Fax"
 msgstr "ÙØÙØ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
 msgid "Address"
 msgstr "ØÙØÙÙØÙ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Home Page"
 msgstr "ØÙØÙØØ ØÙØØÙØÙÙØ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
 msgid "Web Log"
 msgstr "ÙØÙÙÙØ"
 
@@ -1254,58 +1280,61 @@ msgstr "ÙØÙÙÙØ"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../capplet/settings/mail-capplet-shell.c:361
-#: ../modules/addressbook/e-book-shell-backend.c:112
-#: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:161
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:128
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../capplet/settings/mail-capplet-shell.c:385
+#: ../modules/addressbook/e-book-shell-backend.c:120
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/calendar/e-cal-shell-backend.c:138
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:122
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:122
+#: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "ØØØÙ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:829
+#: ../addressbook/gui/widgets/eab-contact-display.c:986
+msgid "List Members"
+msgstr "ØØØØØ ØÙÙØØÙØ"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
 msgid "Job Title"
 msgstr "ØÙÙØÙÙÙ ØÙÙØÙÙÙ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:866
+#: ../addressbook/gui/widgets/eab-contact-display.c:1041
 msgid "Home page"
 msgstr "ØÙØÙØØ ØÙØØÙØÙØ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:875
+#: ../addressbook/gui/widgets/eab-contact-display.c:1050
 msgid "Blog"
 msgstr "ØÙÙØÙÙÙØ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
-#: ../widgets/misc/e-web-view.c:858
+#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "ØÙÙØ ÙÙØØØØÙØ %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the address book once in online mode to download its contents."
 msgstr ""
-"ÙÙ ÙØÙÙÙ ÙÙ ÙØØ ØÙØØ ØÙØÙØÙÙÙ ÙØØ. ÙØØ ÙØÙÙ ØÙØ ØÙÙ ÙØØ ØÙØÙØØ ÙÙØ ÙÙØÙÙÙØ "
-"ÙÙØØØØØØÙ ØÙÙ ØØØØÙ ØÙ ÙÙ ÙØÙ ØÙØÙÙÙ ØØÙÙ ØÙØÙ. ØØØØ ØÙÙÙ ØÙØØ ØÙØÙØÙÙÙ ÙØØ ÙÙ "
-"ÙÙØ ØÙØØØØÙ ÙÙØÙ ØÙØÙÙ ÙØØÙÙØØÙ"
+"ÙØ ÙÙÙÙ ÙØØ ØÙØØ ØÙØÙØÙÙÙ ÙØØ. ÙØØ ÙØÙÙ ØÙÙØ ØÙÙ ÙØØ ØÙØÙØØ ÙÙØ ÙÙØÙÙÙØ "
+"ÙÙØØØØØØÙ ØÙÙ ØØØØÙ ÙØÙÙØ ØÙÙÙ ÙÙ ÙÙÙØÙÙ ØØØ. ØØØØ ØÙÙÙ ØÙØØ ØÙØÙØÙÙÙ ÙØØ ÙÙ ÙÙØ "
+"ØÙØØØØÙ ÙØÙÙØÙÙ ÙØØÙÙØØÙ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#, 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  Ù ØÙÙÙ ØÙÙÙ "
+"ÙØ ÙÙÙÙ ÙØØ ØÙØØ ØÙØÙØÙÙÙ ÙØØ. ØØØØÙ ØØÙÙØ ÙÙ ÙØÙØ ØÙÙØØØ %s ÙØÙÙÙ ØÙÙÙ "
 "ØÙØØØØÙØ ØÙÙØØÙØ ÙÙÙÙØØ ØÙÙÙ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
@@ -1314,7 +1343,7 @@ msgstr ""
 "ÙÙ ÙÙØÙØ ØØÙ LDAP ÙÙ ØÙØØØØØØ ØÙØØÙÙÙØ ÙØÙÙÙÙÙÙØÙÙ ØØØ ÙÙØ ØØÙØ ØØØØØØÙ LDAP ÙÙ "
 "ØÙÙÙÙÙÙØÙÙ ÙØØ ØÙÙÙ ØØØÙØ ØØÙØ ØÙÙÙÙÙÙØÙÙ ÙØÙÙ ÙÙÙØ ØØÙ LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:126
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 #, fuzzy
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
@@ -1323,11 +1352,11 @@ msgstr ""
 "ÙØ ÙÙÙÙ ÙØØ ØÙØØ ØÙØÙØÙÙÙ ÙØØ. ÙØ ÙØÙÙ ØÙÙ ØÙÙÙ ØØØÙØ ÙØØØÙØ ØÙØ ØÙÙÙØ ØÙ ØÙÙÙ "
 "ÙÙ ÙÙÙÙ ØÙÙØÙÙ ÙÙØØØÙÙ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid "Detailed error message:"
 msgstr "ØØØÙØ ØØØ ÙÙØÙÙØ:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1339,194 +1368,209 @@ msgstr ""
 "ØÙ ØØÙØ ÙÙÙØ ØÙØØÙ ØÙØÙØÙ ÙÙÙØØØØ ÙÙ ØÙØÙÙØØ ØØØÙÙ ØÙØÙÙÙÙ\n"
 "ÙØÙØØ ØÙØÙØÙÙÙ ÙØØ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
 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"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this address book."
 msgstr ""
-"ÙÙØ ØØØÙÙ ÙÙØ ØÙÙÙØ ÙØØ ØÙØØØØÙØÙ ØØÙ ØÙØØØÙÙ ØÙ ØÙØØÙ ØÙÙØØÙ ÙØÙØØ\n"
-"ØÙØÙØÙÙÙ ÙØØ. ØÙØØØØÙ ØØÙ ØØØÙ ØÙØØ ØÙÙØ ØÙ ØÙØ ÙÙÙØ ØÙØØÙ ØÙØÙØÙ ÙØÙÙ "
-"ØÙØØØØÙØÙ\n"
-"ÙÙ ØÙØÙÙØØ ØØØÙÙ ØÙØÙÙÙÙ ÙØÙØØ ØÙØÙØÙÙÙ ÙØØ."
+"ÙÙØ ØØØÙÙ ÙÙØ ØÙÙÙØ ÙØØ ØÙØØØØÙØÙ ØØÙ ØÙØØØÙÙ ØÙ ØÙØØÙ ØÙÙØØÙ\n"
+"ÙØÙØØ ØÙØÙØÙÙÙ ÙØØ. ØØØØÙ ØØØÙ ØØØÙ ØÙØØ ØÙÙØ ØÙ ØÙØ ÙÙÙØ\n"
+"ØÙØØÙ ØÙØÙØÙ ÙØÙÙ ØÙØØØØÙØÙ ÙÙ ØÙØÙÙØØ ØØØÙÙ ØÙØÙÙÙÙ ÙØÙØØ\n"
+"ØÙØÙØÙÙÙ ÙØØ."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
-msgstr "ÙÙ ØØÙÙÙ ØÙÙÙÙØ ØÙØØ ØÙØÙØÙÙÙ ÙØØ ÙÙ ØØÙÙÙ ÙØØ ØÙØØØØÙØÙ."
+msgstr "ÙÙ ØØÙÙÙ ØÙÙÙÙØ ØÙØØ ØÙØÙØÙÙÙ ÙØØ ÙÙ ØØÙÙÙ ÙØØ ØÙØØØØÙØÙ. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#, c-format
 msgid "The backend for this address book refused to perform this query. %s"
-msgstr "ØÙØØ ØÙÙÙÙØ ØÙØØ ØÙØÙØÙÙÙ ØØØÙØ ÙØØ ØÙØØØØÙØÙ."
+msgstr "ØÙØØ ØÙÙÙÙØ ØÙØØ ØÙØÙØÙÙÙ ØØØÙØ ÙØØ ØÙØØØØÙØÙ. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:241
+#, c-format
 msgid "This query did not complete successfully. %s"
-msgstr "ÙÙ ÙØÙÙ ØÙØØØØÙØÙ ØÙØØØ."
+msgstr "ÙÙ ÙØÙÙ ØÙØØØØÙØÙ ØÙØØØ. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:214
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:254
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Select Address Book"
 msgstr "ØØØØ ØÙØØ ØÙØÙÙÙ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "list"
 msgstr "ØØØØ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:455
+#: ../addressbook/gui/widgets/eab-gui-util.c:552
 msgid "Move contact to"
 msgstr "ØÙÙÙ ØÙÙØØØØÙ ØÙÙ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:457
+#: ../addressbook/gui/widgets/eab-gui-util.c:554
 msgid "Copy contact to"
 msgstr "ØÙØØ ØÙÙØØØØÙ ØÙÙ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:557
 msgid "Move contacts to"
 msgstr "ØÙÙÙ ØÙÙØØØØÙÙÙ ØÙÙ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
 msgid "Copy contacts to"
 msgstr "ØÙØØ ØÙÙØØØØÙÙÙ ØÙÙ"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "ÙØÙØ ØÙØØØÙØ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:721
-#: ../addressbook/importers/evolution-ldif-importer.c:519
-#: ../addressbook/importers/evolution-vcard-importer.c:278
-#: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:748
+#: ../addressbook/importers/evolution-ldif-importer.c:546
+#: ../addressbook/importers/evolution-vcard-importer.c:280
+#: ../calendar/importers/icalendar-importer.c:413
+#: ../calendar/importers/icalendar-importer.c:902
+#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ÙØØÙ ØÙØØØÙØØØ..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1016
+#: ../addressbook/importers/evolution-csv-importer.c:1072
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "ØÙØÙÙÙ  CSV ØÙ Tab (.csvØ .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1073
 msgid "Outlook CSV and Tab Importer"
 msgstr "ÙØØÙØØ ØÙØÙÙÙ CSV Ù Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1025
+#: ../addressbook/importers/evolution-csv-importer.c:1081
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "ÙÙØÙÙØ  CSV ØÙ Tab (.csvØ .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ÙØØÙØØ ÙÙØÙÙØ CSV Ù Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1034
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "ØÙÙÙÙÙÙØÙÙ  CSV ØÙ Tab (.csvØ .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1035
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Evolution CSV and Tab Importer"
 msgstr "ÙØØÙØØ ØÙÙÙÙÙÙØÙÙ CSV Ù Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:753
+#: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:797
 msgid "Evolution LDIF importer"
 msgstr "ÙØØÙØØ LDIF ÙØÙÙÙÙÙÙØÙÙ"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:639
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:640
+#: ../addressbook/importers/evolution-vcard-importer.c:659
 msgid "Evolution vCard Importer"
 msgstr "ÙØØÙØØ vCard ÙØÙÙÙÙÙÙØÙÙ"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:741
+#: ../addressbook/printing/e-contact-print.c:719
 #, c-format
 msgid "Page %d"
 msgstr "ØÙØØ %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "ÙØ ÙÙÙÙ ÙØØ ØÙÙÙÙ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
-msgid "Couldn't get list of address books"
-msgstr "ÙØÙØ ÙÙ ØÙØØÙÙ ØÙÙ ÙØØÙØ ØÙØØØ ØÙØÙØÙÙÙ"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "ØØØÙØ ØÙØØÙÙ ØÙÙ ÙØØÙØ ØÙØØØ ØÙØÙØÙÙÙ: %s"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/event-page.c:2923
+#: ../calendar/gui/dialogs/memo-page.c:938
+#: ../calendar/gui/dialogs/task-page.c:1759 ../em-format/em-format.c:2324
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:658
+#: ../plugins/caldav/caldav-browse-server.c:220
+#: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
+#: ../smime/gui/certificate-manager.c:314
+msgid "Unknown error"
+msgstr "ØØØ ÙØÙÙÙ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
-msgid "failed to open book"
-msgstr "ÙØÙØ ÙÙ ÙØØ ØÙØÙØØ"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, fuzzy, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "ÙØÙ ØØÙÙÙ ØÙØÙÙÙÙ '%s'"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "ØØÙØ ÙÙÙ ØÙØØÙØ ØØÙÙØ ÙÙ ØÙØØÙØ ØÙÙÙØØÙ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
 msgstr "ØØØØ ÙØÙÙØØØ ØÙØØ ØÙØÙØÙÙÙ ØÙÙØÙÙ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
 msgstr "ØØØØ ØÙØØØÙØØ ÙÙ vcard ØÙ ÙÙÙ csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:70
+#: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
 msgstr "ØØÙØ ÙÙ ÙÙØ ØÙØ ØØØÙÙÙ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:73
+#: ../addressbook/tools/evolution-addressbook-export.c:74
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
 "ØØØ ØÙØØØÙØØ ÙÙ ÙÙÙ ØØÙØ ÙØØØ ÙÙ ØÙÙØØ ØÙÙØØØØÙÙÙØ ØÙØØÙ ØÙØÙØØØØÙ ÙÙ 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:75
+#: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:137
+#: ../addressbook/tools/evolution-addressbook-export.c:139
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "ØØØ ÙÙ ÙØØÙÙØØØ ØØØ ØÙØÙØÙØØ ØØØØ ØØØØØÙ ØÙØÙØØ --help ÙÙØØØØØ ÙÙÙÙÙØ "
 "ØÙØØØØÙØÙ."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:151
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Only support csv or vcard format."
 msgstr "ÙØ ØØÙ ØÙØ ÙØÙÙØØØ csv ØÙ vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:160
+#: ../addressbook/tools/evolution-addressbook-export.c:162
 msgid "In async mode, output must be file."
 msgstr "ÙÙ ØÙÙØØ ØÙÙØØØØÙÙÙØ ÙØØ ØÙ ÙÙÙÙ ØÙØØÙØ ÙÙÙÙØ."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:168
+#: ../addressbook/tools/evolution-addressbook-export.c:170
 msgid "In normal mode, there is no need for the size option."
 msgstr "ÙØ ØØØØ ÙØÙØØ ØÙØØÙ ÙÙ ØÙÙØØ ØÙØØØÙ."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:199
+#: ../addressbook/tools/evolution-addressbook-export.c:201
 msgid "Unhandled error"
 msgstr "ØØØ ÙØ ÙÙÙÙ ÙØØÙØØÙ"
 
@@ -1628,19 +1672,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "ØÙØØÙØ ØÙÙ ØØØØ ÙÙ ØØÙ ÙØØ ØÙÙÙØØØ"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:187
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "ØÙØØÙØ ØÙÙ ØØØØ ÙÙ ØØÙ ÙØØ ØÙØØØÙØØØ"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "ØÙØØÙØ ØÙÙ ØØØØ ÙÙ ØØÙ ÙØÙ ØÙÙØÙØØØ"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:190
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "ØÙØØÙØ ØÙÙ ØØØØ ÙÙ ØØÙ ÙØÙ ØÙÙÙÙÙØØ"
@@ -1895,7 +1939,7 @@ msgstr "ÙÙ ØØÙÙÙØ ÙÙØÙÙ ØØÙ ÙÙØØØ ØØØÙÙ ØÙÙÙÙÙÙ
 msgid "_Discard Changes"
 msgstr "Ø_ÙÙÙ ØÙØØÙÙØØØ"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:313
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "Ø_ØÙØ"
 
@@ -1904,7 +1948,7 @@ msgid "_Save Changes"
 msgstr "Ø_ØÙØ ØÙØØÙÙØØØ"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:158
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "ØØ_ØÙ"
@@ -1913,16 +1957,7 @@ msgstr "ØØ_ØÙ"
 msgid "_Send Notice"
 msgstr "ØØ_ØÙ ØÙØÙÙ"
 
-#: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1776
-#: ../plugins/caldav/caldav-browse-server.c:921
-#: ../plugins/google-account-setup/google-source.c:439
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "ØØØÙ ÙÙÙØ ØÙØ"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
@@ -1932,7 +1967,7 @@ msgstr[3] "ØÙØØÙ"
 msgstr[4] "ØÙÙÙØ"
 msgstr[5] "ØÙÙÙØ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:114
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
@@ -1942,31 +1977,26 @@ msgstr[3] "ØØØØØ"
 msgstr[4] "ØØØØ"
 msgstr[5] "ØØØØ"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:126
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:43
-msgid "days"
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:133
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
+#, fuzzy
+msgid "day"
 msgid_plural "days"
 msgstr[0] "ÙÙÙ"
 msgstr[1] "ÙÙÙ"
-msgstr[2] "ÙÙÙÙÙ"
-msgstr[3] "ØÙÙØÙ"
-msgstr[4] "ÙÙÙÙØ"
+msgstr[2] "ÙÙÙ"
+msgstr[3] "ÙÙÙ"
+msgstr[4] "ÙÙÙ"
 msgstr[5] "ÙÙÙ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
 msgid "Start time"
 msgstr "ØÙÙ ØÙØØØ"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "ÙÙØØÙØ"
 
@@ -1976,9 +2006,9 @@ msgstr "ØØÙ_Ø ØÙÙÙ"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1632
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1642
-#: ../plugins/itip-formatter/itip-view.c:1044
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../plugins/itip-formatter/itip-view.c:1052
 msgid "Location:"
 msgstr "ØÙÙÙÙØ:"
 
@@ -1986,7 +2016,7 @@ msgstr "ØÙÙÙÙØ:"
 msgid "Snooze _time:"
 msgstr "_ÙÙØ ØÙØÙÙØ:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:909
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "ØØ_ÙØ"
@@ -1995,11 +2025,22 @@ msgstr "ØØ_ÙØ"
 msgid "_Snooze"
 msgstr "Ø_ÙÙØ"
 
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:454
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:387
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#, fuzzy
+msgid "days"
+msgstr "ÙÙÙ"
+
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../plugins/google-account-setup/google-contacts-source.c:386
 msgid "hours"
 msgstr "ØØØØØ"
 
@@ -2010,30 +2051,30 @@ msgstr "ÙÙÙØ ØÙÙÙØØ"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../plugins/google-account-setup/google-contacts-source.c:385
 msgid "minutes"
 msgstr "ØÙØØÙ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1613
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
 msgid "No summary available."
 msgstr "ÙØ ÙÙØØ ÙÙØÙØ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1495
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
 msgid "No description available."
 msgstr "ÙØ ÙÙØØ ÙØÙ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
 msgid "No location information available."
 msgstr "ÙØ ØØÙÙÙØ ÙØÙÙÙØØ ØÙÙ ØÙÙÙÙØ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1549
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
 #, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
 msgstr[0] "ÙÙØ ÙØÙÙ ÙÙØÙÙØØ"
 msgstr[1] "ÙØÙÙ ÙÙØÙÙ ÙØØØ"
 msgstr[2] "ÙØÙÙ ÙÙØÙÙØÙ"
@@ -2041,24 +2082,24 @@ msgstr[3] "ÙØÙÙ %d ÙÙØÙÙØØ"
 msgstr[4] "ÙØÙÙ %d ÙÙØÙÙÙØ"
 msgstr[5] "ÙØÙÙ %d ÙÙØÙÙ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1774
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 msgid "Warning"
 msgstr "ØØØÙØ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1745
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
 msgstr ""
-"ÙØ ÙØØÙ ØÙÙÙÙÙÙØÙÙ ØØÙÙØØØ ØÙØÙÙÙÙÙ\n"
-"ØØÙØÙÙØØ ØØØ ØÙØØÙØ ØÙØÙÙØØÙÙÙ ØØØØ ÙÙÙ ÙØÙ ØÙÙØÙÙØØ\n"
-"ÙØÙØÙØ ÙØØØØÙ ØØÙØ ØÙÙØØÙÙÙ. ØÙØØØ\n"
-"ØÙÙÙÙÙÙØÙÙ ØÙØÙÙ ØÙØØ ÙØÙÙØØ ØØØÙ ØÙØØ ØÙ ØÙÙ."
+"ÙØ ÙØØÙ ØÙÙÙÙÙÙØÙÙ ÙÙØÙÙØØ ØÙØÙÙÙÙÙ ØØØØØØØØ\n"
+"ØÙØØÙØ ØÙØÙÙØØÙÙÙ ØØØØ ÙÙÙ ÙØØ ØÙÙÙØÙÙ\n"
+"ÙØÙØÙ ÙØØØØÙ ØØÙØ ØÙÙØØÙÙÙ. ØÙØØØ ØÙÙÙÙÙÙØÙÙ\n"
+"ØÙØÙÙ ØÙØØ ÙÙØÙÙ ØØØÙ ØÙØØ ØÙ ØÙÙ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2068,24 +2109,24 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"ÙÙØÙ ØØÙÙØ ÙØÙÙÙÙ ØÙÙÙÙÙÙØÙÙ ØÙÙ ÙØÙ ØÙ ÙØÙÙÙØ. ÙØØ ØÙØÙØÙÙØ ÙØØÙ ÙØØØÙÙ ØÙØØÙØÙØ "
+"ÙÙØÙ ÙÙØÙÙ ÙØÙÙÙÙ ØÙÙÙÙÙÙØÙÙ ØÙÙ ÙØÙ ØÙ ÙØÙÙÙØ. ÙØØ ØÙÙÙØÙÙ ÙØØÙ ÙØØØÙÙ ØÙØØÙØÙØ "
 "ØÙØÙØÙÙ:\n"
 "\n"
 "        %s\n"
 "\n"
 "ÙÙ ØØÙØ ÙØÙÙØ ØØØÙÙ ÙØØ ØÙØØÙØÙØØ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1795
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
 msgid "Do not ask me about this program again."
 msgstr "ÙØ ØØØÙÙÙ ØÙ ÙØØ ØÙØØÙØÙØ ØØÙÙØÙ."
 
-#: ../calendar/gui/alarm-notify/util.c:44
+#: ../calendar/gui/alarm-notify/util.c:45
 msgid "invalid time"
 msgstr "ÙÙØ ØÙØ ØØÙØ"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:393
-#: ../calendar/gui/misc.c:116
+#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/misc.c:118
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2097,8 +2138,8 @@ msgstr[4] "%d ØØØØ"
 msgstr[5] "%d ØØØØ"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:399
-#: ../calendar/gui/misc.c:122
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/misc.c:124
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2112,8 +2153,8 @@ msgstr[5] "%d ØÙÙÙØ"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:128
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -2124,23 +2165,19 @@ msgstr[3] "%d ØÙØÙ"
 msgstr[4] "%d ØØÙÙØ"
 msgstr[5] "%d ØØÙÙØ"
 
-#: ../calendar/gui/cal-editor-utils.c:105
-msgid "Invalid object"
-msgstr "ØÙØØ ØÙØ ØØÙØ"
-
-#: ../calendar/gui/calendar-view-factory.c:117
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "ÙØÙØ ØÙÙÙÙ"
 
-#: ../calendar/gui/calendar-view-factory.c:120
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Work Week View"
 msgstr "ÙØÙØ ØØØÙØ ØÙØÙÙ"
 
-#: ../calendar/gui/calendar-view-factory.c:123
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Week View"
 msgstr "ÙØÙØ ØÙØØØÙØ"
 
-#: ../calendar/gui/calendar-view-factory.c:126
+#: ../calendar/gui/calendar-view-factory.c:125
 msgid "Month View"
 msgstr "ÙØÙØ ØÙØÙÙØ"
 
@@ -2169,16 +2206,16 @@ msgstr "ØÙÙØØ"
 msgid "Classification"
 msgstr "ØØÙÙÙ"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:504
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "ØØÙØÙ"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:522
+#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "ØÙÙØÙ"
@@ -2200,9 +2237,9 @@ msgstr "ÙÙØÙØ"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../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.c:863
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "ØÙÙÙÙØ"
 
@@ -2211,15 +2248,15 @@ msgstr "ØÙÙÙÙØ"
 msgid "Organizer"
 msgstr "ØÙÙÙØÙÙ"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:770 ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:503
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ØØØ"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:761 ../calendar/gui/e-cal-model.c:768
-#: ../calendar/gui/e-task-table.c:492 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ØØÙ"
 
@@ -2235,7 +2272,7 @@ msgstr "ØÙØØØ"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Summary"
 msgstr "ØÙÙÙØÙØ"
 
@@ -2264,55 +2301,55 @@ msgstr "ÙÙ"
 msgid "is not"
 msgstr "ÙÙØ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "ØØÙØ ØÙÙÙØÙÙ"
+#: ../calendar/gui/dialogs/alarm-dialog.c:636
+msgid "Edit Reminder"
+msgstr "ØØØÙØ ØÙØØÙÙØ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:435
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "ØØÙØ ÙØÙØØ ØÙØÙÙ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:431
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "ØØØÙ ØÙØ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:443
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "ØØÙÙ ØØÙØÙØ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:439
+#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "ØØØÙ ØØÙØ ØÙÙØØÙÙÙ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "ØØÙÙ ÙÙØÙÙ"
+msgid "Add Reminder"
+msgstr "ØØØÙØ ØØÙÙØ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "ÙÙØÙÙ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "_ØØØÙØ ÙØØÙØØ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+msgid "Custom reminder sound"
 msgstr "ØÙØ ÙÙØÙÙ ÙØØÙØ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "Ø_ØØÙØ:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "ØÙØØØØ"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "ØØÙÙØ"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "ØØÙØ"
@@ -2334,7 +2371,7 @@ msgid "_Program:"
 msgstr "ØÙ_ØØÙØÙØ:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
+msgid "_Repeat the reminder"
 msgstr "ØØÙ_Ø ØÙÙÙØÙÙ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
@@ -2349,9 +2386,7 @@ msgstr "ØØØ"
 msgid "before"
 msgstr "ÙØÙ"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 msgstr "ØÙÙØÙ"
 
@@ -2359,7 +2394,7 @@ msgstr "ØÙÙØÙ"
 msgid "end of appointment"
 msgstr "ÙÙØÙØ ØÙÙÙØØ"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "ÙØÙØØ ØØØÙÙÙØ ÙÙ"
@@ -2376,7 +2411,7 @@ msgstr "ØÙØØÙ"
 msgid "start of appointment"
 msgstr "ØØØÙØ ØÙÙÙØØ"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
 msgid "Action/Trigger"
 msgstr "ØÙØØØØØ/ØÙÙØÙÙØ"
 
@@ -2385,453 +2420,463 @@ msgid "A_dd"
 msgstr "Ø_ØÙ"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:7
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "ØÙÙÙØÙÙØØ"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Reminders"
+msgstr "ØØÙÙØØØ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "ØÙÙÙÙØ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:509
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:530
 msgid "_Type:"
 msgstr "ØÙ_ÙÙØ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:152
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:280
+#: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "ØÙØ_ØÙ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:300
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Ø_ÙØØ ÙØØÙÙØØ ØÙØÙÙÙÙ ÙØÙÙØ ÙÙØÙÙ ØÙÙ ØØØØÙ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:302
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Ø_ÙØØ ÙØØÙÙØØ ÙØØÙØ ØÙÙÙØÙ ÙØÙÙØ ÙÙØÙÙ ØÙÙ ØØØØÙ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:304
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Ø_ÙØØ ÙØØÙÙØØ ÙØØÙØ ØÙØØÙÙØØØ ÙØÙÙØ ÙÙØÙÙ ØÙÙ ØØØØÙ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:352
+#: ../calendar/gui/dialogs/calendar-setup.c:350
+msgid "Sh_ow reminder notifications"
+msgstr "ØØØØ ØØØØØØØ ØÙÙÙØÙØØ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:425
 msgid "Colo_r:"
 msgstr "ØÙ_ÙÙÙ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
-#: ../modules/addressbook/addressbook-config.c:1010
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:471
+#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
+#: ../modules/addressbook/addressbook-config.c:1080
+#: ../modules/addressbook/autocompletion-config.c:228
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3045
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "ØØÙ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:387
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:461
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "ÙØØÙØ ÙÙØÙ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:472
 msgid "Memo List"
 msgstr "ÙØØÙØ ØÙØØÙÙØØØ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "Calendar Properties"
 msgstr "ØØØØØ ØÙØÙÙÙÙ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "New Calendar"
 msgstr "ØÙÙÙÙ ØØÙØ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Task List Properties"
 msgstr "ØØØØØ ÙØØÙØ ØÙÙÙØÙ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Task List"
 msgstr "ÙØØÙØ ÙÙØÙ ØØÙØØ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "Memo List Properties"
 msgstr "ØØØØØ ÙØØÙØ ØÙÙØÙØØØ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "New Memo List"
 msgstr "ÙØØÙØ ØØÙÙØØØ ØØÙØØ"
 
-#: ../calendar/gui/dialogs/changed-comp.c:59
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This event has been deleted."
 msgstr "ØÙØÙ ÙØØ ØÙØØØ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:63
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This task has been deleted."
 msgstr "ØÙØÙØ ÙØÙ ØÙÙÙÙÙØ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:67
+#: ../calendar/gui/dialogs/changed-comp.c:70
 msgid "This memo has been deleted."
 msgstr "ØÙØÙØ ÙØÙ ØÙÙØÙØØ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:76
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  ÙÙØ ÙÙØ ØØØÙÙØØØ. ØØØÙØ ØØØÙÙ ÙØÙ ØÙØÙØÙÙØØØ Ù ØÙÙ ØÙÙØØÙØØ"
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:81
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  ÙÙ ØÙÙ ØØÙÙØ ØØÙÙØØØØ ØØØÙØ ØÙÙ ØÙÙØØÙØØ"
 
-#: ../calendar/gui/dialogs/changed-comp.c:83
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This event has been changed."
 msgstr "ØÙÙÙÙØØ ÙØØ ØÙØØØ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:87
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This task has been changed."
 msgstr "ØÙÙÙÙØØ ÙØÙ ØÙÙÙÙÙØ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:91
+#: ../calendar/gui/dialogs/changed-comp.c:94
 msgid "This memo has been changed."
 msgstr "ØÙÙÙÙØØ ÙØÙ ØÙÙØÙØØ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:100
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  ÙÙØ ÙÙØ ØØØÙÙØØØ. ØØØÙØ ØØØÙÙ ÙØÙ ØÙØÙØÙÙØØØ Ù ØØØÙØ ØÙÙØØÙØØ"
 
-#: ../calendar/gui/dialogs/changed-comp.c:102
+#: ../calendar/gui/dialogs/changed-comp.c:105
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ÙÙ ØÙÙ ØØÙÙØ ØØÙÙØØØØ ØØØÙØ ØØØÙØ ØÙÙØØÙØØ"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:445
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
 #, c-format
 msgid "Validation error: %s"
 msgstr "ØØØ ÙÙ ØÙØÙØØÙÙ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:260
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
 msgstr "ÙØ ÙÙÙÙ ØÙØ ØÙÙØÙÙØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:535
+#: ../calendar/gui/dialogs/comp-editor.c:613
 msgid "Could not update object"
 msgstr "ÙÙ ÙÙÙÙ ØØØÙØ ØÙÙØØÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:650
+#: ../calendar/gui/dialogs/comp-editor.c:741
 msgid "Edit Appointment"
 msgstr "ØØÙØ ØÙÙÙØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:657
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Meeting - %s"
 msgstr "ØØØÙØØ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:750
 #, c-format
 msgid "Appointment - %s"
 msgstr "ÙÙØØ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ÙÙÙØ ÙÙØÙÙØØ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:667
+#: ../calendar/gui/dialogs/comp-editor.c:758
 #, c-format
 msgid "Task - %s"
 msgstr "ÙÙÙÙØ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:672
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Memo - %s"
 msgstr "ØÙÙØÙØØ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:688
+#: ../calendar/gui/dialogs/comp-editor.c:779
 msgid "No Summary"
 msgstr "ÙØ ÙÙØÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:809
+#: ../calendar/gui/dialogs/comp-editor.c:900
 msgid "Keep original item?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
-msgid "Click here to close the current window"
-msgstr "ØÙÙØ ÙÙØ ÙØÙÙ ØÙÙØÙØØ ØÙØØÙÙØ"
+#: ../calendar/gui/dialogs/comp-editor.c:1101
+msgid "Close the current window"
+msgstr "ØØÙÙ ØÙÙØÙØØ ØÙØØÙÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:132
-#: ../shell/e-shell-window-actions.c:1433
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:552
-#: ../widgets/misc/e-web-view.c:414 ../widgets/misc/e-web-view.c:1068
+#: ../calendar/gui/dialogs/comp-editor.c:1108 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1455
+#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "ÙØØ ØÙÙÙØÙÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1440
-#: ../widgets/misc/e-focus-tracker.c:107 ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1062
+#: ../calendar/gui/dialogs/comp-editor.c:1115 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1462
+#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "ÙØ ØÙÙÙØÙÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1026
-#: ../shell/e-shell-window-actions.c:1447
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:562
+#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../shell/e-shell-window-actions.c:1469
+#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "ØØØÙ ØÙÙÙØÙÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1033
-msgid "Click here to view help available"
-msgstr "ØÙÙØ ÙÙØ ÙØØØ ØÙÙØØØØØ ØÙÙØÙÙØØ"
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+msgid "View help"
+msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1040 ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1482
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1497
+#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "ÙØÙ ØÙØØÙØØ ØÙÙØÙØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-msgid "Click here to save the current window"
-msgstr "ØÙÙØ ÙÙØ ÙØÙØ ØÙÙØÙØØ ØÙØØÙÙØ"
+#: ../calendar/gui/dialogs/comp-editor.c:1157
+msgid "Save current changes"
+msgstr "ØØÙØ ØÙØØÙÙØØØ ØÙØØÙÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068 ../mail/e-mail-browser.c:153
-#: ../shell/e-shell-window-actions.c:1552
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:567
+#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1574
+#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "ØÙØÙØØ ÙØÙÙ ØÙÙÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1075
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_Classification"
 msgstr "ØÙØÙ_ØÙÙÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:167
+#: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1580
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_ØØÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089 ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1587
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_ÙÙÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
-#: ../shell/e-shell-window-actions.c:1594
+#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "_ÙØØØØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1199
 msgid "_Insert"
 msgstr "Ø_ØØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1110
-#: ../composer/e-composer-actions.c:336
+#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "_ØÙØØØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117 ../mail/e-mail-browser.c:174
-#: ../shell/e-shell-window-actions.c:1629 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1213 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "Ø_ØØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../composer/e-composer-actions.c:285
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "_ÙÙØÙÙ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-msgid "Click here to attach a file"
-msgstr "ØÙÙØ ÙÙØ ÙØØÙØÙ ÙÙÙ"
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "ØØÙØÙ ÙÙÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "_Categories"
 msgstr "ØÙ_ÙØØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1235
 msgid "Toggles whether to display categories"
 msgstr "ØØØÙØ ÙØ ØØØ ÙÙØ ØØÙØ ØØÙØØ ØÙÙØØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Time _Zone"
 msgstr "ØÙÙÙØÙØ ØÙ_ØÙÙÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1243
 msgid "Toggles whether the time zone is displayed"
 msgstr "ØØØÙØ ÙØ ØØØ ÙÙØ ØØÙØ ØØÙØØ ØÙÙÙØÙØ ØÙØÙÙÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1156
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Pu_blic"
 msgstr "_ØØÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "Classify as public"
 msgstr "ØØÙÙÙ ÙØØÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "_Private"
 msgstr "_ØØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165
+#: ../calendar/gui/dialogs/comp-editor.c:1261
 msgid "Classify as private"
 msgstr "ØÙÙÙ ÙØØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "_Confidential"
 msgstr "_ØØÙØÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172
+#: ../calendar/gui/dialogs/comp-editor.c:1268
 msgid "Classify as confidential"
 msgstr "ØÙÙÙ ÙØØÙÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "R_ole Field"
 msgstr "ØÙÙ ØÙ_ØÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "Toggles whether the Role field is displayed"
 msgstr "ØØØÙØ ÙØ ØØØ ÙØÙ ØÙÙ ØÙØÙØ ØØÙØÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "_RSVP"
 msgstr "_ØØÙÙØ ØÙØØÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ØØØÙØ ÙØ ØØØ ÙØÙ ØÙÙ ØØÙÙØ ØÙØØÙØ ØØÙØÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1196
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "_Status Field"
 msgstr "ØÙÙ ØÙ_ØØÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Toggles whether the Status field is displayed"
 msgstr "ØØØÙØ ÙØ ØØØ ÙØÙ ØÙÙ ØÙØØÙØ ØØÙØÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "_Type Field"
 msgstr "ØÙÙ ØÙ_ÙÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1302
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ØØØÙØ ÙØ ØØØ ØÙØØØ ÙÙØ ØÙØØÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
-#: ../composer/e-composer-private.c:73
+#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "ØØØ ØÙ_ÙØØÙØØØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1936
-#: ../composer/e-composer-actions.c:504
+#: ../calendar/gui/dialogs/comp-editor.c:2057
+#: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "ØØÙØÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2269
-#: ../calendar/gui/dialogs/comp-editor.c:2432
-#: ../calendar/gui/dialogs/comp-editor.c:3407
+#: ../calendar/gui/dialogs/comp-editor.c:2395
+#: ../calendar/gui/dialogs/comp-editor.c:2558
+#: ../calendar/gui/dialogs/comp-editor.c:3547
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ÙØ ØÙÙÙ ØÙØÙØÙÙØØØ ØÙØÙ ØÙØØÙØ ÙÙØØ ØÙØÙØØ ÙÙ ØØÙ ÙØÙÙ ØØØÙØ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3371
-#: ../plugins/prefer-plain/prefer-plain.c:64
+#: ../calendar/gui/dialogs/comp-editor.c:3511
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "ÙÙØÙÙ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3439
+#: ../calendar/gui/dialogs/comp-editor.c:3579
 msgid "Unable to use current version!"
 msgstr "ÙÙ ÙÙÙÙ ØØØØØØÙ ØÙØØØØØØ ØÙØØÙÙÙØ!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:92
-msgid "Could not open source"
-msgstr "ÙÙ ÙÙÙÙ ÙØØ ØÙÙØØØ"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:100
+#: ../calendar/gui/dialogs/copy-source-dialog.c:114
 msgid "Could not open destination"
 msgstr "ÙÙ ÙÙÙÙ ÙØØ ØÙÙÙØÙØ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:109
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "ØÙÙÙØÙØ ÙØØÙØ ÙÙÙØØØØ ÙÙØ."
 
-#: ../calendar/gui/dialogs/delete-comp.c:210
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+msgid "Cannot create object"
+msgstr "ØØØØ ØÙØØØ ÙØØÙ"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+msgid "Could not open source"
+msgstr "ÙÙ ÙÙÙÙ ÙØØ ØÙÙØØØ"
+
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_ØØÙ ÙØØ ØÙØÙØØ ÙÙ ÙÙ ØÙØØÙÙ ØØÙØ ØÙÙØØÙÙÙÙØ"
 
-#: ../calendar/gui/dialogs/delete-comp.c:213
+#: ../calendar/gui/dialogs/delete-comp.c:217
 #, fuzzy
 msgid "_Retract comment"
 msgstr "ÙØØØ ØÙÙÙ_ÙØÙØ:"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:57
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙØÙØØ ØØØØ ØØØ dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:61
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙÙÙÙÙØ ØØØØ ØØØ dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:64
+#: ../calendar/gui/dialogs/delete-error.c:65
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙÙØÙØØ ØØØØ ØØØ dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:69
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙØÙØØ ØØØØ ØØØ dbus: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The event could not be deleted because permission was denied"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙØÙØØ ÙØÙ ØÙØÙØØÙØ ØÙÙØ"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The task could not be deleted because permission was denied"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙÙÙÙÙØ ÙØÙ ØÙØÙØØÙØ ØÙÙØ"
 
-#: ../calendar/gui/dialogs/delete-error.c:81
+#: ../calendar/gui/dialogs/delete-error.c:82
 msgid "The memo could not be deleted because permission was denied"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙÙØÙØØ ÙØÙ ØÙØÙØØÙØ ØÙÙØ"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The item could not be deleted because permission was denied"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙØÙØØ ÙØÙ ØÙØÙØØÙØ ØÙÙØ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:93
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙØÙØØ ØØØØ ØØØ: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:96
+#: ../calendar/gui/dialogs/delete-error.c:97
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙÙÙÙÙØ ØØØØ ØØØ: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:100
+#: ../calendar/gui/dialogs/delete-error.c:101
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙÙØÙØØ ØØØØ ØØØ: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:104
+#: ../calendar/gui/dialogs/delete-error.c:105
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "ÙÙ ÙÙÙÙ ØØÙ ØÙØÙØØ ØØØØ ØØØ: %s"
@@ -2849,12 +2894,12 @@ msgid "Enter Delegate"
 msgstr "ØØØÙ ØÙÙÙÙÙÙÙÙØÙ"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "ØÙ_ÙÙØÙÙØØ"
+msgid "_Reminders"
+msgstr "ØØÙÙØØØ"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
-msgstr "ØÙÙØ ÙÙØ ÙØØÙÙÙ ØÙ ØØØÙØ ØÙÙÙØÙØØ ÙÙØØ ØÙØØØ"
+msgid "Set or unset reminders for this event"
+msgstr "ØÙÙ ØÙ ØØÙ ÙÙØÙÙØØ ÙÙØØ ØÙØØØ"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2873,14 +2918,12 @@ msgid "Make this a recurring event"
 msgstr "ØØØÙ ÙØØ ØØØÙØ ÙØÙØØÙØ"
 
 #: ../calendar/gui/dialogs/event-editor.c:240
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "ØÙØØØØ ØÙØØØØÙ"
 
 #: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "ØØØØ ØÙØØØØ ØØØØÙ ÙØÙØÙØ"
 
@@ -2900,13 +2943,13 @@ msgstr "_ÙØÙØÙØ/ÙØØÙÙ"
 msgid "Query free / busy information for the attendees"
 msgstr "ØÙØØØØÙØÙ ØÙ ÙØÙÙÙØØ ÙØÙÙØ/ÙØØÙÙ ÙÙØØÙØ"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3172
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
 msgid "Appointment"
 msgstr "ÙÙØØ"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:161
 msgid "Attendees"
 msgstr "ØÙØØÙØ"
 
@@ -2914,99 +2957,93 @@ msgstr "ØÙØØÙØ"
 msgid "Print this event"
 msgstr "ØØØØ ÙØØ ØÙØØØ"
 
-#: ../calendar/gui/dialogs/event-page.c:765
+#: ../calendar/gui/dialogs/event-page.c:558
 msgid "Event's start time is in the past"
 msgstr "ØÙÙ ØØØÙØ ØÙØØØ ÙÙ ØÙÙØØÙ"
 
-#: ../calendar/gui/dialogs/event-page.c:806
+#: ../calendar/gui/dialogs/event-page.c:635
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ÙØ ÙÙÙÙ ØØØÙØ ØÙØØØ ÙØÙÙ ØÙØÙÙÙÙ ØÙÙØØØ ÙÙÙØØØØ ÙÙØ"
 
-#: ../calendar/gui/dialogs/event-page.c:810
+#: ../calendar/gui/dialogs/event-page.c:639
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:822
-#: ../calendar/gui/dialogs/event-page.c:2780
-msgid "This event has alarms"
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3080
+msgid "This event has reminders"
 msgstr "ÙÙØØ ØÙØØØ ÙÙØÙÙØØ"
 
-#: ../calendar/gui/dialogs/event-page.c:889
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "ØÙ_ÙÙØÙÙ:"
 
-#: ../calendar/gui/dialogs/event-page.c:936
-msgid "_Delegatees"
-msgstr "_ÙÙÙÙÙØÙÙ"
-
-#: ../calendar/gui/dialogs/event-page.c:938
-msgid "Atte_ndees"
-msgstr "ØÙ_ØØÙØ"
-
-#: ../calendar/gui/dialogs/event-page.c:1155
+#: ../calendar/gui/dialogs/event-page.c:1263
 msgid "Event with no start date"
 msgstr "ØØØ ØØÙÙ ÙÙÙ ØØØ"
 
-#: ../calendar/gui/dialogs/event-page.c:1158
+#: ../calendar/gui/dialogs/event-page.c:1266
 msgid "Event with no end date"
 msgstr "ØØØ ØØÙÙ ÙÙÙ ØÙØÙØØ"
 
-#: ../calendar/gui/dialogs/event-page.c:1329
-#: ../calendar/gui/dialogs/memo-page.c:671
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1439
+#: ../calendar/gui/dialogs/memo-page.c:708
+#: ../calendar/gui/dialogs/task-page.c:819
 msgid "Start date is wrong"
 msgstr "ØØØÙØ ØÙØØØ ØØØØ"
 
-#: ../calendar/gui/dialogs/event-page.c:1339
+#: ../calendar/gui/dialogs/event-page.c:1449
 msgid "End date is wrong"
 msgstr "ØØØÙØ ØÙØÙØÙØØ ØØØØ"
 
-#: ../calendar/gui/dialogs/event-page.c:1362
+#: ../calendar/gui/dialogs/event-page.c:1472
 msgid "Start time is wrong"
 msgstr "ØÙÙ ØÙØØØ ØØØØ"
 
-#: ../calendar/gui/dialogs/event-page.c:1369
+#: ../calendar/gui/dialogs/event-page.c:1479
 msgid "End time is wrong"
 msgstr "ØÙÙ ØÙØÙØÙØØ ØØØØ"
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/memo-page.c:712
-#: ../calendar/gui/dialogs/task-page.c:967
-msgid "The organizer selected no longer has an account."
-msgstr "ØÙÙÙØÙÙ ØÙÙÙØÙÙ ÙÙ ÙØØ ÙÙØÙÙ ØØØØÙØ."
-
-#: ../calendar/gui/dialogs/event-page.c:1539
-#: ../calendar/gui/dialogs/memo-page.c:718
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1644
+#: ../calendar/gui/dialogs/memo-page.c:749
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "An organizer is required."
 msgstr "ÙØÙÙØ ÙÙØÙÙ."
 
-#: ../calendar/gui/dialogs/event-page.c:1564
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1678
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "At least one attendee is required."
 msgstr "ØØØØØ ØÙÙ ØØØØÙ ÙØØØ ØÙÙ ØÙØÙÙ."
 
-#: ../calendar/gui/dialogs/event-page.c:2654
-#, c-format
-msgid "Unable to open the calendar '%s'."
+#: ../calendar/gui/dialogs/event-page.c:1885
+msgid "_Delegatees"
+msgstr "_ÙÙÙÙÙØÙÙ"
+
+#: ../calendar/gui/dialogs/event-page.c:1887
+msgid "Atte_ndees"
+msgstr "ØÙ_ØØÙØ"
+
+#: ../calendar/gui/dialogs/event-page.c:2921
+#, fuzzy, c-format
+msgid "Unable to open the calendar '%s': %s"
 msgstr "ØØØØ ÙØØ ØÙØÙÙÙÙ '%s'."
 
 #. Translators: This string is used when we are creating an Event
-#. (meeting or appointment)  on behalf of some other user
+#. * (meeting or appointment)  on behalf of some other user
 #. Translators: This string is used when we are creating a Memo
-#. on behalf of some other user
+#. * on behalf of some other user
 #. Translators: This string is used when we are creating a Task
-#. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2698
-#: ../calendar/gui/dialogs/memo-page.c:931
-#: ../calendar/gui/dialogs/task-page.c:1787
+#. * on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2998
+#: ../calendar/gui/dialogs/memo-page.c:1012
+#: ../calendar/gui/dialogs/task-page.c:1838
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ØÙØ ØØØØÙ ØØÙÙÙØØØ ØÙ %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3009
+#: ../calendar/gui/dialogs/event-page.c:3325
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -3017,7 +3054,7 @@ msgstr[3] "%d ØÙØÙ ÙØÙ ØÙÙÙØØ"
 msgstr[4] "%d ÙÙÙÙØ ÙØÙ ØÙÙÙØØ"
 msgstr[5] "%d ÙÙÙ ÙØÙ ØÙÙÙØØ"
 
-#: ../calendar/gui/dialogs/event-page.c:3015
+#: ../calendar/gui/dialogs/event-page.c:3331
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -3028,7 +3065,7 @@ msgstr[3] "%d ØØØØØ ÙØÙ ØÙÙÙØØ"
 msgstr[4] "%d ØØØØ ÙØÙ ØÙÙÙØØ"
 msgstr[5] "%d ØØØØ ÙØÙ ØÙÙÙØØ"
 
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3337
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -3039,94 +3076,155 @@ msgstr[3] "%d ØÙØØÙ ÙØÙ ØÙÙÙØØ"
 msgstr[4] "%d ØÙÙÙØ ÙØÙ ØÙÙÙØØ"
 msgstr[5] "%d ØÙÙÙØ ÙØÙ ØÙÙÙØØ"
 
-#: ../calendar/gui/dialogs/event-page.c:3040
+#: ../calendar/gui/dialogs/event-page.c:3356
 msgid "Customize"
 msgstr "ØØÙØ"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3046
-msgctxt "cal-alarms"
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3362
+#, fuzzy
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "ÙØ ØÙØ"
 
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-#, fuzzy
-msgid "1 day before appointment"
-msgstr "ÙÙÙ ÙØØØ ÙØÙ ØÙÙÙØØ"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-#, fuzzy
-msgid "1 hour before appointment"
-msgstr "ØØØØ ÙØØØØ ÙØÙ ØÙÙÙØØ"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#, fuzzy
-msgid "15 minutes before appointment"
-msgstr "15 ØÙÙÙØ ÙØÙ ØÙÙÙØØ"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:564
 msgid "Atte_ndees..."
 msgstr "ØÙØÙ_ØÙØ..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-msgid "Custom Alarm:"
-msgstr "ÙÙØÙÙ ÙØØÙØ:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#, fuzzy
+msgid "Custom Reminder:"
+msgstr "ØØÙÙØØ ÙØØØØ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "ÙØÙ ØÙØØØ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "ØÙÙÙØÙØ ØÙ_ØÙÙÙÙÙØ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-msgid "_Alarm"
-msgstr "_ÙÙØÙÙ"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:343
+#: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "ØÙ_ÙØÙ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../plugins/calendar-weather/calendar-weather.c:362
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "ØÙ_ÙÙÙØ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#, fuzzy
+msgid "_Reminder"
+msgstr "ØØÙÙØ!"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "Ù_ÙØÙØ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "ØÙ_ÙÙØ:"
 
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#, fuzzy
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "ÙÙÙ ÙØØØ ÙØÙ ØÙÙÙØØ"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#, fuzzy
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "ØØØØ ÙØØØØ ÙØÙ ØÙÙÙØØ"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+#, fuzzy
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 ØÙÙÙØ ÙØÙ ØÙÙÙØØ"
+
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 #, fuzzy
+msgctxt "eventpage"
 msgid "for"
 msgstr "ÙÙØÙØ"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:25
 #, fuzzy
+msgctxt "eventpage"
 msgid "until"
 msgstr "ØØÙÙ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3176
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "ØØØÙÙ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "ØØØØØ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "ØÙØÙØØ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr "ÙØØØÙØ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr "ÙÙØÙØ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "ÙÙÙÙÙ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "ÙÙÙÙÙ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "ÙØØØ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "ÙØÙÙ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "ÙÙÙÙØØ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "ØÙØÙØØ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "ØÙØÙÙ ØØØÙØÙØ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+msgid "Select _Today"
+msgstr "ØÙØÙØØ ØÙ_ÙÙÙ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "ØØØÙØØ"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
 msgid "Memo"
 msgstr "ØØÙÙØ"
 
@@ -3134,27 +3232,27 @@ msgstr "ØØÙÙØ"
 msgid "Print this memo"
 msgstr "ØØØØ ÙØÙ ØÙÙØÙØØ"
 
-#: ../calendar/gui/dialogs/memo-page.c:337
+#: ../calendar/gui/dialogs/memo-page.c:405
 msgid "Memo's start date is in the past"
 msgstr "ØØØÙØ ØØØÙØ ØÙÙØÙØØ ÙÙ ØÙÙØØÙ"
 
-#: ../calendar/gui/dialogs/memo-page.c:375
+#: ../calendar/gui/dialogs/memo-page.c:442
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ÙØ ÙÙÙÙ ØØØÙØ ØÙÙØÙØØ ÙØÙÙ ØÙØÙÙÙÙ ØÙÙØØØ ÙÙÙØØØØ ÙÙØ"
 
-#: ../calendar/gui/dialogs/memo-page.c:379
+#: ../calendar/gui/dialogs/memo-page.c:446
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-page.c:892
-#, c-format
-msgid "Unable to open memos in '%s'."
+#: ../calendar/gui/dialogs/memo-page.c:936
+#, fuzzy, c-format
+msgid "Unable to open memos in '%s': %s"
 msgstr "ÙØ ÙÙÙÙ ÙØØ ØÙØØÙÙØ ÙÙ '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1063 ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2396
-#: ../mail/em-format-html.c:2461 ../mail/em-format-html.c:2485
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2592
+#: ../mail/em-format-html.c:2657 ../mail/em-format-html.c:2681
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "ØÙÙ"
 
@@ -3173,62 +3271,63 @@ msgid "T_o:"
 msgstr "Ø_ÙÙ:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:422
+#: ../calendar/gui/dialogs/task-page.c:333
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "Ù_ØÙÙØØ:"
+#, fuzzy
+msgid "_List:"
+msgstr "ÙØØÙØ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "ØÙØ ØØØØ ØØØÙÙ ØØØ ÙØÙØÙØØ ÙØ ØÙØÙ ØÙØ ØØØÙÙÙØ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:57
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "ØÙØ ØØØØ ØÙÙÙØ ØØØ ÙØÙØÙØØ ÙØ ØÙØÙ ØÙØ ØØØÙÙÙØ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:61
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "ØÙØ ØØØØ ØØØÙÙ ÙÙÙÙØ ÙØÙØÙØØØ ÙØ ØÙØÙ ØÙØ ØØØÙÙÙØ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:65
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "ØÙØ ØØØØ ØØØÙÙ ÙØÙØØ ÙØÙØÙØØØ ÙØ ØÙØÙ ØÙØ ØØØÙÙÙØ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This Instance Only"
 msgstr "ÙØÙ ØÙØØÙØ ÙÙØ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Prior Instances"
 msgstr "ÙØÙ ØÙØØÙØ Ù ØÙØØÙØØ ØÙØÙØØÙØ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:101
 msgid "This and Future Instances"
 msgstr "ÙØÙ ØÙØØÙØ Ù ØÙØØÙØØ ØÙÙØØÙØ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:106
 msgid "All Instances"
 msgstr "ÙÙ ØÙØØÙØØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:575
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ÙØØÙÙ ÙØØ ØÙÙÙØØ ÙØÙØÙØØØ ÙØ ÙØØØÙØ ØÙÙÙÙÙÙØÙÙ ØÙ ÙØØÙÙÙØ."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:895
+#: ../calendar/gui/dialogs/recurrence-page.c:964
 msgid "Recurrence date is invalid"
 msgstr "ØØØÙØ ØÙØÙÙØØØ ØÙØ ØØÙØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:935
+#: ../calendar/gui/dialogs/recurrence-page.c:1004
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:965
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "on"
 msgstr "ÙÙÙ"
 
@@ -3236,7 +3335,7 @@ msgstr "ÙÙÙ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1023
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 msgid "first"
 msgstr "ØÙÙÙ"
 
@@ -3245,7 +3344,7 @@ msgstr "ØÙÙÙ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
 msgid "second"
 msgstr "ØØÙÙ"
 
@@ -3253,7 +3352,7 @@ msgstr "ØØÙÙ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "third"
 msgstr "ØØÙØ"
 
@@ -3261,7 +3360,7 @@ msgstr "ØØÙØ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 msgid "fourth"
 msgstr "ØÙØØØ"
 
@@ -3269,7 +3368,7 @@ msgstr "ØÙØØØ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 msgid "fifth"
 msgstr "ØØÙØ"
 
@@ -3277,13 +3376,13 @@ msgstr "ØØÙØ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 msgid "last"
 msgstr "ØØØ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1147
 msgid "Other Date"
 msgstr "ØØØÙØ ØØØ"
 
@@ -3291,7 +3390,7 @@ msgstr "ØØØÙØ ØØØ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1153
 msgid "1st to 10th"
 msgstr "ØÙØÙÙ ÙÙØØØØ"
 
@@ -3299,7 +3398,7 @@ msgstr "ØÙØÙÙ ÙÙØØØØ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
 msgid "11th to 20th"
 msgstr "ØÙØØØÙ ØØØ ÙÙØØØÙÙ"
 
@@ -3307,80 +3406,73 @@ msgstr "ØÙØØØÙ ØØØ ÙÙØØØÙÙ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "21st to 31st"
 msgstr "ØÙÙØØØ ÙØÙØØØÙÙ ÙÙÙØØØ ÙØÙØÙØØÙÙ"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-msgid "day"
-msgstr "ÙÙÙ"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Monday"
 msgstr "ØÙØØÙÙÙ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "ØÙØÙÙØØØØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "ØÙØØØØØØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "ØÙØÙÙØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "ØÙØÙØØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "ØÙØÙØØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "ØÙØØØ"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1245
+#: ../calendar/gui/dialogs/recurrence-page.c:1321
 msgid "on the"
 msgstr "ØÙØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1496
 msgid "occurrences"
 msgstr "ØØÙØØØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2123
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
 msgid "Add exception"
 msgstr "ØØÙÙ ØØØØÙØØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2255
 msgid "Could not get a selection to modify."
 msgstr "ÙÙ ØØØ ÙÙØÙÙ ÙØØØÙÙÙ."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2170
+#: ../calendar/gui/dialogs/recurrence-page.c:2261
 msgid "Modify exception"
 msgstr "ØØÙÙ ØÙØØØØÙØØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2305
 msgid "Could not get a selection to delete."
 msgstr "ÙÙ ØØØ ÙÙØÙÙ ÙØØÙÙÙ."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2348
+#: ../calendar/gui/dialogs/recurrence-page.c:2439
 msgid "Date/Time"
 msgstr "ØÙØÙØØÙØ/ØÙÙÙØ"
 
@@ -3392,7 +3484,7 @@ msgstr "ÙÙ"
 msgid "Exceptions"
 msgstr "ØÙØØØØÙØØØØ"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
 msgstr "ÙØØÙÙØ"
 
@@ -3401,54 +3493,77 @@ msgid "This appointment rec_urs"
 msgstr "ÙØ_ÙØÙØ ÙØØ ØÙÙÙØØ"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "ØÙÙØÙ"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#, fuzzy
+msgctxt "recurrpage"
+msgid "for"
+msgstr "ÙÙ"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 #, fuzzy
+msgctxt "recurrpage"
 msgid "forever"
 msgstr "ØÙÙ ØÙØØØ"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 #, fuzzy
+msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "ØØÙØ"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "ØØÙÙ"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
 #, fuzzy
+msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "ØØØØÙØ"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 #, fuzzy
+msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ØÙÙØØ"
 
-#: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
-msgstr ""
+#: ../calendar/gui/dialogs/send-comp.c:198
+msgid "Send my reminders with this event"
+msgstr "ØØØÙ ÙÙØÙÙØØÙ ÙØ ÙØØ ØÙØØØ"
 
-#: ../calendar/gui/dialogs/send-comp.c:194
+#: ../calendar/gui/dialogs/send-comp.c:200
 #, fuzzy
 msgid "Notify new attendees _only"
 msgstr "ØÙÙÙÙØ ØÙ ØÙØØØØÙ ØÙØØÙØØ ÙÙØØÙØ ØÙÙØÙØ ÙÙØ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:374
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
 msgid "Completed date is wrong"
 msgstr "ØØØÙØ ØÙØÙØØØ ØØØØ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:486
+#: ../calendar/gui/dialogs/task-details-page.c:488
 msgid "Web Page"
 msgstr "ØÙØØ ØÙÙÙØ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:596
-#: ../calendar/gui/print.c:3262 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../calendar/gui/e-cal-model-tasks.c:440
+#: ../calendar/gui/e-cal-model-tasks.c:725 ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:606
+#: ../calendar/gui/print.c:3400 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3456,59 +3571,59 @@ msgstr "ØÙÙØÙÙÙ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-cal-model-tasks.c:437
-#: ../calendar/gui/e-cal-model-tasks.c:711
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:595 ../calendar/gui/print.c:3259
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:723
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
 msgid "Completed"
 msgstr "ÙÙÙØØ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:313
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1228 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "ÙØØÙØ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:288
-#: ../calendar/gui/e-cal-model-tasks.c:435
-#: ../calendar/gui/e-cal-model-tasks.c:709
-#: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3256
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:721
+#: ../calendar/gui/e-cal-model-tasks.c:799 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:604
+#: ../calendar/gui/print.c:3394
 msgid "In Progress"
 msgstr "ÙÙ ØÙØÙÙ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:528 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "ÙÙØÙØ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model.c:1521 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1227
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1578 ../calendar/gui/e-task-table.c:527
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1273
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "ØØØÙ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../calendar/gui/e-cal-model-tasks.c:433
-#: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3253 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-model-tasks.c:434
+#: ../calendar/gui/e-cal-model-tasks.c:719 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/print.c:3391 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "ÙÙ ÙØØØ"
 
@@ -3521,11 +3636,11 @@ msgid "Stat_us:"
 msgstr "ØÙØØ_ÙØ:"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
+#. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1831
-#: ../calendar/gui/e-meeting-list-view.c:596
+#: ../calendar/gui/e-calendar-view.c:1854
+#: ../calendar/gui/e-meeting-list-view.c:635
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -3534,8 +3649,8 @@ 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
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "ØÙØ ÙØØÙÙ"
 
@@ -3544,7 +3659,7 @@ msgid "_Date completed:"
 msgstr "_ØØØÙØ ØÙØÙØØØ:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "ØÙØ_ÙÙÙÙÙØ:"
 
@@ -3552,61 +3667,60 @@ msgstr "ØÙØ_ÙÙÙÙÙØ:"
 msgid "_Web Page:"
 msgstr "_ØÙØØ ØÙÙÙØ:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "ØÙØØÙÙ ØÙ_ØØÙØ"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "ØÙÙØ ÙØØÙØ ØÙ ØØØ ØÙØØÙÙ ØØÙØ ØÙÙÙÙØ"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../calendar/gui/dialogs/task-editor.c:126
 msgid "_Send Options"
 msgstr "ØÙØØØØ ØÙØØ_ØØÙ"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:3174
-#: ../widgets/misc/e-send-options.c:526
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "ÙÙÙÙÙØ"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "ØÙØØÙÙ ØÙÙÙÙÙØ"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
 msgstr "ØØØØ ÙØÙ ØÙÙÙÙØ"
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:251
 msgid "Task's start date is in the past"
 msgstr "ØØØÙØ ØØØÙØ ØÙÙÙÙØ ÙÙ ØÙÙØØÙ"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:252
 msgid "Task's due date is in the past"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:375
+#: ../calendar/gui/dialogs/task-page.c:286
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ÙØ ÙÙÙÙ ØØØÙØ ØÙÙÙÙØ ÙØÙÙ ÙØØÙØ ØÙÙÙØÙÙ ØÙÙØØØØ ÙÙÙØØØØ ÙÙØ"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:290
 #, fuzzy
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ÙØ ÙÙÙÙ ØØØØÙ ÙØÙ ØÙØØØÙØ ÙØÙÙ ÙÙ ØØØØ ØÙ ÙØØÙÙÙÙ ÙÙØ"
 
-#: ../calendar/gui/dialogs/task-page.c:430
+#: ../calendar/gui/dialogs/task-page.c:341
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "ØÙÙÙ_ØÙÙ:"
 
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:801
 msgid "Due date is wrong"
 msgstr "ØØØÙØ ØÙØØØØÙØÙ ØØØØ"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
-#, c-format
-msgid "Unable to open tasks in '%s'."
+#: ../calendar/gui/dialogs/task-page.c:1757
+#, fuzzy, c-format
+msgid "Unable to open tasks in '%s': %s"
 msgstr "ÙØ ÙÙÙÙ ÙØØ ØÙÙÙÙÙØ ÙÙ '%s'."
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
@@ -3622,7 +3736,7 @@ msgid "Time zone:"
 msgstr "ØÙÙÙØÙØ ØÙØÙÙÙÙØ:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3634,7 +3748,7 @@ msgstr[4] "%d ÙÙÙÙØ"
 msgstr[5] "%d ÙÙÙ"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:387
+#: ../calendar/gui/e-alarm-list.c:399
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -3645,109 +3759,109 @@ msgstr[3] "%d ØØØØÙØ"
 msgstr[4] "%d ØØØÙØÙØ"
 msgstr[5] "%d ØØØÙØ"
 
-#: ../calendar/gui/e-alarm-list.c:449
+#: ../calendar/gui/e-alarm-list.c:461
 msgid "Unknown action to be performed"
 msgstr "ØÙØØØØØ ØÙÙØÙÙØ ØØØØÙ ÙØÙÙÙ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:463
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s ÙØÙ ØØØØØØ ØÙÙÙØØ ØÙ%s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:468
+#: ../calendar/gui/e-alarm-list.c:480
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s ØØØ ØØØØØØ ØÙÙÙØØ ØÙ%s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ØÙØ ØØØØØØ ØÙÙÙØØ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:498
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s ÙØÙ ØÙØÙØØ ØÙÙÙØØ ØÙ%s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s ØØØ ØÙØÙØØ ØÙÙÙØØ ØÙ%s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:510
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ØÙØ ØÙØÙØØ ØÙÙÙØØ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:522
+#: ../calendar/gui/e-alarm-list.c:534
 #, c-format
 msgid "%s at %s"
 msgstr "%s ØÙØ ØÙØØØØ %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:530
+#: ../calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s ÙÙÙØÙÙØ ÙØÙÙØ ÙØÙÙÙØ"
 
-#: ../calendar/gui/e-cal-component-preview.c:188 ../filter/e-filter-rule.c:667
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
 msgid "Untitled"
 msgstr "ØØÙÙ ØÙÙØÙ"
 
-#: ../calendar/gui/e-cal-component-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "ØÙÙØØØ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "ÙÙØÙØ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "ØØØÙØ ØÙØØØ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "ØØØÙØ ØÙØØØØÙØÙ:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:284
-#: ../plugins/itip-formatter/itip-view.c:1075
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1083
 msgid "Status:"
 msgstr "ØÙØØÙØ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "ØÙØÙÙÙÙÙØ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "ØÙÙØÙ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "ØÙØØ ØÙÙÙØ:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Created"
 msgstr "ØØØÙØ ØÙØÙØØØ"
 
@@ -3767,17 +3881,17 @@ msgstr "ÙØÙÙÙØ"
 msgid "Start Date"
 msgstr "ØØØÙØ ØÙØØØ"
 
-#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:570
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:580
 msgid "Free"
 msgstr "ÙØÙØÙØ"
 
-#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:571
+#: ../calendar/gui/e-cal-model-calendar.c:191
+#: ../calendar/gui/e-meeting-time-sel.c:547 ../calendar/gui/e-task-table.c:581
 msgid "Busy"
 msgstr "ÙØØÙÙ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-cal-model-tasks.c:665
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3788,44 +3902,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:705
+#: ../calendar/gui/e-cal-model-tasks.c:717
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "ÙØ ØÙØ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1027
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:1053
 msgid "Yes"
 msgstr "ÙØÙ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "ÙØ"
 
-#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:1109 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2485
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1151
+#: ../calendar/gui/print.c:1168 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:102
+#: ../plugins/itip-formatter/itip-formatter.c:469
+#: ../plugins/itip-formatter/itip-formatter.c:2697
 msgid "Unknown"
 msgstr "ÙØÙÙÙ"
 
-#: ../calendar/gui/e-cal-model.c:1523
+#: ../calendar/gui/e-cal-model.c:1580
 msgid "Recurring"
 msgstr "ÙØÙØÙØ"
 
-#: ../calendar/gui/e-cal-model.c:1525
+#: ../calendar/gui/e-cal-model.c:1582
 msgid "Assigned"
 msgstr "ÙÙØÙÙØØ"
 
-#: ../calendar/gui/e-cal-model.c:2643
+#: ../calendar/gui/e-cal-model.c:2910
 #, c-format
 msgid "Opening %s"
 msgstr "ÙØØÙ ÙØØ %s"
@@ -3853,7 +3967,7 @@ msgstr "ØØØÙØ ØÙØØØØÙØÙ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "ØÙØÙÙÙÙÙØ"
 
@@ -3862,96 +3976,98 @@ msgid "Start date"
 msgstr "ØØØÙØ ØÙØØØ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:559
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:580
+#: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "ØÙÙÙÙØ"
 
-#: ../calendar/gui/e-calendar-view.c:422
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Cut selected events to the clipboard"
 msgstr "ÙØ ØÙØØØØØ ØÙÙÙØÙØØ ØÙÙ ØÙØØÙØØ"
 
-#: ../calendar/gui/e-calendar-view.c:428
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Copy selected events to the clipboard"
 msgstr "ØÙØØ ØÙØØØØØ ØÙÙÙØÙØØ ØÙÙ ØÙØØÙØØ"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Paste events from the clipboard"
 msgstr "ØÙØÙ ØÙØØØØØ ÙÙ ØÙØØÙØØ"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Delete selected events"
 msgstr "ØØØÙ ØÙØØØØØ ØÙÙÙÙØÙØØ"
 
-#: ../calendar/gui/e-calendar-view.c:459 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:261
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "ÙØØÙ ØØÙ ØÙÙØØÙØØ ØÙÙÙØÙØØ"
 
-#: ../calendar/gui/e-calendar-view.c:653 ../calendar/gui/e-memo-table.c:855
-#: ../calendar/gui/e-task-table.c:1084
+#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1104
 msgid "Updating objects"
 msgstr "ÙØØÙ ØØØÙØ ØÙÙØØÙÙØØ"
 
-#: ../calendar/gui/e-calendar-view.c:1778
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../plugins/itip-formatter/itip-formatter.c:2473
+#: ../calendar/gui/e-calendar-view.c:1801
+#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2685
 msgid "Accepted"
 msgstr "ÙÙØÙÙ"
 
-#: ../calendar/gui/e-calendar-view.c:1779
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../plugins/itip-formatter/itip-formatter.c:2479
+#: ../calendar/gui/e-calendar-view.c:1802
+#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "Declined"
 msgstr "ÙØÙÙØ"
 
-#: ../calendar/gui/e-calendar-view.c:1780
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-calendar-view.c:1803
+#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/e-meeting-time-sel.c:546
 msgid "Tentative"
 msgstr "ÙØØØÙ"
 
-#: ../calendar/gui/e-calendar-view.c:1781
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../calendar/gui/e-calendar-view.c:1804
+#: ../calendar/gui/e-meeting-list-view.c:217
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "Delegated"
 msgstr "ÙÙÙÙØ"
 
-#: ../calendar/gui/e-calendar-view.c:1782
+#: ../calendar/gui/e-calendar-view.c:1805
 #, fuzzy
 msgid "Needs action"
 msgstr "ÙØØÙÙØ ØØØØØ"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:538
-#: ../calendar/gui/e-task-table.c:759
+#. To Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1949 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:770
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ØÙÙÙØÙÙ: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:543
-#: ../calendar/gui/e-task-table.c:762
+#. With SunOne accounts, there may be no ':' in
+#. * organizer.value.
+#: ../calendar/gui/e-calendar-view.c:1953 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:774
 #, c-format
 msgid "Organizer: %s"
 msgstr "ØÙÙÙØÙÙ: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
 #, c-format
 msgid "Location: %s"
 msgstr "ØÙÙÙÙØ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1977
+#: ../calendar/gui/e-calendar-view.c:2000
 #, c-format
 msgid "Time: %s %s"
 msgstr "ØÙÙÙØ: %s %s"
@@ -3979,82 +4095,83 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:745
+#: ../calendar/gui/e-day-view-time-item.c:809
 #, c-format
 msgid "%02i minute divisions"
 msgstr "ØÙØØÙ ØÙ %02i ØÙÙÙØ"
 
-#: ../calendar/gui/e-day-view-time-item.c:766
+#: ../calendar/gui/e-day-view-time-item.c:830
 #, fuzzy
 msgid "Show the second time zone"
 msgstr "ØØÙØ ÙÙØ \"ØÙÙØØÙÙØ\""
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:783
-#: ../modules/calendar/e-calendar-preferences.c:175
-#: ../modules/calendar/e-calendar-preferences.c:224
+#: ../calendar/gui/e-day-view-time-item.c:847
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:231
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "ÙØ ØÙØ"
 
-#: ../calendar/gui/e-day-view-time-item.c:810
-#: ../calendar/gui/e-timezone-entry.c:316
-#: ../modules/calendar/e-calendar-preferences.c:251
+#: ../calendar/gui/e-day-view-time-item.c:879
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:258
 msgid "Select..."
 msgstr "ØØØØ..."
 
 #. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
+#. * %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %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-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1793
-#: ../calendar/gui/e-week-view-main-item.c:208 ../calendar/gui/print.c:1866
+#. * 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:848 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
+#. * %b = abbreviated month name. Don't use any other specifiers.
 #. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1810
-#: ../calendar/gui/e-week-view-main-item.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:1005
+#. * %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:852 ../calendar/gui/e-day-view.c:1836
+#: ../calendar/gui/e-week-view-main-item.c:224
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
+#. * 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:849 ../calendar/gui/e-day-view.c:1826
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1041
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1852
+#: ../calendar/gui/e-week-view-main-item.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../modules/calendar/e-cal-shell-view-private.c:1090
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:920 ../calendar/gui/print.c:939
-#: ../calendar/gui/print.c:2363 ../calendar/gui/print.c:2383
+#: ../calendar/gui/e-day-view.c:1019 ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:977 ../calendar/gui/print.c:996
+#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
 msgid "am"
 msgstr "Ø"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:925 ../calendar/gui/print.c:941
-#: ../calendar/gui/print.c:2368 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:982 ../calendar/gui/print.c:998
+#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
 msgid "pm"
 msgstr "Ù"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2606
+#: ../calendar/gui/e-day-view.c:2636
 #, c-format
 msgid "Week %d"
 msgstr "ØÙØØØÙØ %d"
@@ -4075,164 +4192,172 @@ msgstr "ØÙÙØØØÙÙÙ ØÙØØØÙØØÙÙÙÙ"
 msgid "Resources"
 msgstr "ØÙÙÙØØØ"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1147
 msgid "Individual"
 msgstr "ÙØØ"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1089 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1148 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "ÙØÙÙØØ"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1090
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1149
 msgid "Resource"
 msgstr "ØÙÙÙØØ"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1091
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1150
 msgid "Room"
 msgstr "ØÙØØÙØ"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1105
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/print.c:1164
 msgid "Chair"
 msgstr "ØÙÙØØÙ"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1024 ../calendar/gui/print.c:1106
+#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1165
 msgid "Required Participant"
 msgstr "ÙØØØÙ ØØÙØÙ"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1107
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1166
 msgid "Optional Participant"
 msgstr "ÙØØØÙ ØØØÙØØÙ"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1108
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1167
 msgid "Non-Participant"
 msgstr "ØÙØ ÙØØØÙ"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1034
+#: ../calendar/gui/e-meeting-list-view.c:213
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1060
 msgid "Needs Action"
 msgstr "ÙØØÙÙØ ØØØØØ"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:539
+#: ../calendar/gui/e-meeting-list-view.c:578
 msgid "Attendee                          "
 msgstr "ØÙØØØØ                     "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-list-view.c:623
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "ØØÙÙØ ØÙØØÙØ"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "ÙÙØ ØÙØÙÙ"
 
-#: ../calendar/gui/e-meeting-store.c:1763
+#: ../calendar/gui/e-meeting-store.c:1876
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:1772
+#: ../calendar/gui/e-meeting-store.c:1886
 #, c-format
 msgid "Failure reason: %s"
 msgstr "ØØØ ØÙÙØÙ: %s"
 
+#: ../calendar/gui/e-meeting-store.c:1891
+#: ../plugins/caldav/caldav-browse-server.c:957
+#: ../plugins/google-account-setup/google-source.c:460
+#: ../plugins/publish-calendar/publish-calendar.c:345
+#: ../smime/gui/component.c:53
+msgid "Enter password"
+msgstr "ØØØÙ ÙÙÙØ ØÙØ"
+
 #. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:431
-#: ../calendar/gui/e-meeting-time-sel.c:2380
+#. * %B = full month name, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:2379
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
+#. * 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:435
-#: ../calendar/gui/e-meeting-time-sel.c:2411
+#. * %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:2410
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:439
+#. * %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:453
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Out of Office"
 msgstr "ØØØØ ØÙÙÙØØ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "No Information"
 msgstr "ÙØ ÙØÙÙÙØØ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:584
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "O_ptions"
 msgstr "_ØÙØØØØ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:602
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "ØØÙØ ØØØØØ ØÙØÙÙ _ÙÙØ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:613
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "Show _zoomed out"
 msgstr "ØØÙØ Ù_ØØØÙØ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:629
+#: ../calendar/gui/e-meeting-time-sel.c:630
 msgid "_Update free/busy"
 msgstr "_ØØÙØ ÙØÙØÙØ/ÙØØÙÙ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:645
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:662
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "Ø_ØØØ ØÙÙØØÙÙØ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:678
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:695
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "_ÙÙ ØÙØØØØØ ÙØÙÙÙØØØ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:705
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "All _people and one resource"
 msgstr "ÙÙ ØÙØ_ØØØØ Ù ÙÙØÙØ ÙØØØ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:715
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "ØÙØØØØØ ØÙ_ØØÙØÙÙÙ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:725
 msgid "Required people and _one resource"
 msgstr "ØÙØØØØØ ØÙØØÙØÙÙÙ Ù _ÙÙØØ ÙØØØ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:773
+#: ../calendar/gui/e-meeting-time-sel.c:774
 msgid "_Start time:"
 msgstr "ØÙÙ ØÙ_ØØØ:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:813
+#: ../calendar/gui/e-meeting-time-sel.c:814
 msgid "_End time:"
 msgstr "ØÙÙ ØÙØ_ÙØÙØØ:"
 
@@ -4260,47 +4385,47 @@ msgstr "ØÙÙÙØØ"
 msgid "Member"
 msgstr "ØØÙ"
 
-#: ../calendar/gui/e-memo-table.c:419
-#: ../modules/calendar/e-cal-shell-content.c:469
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:438
+#: ../calendar/gui/e-memo-table.c:420
+#: ../modules/calendar/e-cal-shell-content.c:473
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view.c:293
+#: ../plugins/caldav/caldav-browse-server.c:458
 msgid "Memos"
 msgstr "ØÙØØÙÙØØØ"
 
-#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:723
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
 msgid "* No Summary *"
 msgstr "* ÙØ ÙÙØØ *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
 msgid "Start: "
 msgstr "ÙØØØ:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
 msgid "Due: "
 msgstr "ÙÙØØØ: "
 
-#: ../calendar/gui/e-memo-table.c:720
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Cut selected memos to the clipboard"
 msgstr "ÙØ ØÙÙØÙØØØ ØÙÙÙÙØÙØØ ØÙÙ ØÙØØÙØØ"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Copy selected memos to the clipboard"
 msgstr "ØÙØØ ØÙÙØÙØØØ ØÙÙÙØÙØØ ØÙÙ ØÙØØÙØØ"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:738
 msgid "Paste memos from the clipboard"
 msgstr "ØÙØÙ ØÙÙØÙØØØ ÙÙ ØÙØØÙØØ"
 
-#: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Delete selected memos"
 msgstr "ØØØÙ ØÙØØÙÙØØØ ØÙÙÙÙØÙØØ"
 
-#: ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-memo-table.c:750
 #, fuzzy
 msgid "Select all visible memos"
 msgstr "ØÙØÙÙ ØÙÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ"
@@ -4310,116 +4435,114 @@ msgid "Click to add a memo"
 msgstr "ØÙÙØ ÙØØØÙØ ØØÙÙØØ"
 
 #. Translators: "%d%%" is the percentage of a task done.
-#. %d is the actual value, %% is replaced with a percent sign.
-#. Result values will be 0%, 10%, 20%, ... 100%
+#. * %d is the actual value, %% is replaced with a percent sign.
+#. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:545
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:642 ../calendar/gui/print.c:2159
-#: ../calendar/importers/icalendar-importer.c:81
-#: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:430
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:444
-#: ../plugins/caldav/caldav-browse-server.c:436
-#: ../plugins/groupwise-features/camel-gw-listener.c:428
-#: ../plugins/groupwise-features/camel-gw-listener.c:569
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:1043
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-cal-shell-content.c:434
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:456
 msgid "Tasks"
 msgstr "ØÙÙÙØÙ"
 
-#: ../calendar/gui/e-task-table.c:949
+#: ../calendar/gui/e-task-table.c:968
 msgid "Cut selected tasks to the clipboard"
 msgstr "ÙØ ØÙÙÙØÙ ØÙÙÙÙØÙØØ ØÙÙ ØÙØØÙØØ"
 
-#: ../calendar/gui/e-task-table.c:955
+#: ../calendar/gui/e-task-table.c:974
 msgid "Copy selected tasks to the clipboard"
 msgstr "ØÙØØ ØÙÙÙØÙ ØÙÙÙÙØÙØØ ØÙÙ ØÙØØÙØØ"
 
-#: ../calendar/gui/e-task-table.c:961
+#: ../calendar/gui/e-task-table.c:980
 msgid "Paste tasks from the clipboard"
 msgstr "ØÙØÙ ÙÙØÙ ÙÙ ØÙØØÙØØ"
 
-#: ../calendar/gui/e-task-table.c:967
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../calendar/gui/e-task-table.c:986
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "Delete selected tasks"
 msgstr "ØØØÙ ØÙÙÙØÙ ØÙÙÙØÙØØ"
 
-#: ../calendar/gui/e-task-table.c:973
+#: ../calendar/gui/e-task-table.c:992
 #, fuzzy
 msgid "Select all visible tasks"
 msgstr "ØÙØÙØØ ØÙÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ"
 
-#: ../calendar/gui/e-timezone-entry.c:327
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "ØÙØÙÙ ÙÙØÙØ ØÙÙÙÙØ"
 
 #. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:225 ../calendar/gui/print.c:1847
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1949
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:286
-msgid "It has alarms."
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "It has reminders."
 msgstr "ÙÙ ÙÙØÙÙØØ."
 
-#: ../calendar/gui/ea-cal-view-event.c:289
+#: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
 msgstr "ÙÙ ØØØØØØ."
 
-#: ../calendar/gui/ea-cal-view-event.c:292
+#: ../calendar/gui/ea-cal-view-event.c:296
 msgid "It is a meeting."
 msgstr "ÙÙ ØØØÙØØ."
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:303
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "ØØØ ØÙÙÙÙ: ØÙÙÙØÙØ ÙÙ %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:306
 msgid "Calendar Event: It has no summary."
 msgstr "ØØØ ØÙÙÙÙ: ÙØ ÙÙØÙØ ÙÙ."
 
-#: ../calendar/gui/ea-cal-view-event.c:322
+#: ../calendar/gui/ea-cal-view-event.c:328
 msgid "calendar view event"
 msgstr "ÙØÙØ ØØØØØ ØÙØÙÙÙÙ"
 
-#: ../calendar/gui/ea-cal-view-event.c:551
+#: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
 msgstr "ØØØ ØØÙÙØ"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:315
 msgid "New Appointment"
 msgstr "ÙÙØØ ØØÙØ"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:316
 msgid "New All Day Event"
 msgstr "ØØØ ØØÙØ ÙØØØØÙ ÙÙÙÙØ ØØÙÙÙÙ"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:317
 msgid "New Meeting"
 msgstr "ØØØÙØØ ØØÙØ"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:318
 msgid "Go to Today"
 msgstr "ØØÙØ ØÙÙ ØÙÙÙÙ ØÙØØÙÙ"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:319
 msgid "Go to Date"
 msgstr "ØØÙØ ØÙÙ ØÙØØØÙØ"
 
-#: ../calendar/gui/ea-day-view-main-item.c:308
-#: ../calendar/gui/ea-week-view-main-item.c:340
+#: ../calendar/gui/ea-day-view-main-item.c:318
+#: ../calendar/gui/ea-week-view-main-item.c:344
 msgid "a table to view and select the current time range"
 msgstr "ØØÙÙ ÙØØØ Ù ØØØÙØØ ØÙÙØÙ ØÙØÙÙÙ ØÙØØÙÙ"
 
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:147
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
 #, fuzzy, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4432,14 +4555,14 @@ msgstr[5] ""
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
 msgid "It has no events."
 msgstr "ÙÙØ ÙÙ ØØØØØ."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "ÙØÙØ ØØØÙØ ØÙØÙÙ: %s. %s"
@@ -4447,163 +4570,106 @@ msgstr "ÙØÙØ ØØØÙØ ØÙØÙÙ: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ÙØÙØ ØÙÙÙÙ: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:200
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "ÙØÙØ ØÙØÙÙÙÙ ÙØØØÙØ ØÙÙ"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "ÙØÙØ ØÙØÙÙÙÙ ÙÙÙÙ ØÙ ØÙØØ"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:860
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1077
 msgid "Gnome Calendar"
 msgstr "ØÙÙÙÙ ØÙÙÙ"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:1001
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:1008
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1057
+#: ../modules/calendar/e-cal-shell-view-private.c:1063
+#: ../modules/calendar/e-cal-shell-view-private.c:1066
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1034
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../modules/calendar/e-cal-shell-view-private.c:1083
+#: ../modules/calendar/e-cal-shell-view-private.c:1094
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
+#: ../modules/calendar/e-cal-shell-view-private.c:1104
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
-#: ../calendar/gui/ea-jump-button.c:147
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "ØØ ØÙÙÙØ"
 
-#: ../calendar/gui/ea-jump-button.c:156
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "ØÙÙÙØ ÙÙØ ÙØÙØØØ ØØØØØ ØØØÙ."
 
-#: ../calendar/gui/ea-week-view.c:155
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "ÙØÙØ ØÙØÙÙØ: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "ÙØÙØ ØÙØØØÙØ: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:193
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for a month"
 msgstr "ÙØÙØ ØÙØÙÙÙÙ ÙØÙØ"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:199
 msgid "calendar view for one or more weeks"
 msgstr "ÙØÙØ ØÙØÙÙÙÙ ÙØØØÙØ ØÙ ØÙØØ"
 
-#: ../calendar/gui/gnome-cal.c:2198
+#: ../calendar/gui/gnome-cal.c:2250
 msgid "Purging"
 msgstr "ØÙØÙÙÙÙØ"
 
-#: ../calendar/gui/goto-dialog.ui.h:1
-msgid "April"
-msgstr "ØØØÙÙ"
-
-#: ../calendar/gui/goto-dialog.ui.h:2
-msgid "August"
-msgstr "ØØØØØ"
-
-#: ../calendar/gui/goto-dialog.ui.h:3
-msgid "December"
-msgstr "ØÙØÙØØ"
-
-#: ../calendar/gui/goto-dialog.ui.h:4
-msgid "February"
-msgstr "ÙØØØÙØ"
-
-#: ../calendar/gui/goto-dialog.ui.h:5
-msgid "January"
-msgstr "ÙÙØÙØ"
-
-#: ../calendar/gui/goto-dialog.ui.h:6
-msgid "July"
-msgstr "ÙÙÙÙÙ"
-
-#: ../calendar/gui/goto-dialog.ui.h:7
-msgid "June"
-msgstr "ÙÙÙÙÙ"
-
-#: ../calendar/gui/goto-dialog.ui.h:8
-msgid "March"
-msgstr "ÙØØØ"
-
-#: ../calendar/gui/goto-dialog.ui.h:9
-msgid "May"
-msgstr "ÙØÙÙ"
-
-#: ../calendar/gui/goto-dialog.ui.h:10
-msgid "November"
-msgstr "ÙÙÙÙØØ"
-
-#: ../calendar/gui/goto-dialog.ui.h:11
-msgid "October"
-msgstr "ØÙØÙØØ"
-
-#: ../calendar/gui/goto-dialog.ui.h:12
-msgid "Select Date"
-msgstr "ØÙØÙÙ ØØØÙØÙØ"
-
-#: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
-msgid "Select _Today"
-msgstr "ØÙØÙØØ ØÙ_ÙÙÙ"
-
-#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "September"
-msgstr "ØØØÙØØ"
-
-#: ../calendar/gui/itip-utils.c:422 ../calendar/gui/itip-utils.c:477
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:566
+#: ../calendar/gui/itip-utils.c:669
 msgid "An organizer must be set."
 msgstr "ÙØØ ØØÙÙÙ ÙÙØÙÙ."
 
-#: ../calendar/gui/itip-utils.c:469
+#: ../calendar/gui/itip-utils.c:558
 msgid "At least one attendee is necessary"
 msgstr "ÙÙØÙÙÙ ØØØØÙ ÙØØØ ØÙÙ ØÙØÙÙ"
 
-#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
 msgid "Event information"
 msgstr "ÙØÙÙÙØØ ØÙØØØ"
 
-#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
 msgid "Task information"
 msgstr "ÙØÙÙÙØØ ØÙÙÙÙÙØ"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
 msgid "Memo information"
 msgstr "ÙØÙÙÙØØ ØÙÙØÙØØ"
 
-#: ../calendar/gui/itip-utils.c:666 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
 msgid "Free/Busy information"
 msgstr "ÙØÙÙÙØØ ÙØÙØÙØ/ÙØØÙÙ"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:767
 msgid "Calendar information"
 msgstr "ÙØÙÙÙØØ ØÙØÙÙÙÙ"
 
@@ -4611,7 +4677,7 @@ msgstr "ÙØÙÙÙØØ ØÙØÙÙÙÙ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:804
 #, fuzzy
 msgctxt "Meeting"
 msgid "Accepted"
@@ -4621,7 +4687,7 @@ msgstr "ÙÙØÙÙ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:811
 #, fuzzy
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
@@ -4634,7 +4700,7 @@ msgstr "ÙÙØÙÙ ÙØØØÙÙÙØ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720 ../calendar/gui/itip-utils.c:768
+#: ../calendar/gui/itip-utils.c:818 ../calendar/gui/itip-utils.c:866
 #, fuzzy
 msgctxt "Meeting"
 msgid "Declined"
@@ -4644,7 +4710,7 @@ msgstr "ÙØÙÙØ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:825
 #, fuzzy
 msgctxt "Meeting"
 msgid "Delegated"
@@ -4653,7 +4719,7 @@ msgstr "ÙÙÙÙØ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:838
 #, fuzzy
 msgctxt "Meeting"
 msgid "Updated"
@@ -4662,7 +4728,7 @@ msgstr "ØÙØÙØ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:845
 #, fuzzy
 msgctxt "Meeting"
 msgid "Cancel"
@@ -4671,7 +4737,7 @@ msgstr "ØÙØÙ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:852
 #, fuzzy
 msgctxt "Meeting"
 msgid "Refresh"
@@ -4680,240 +4746,253 @@ msgstr "ØØÙØ ØÙØÙØÙÙÙ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:859
 #, fuzzy
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ØÙØØØØ ÙØØÙØ"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:937
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ÙØÙÙÙØØ ÙØÙØÙØ/ÙØØÙÙ (%s ØÙÙ %s)"
 
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:945
 msgid "iCalendar information"
 msgstr "ÙØÙÙÙØØ iCalendar"
 
-#: ../calendar/gui/itip-utils.c:865
+#: ../calendar/gui/itip-utils.c:970
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:869
+#: ../calendar/gui/itip-utils.c:974
 msgid "Unable to book a resource, error: "
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:1032
+#: ../calendar/gui/itip-utils.c:1137
 msgid "You must be an attendee of the event."
 msgstr "ÙØØ ØÙ ØÙÙÙ ØØØØÙØ ÙÙØØØ."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "1st"
 msgstr "ØÙØÙÙÙ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "2nd"
 msgstr "ØÙØÙØÙÙ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "3rd"
 msgstr "ØÙØÙØÙØ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "4th"
 msgstr "ØÙØÙØØØ"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "5th"
 msgstr "ØÙØØÙØ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "6th"
 msgstr "ØÙØÙØØØ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "7th"
 msgstr "ØÙØÙØØØ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "8th"
 msgstr "ØÙØÙØÙÙ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "9th"
 msgstr "ØÙØÙØØØ"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "10th"
 msgstr "ØÙØØØØ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "11th"
 msgstr "ØÙØØØÙ ØØØ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "12th"
 msgstr "ØÙØÙØÙÙ ØØØ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "13th"
 msgstr "ØÙØÙØÙØ ØØØ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "14th"
 msgstr "ØÙØÙØØØ ØØØ"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "15th"
 msgstr "ØÙØØÙØ ØØØ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "16th"
 msgstr "ØÙØÙØØØ ØØØ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "17th"
 msgstr "ØÙØÙØØØ ØØØ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "18th"
 msgstr "ØÙØÙØÙÙ ØØØ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "19th"
 msgstr "ØÙØÙØØØ ØØØ"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "20th"
 msgstr "ØÙØØØÙÙ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "21st"
 msgstr "ØÙØØØÙ Ù ØÙØØØÙÙ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "22nd"
 msgstr "ØÙØÙØÙÙ Ù ØÙØØØÙÙ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "23rd"
 msgstr "ØÙØÙØÙØ Ù ØÙØØØÙÙ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "24th"
 msgstr "ØÙØÙØØØ Ù ØÙØØØÙÙ"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "25th"
 msgstr "ØÙØØÙØ Ù ØÙØØØÙÙ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "26th"
 msgstr "ØÙØÙØØØ Ù ØÙØØØÙÙ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "27th"
 msgstr "ØÙØÙØØØ Ù ØÙØØØÙÙ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "28th"
 msgstr "ØÙØÙØÙÙ Ù ØÙØØØÙÙ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "29th"
 msgstr "ØÙØÙØØØ Ù ØÙØØØÙÙ"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "30th"
 msgstr "ØÙØÙÙØØÙÙ"
 
-#: ../calendar/gui/print.c:555
+#: ../calendar/gui/print.c:587
 msgid "31st"
 msgstr "ØÙØØØÙ Ù ØÙØÙÙØØÙÙ"
 
-#: ../calendar/gui/print.c:612
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:644
 msgid "Su"
 msgstr "ØØØ"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:644
 msgid "Mo"
 msgstr "ØØÙÙÙ"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:644
 msgid "Tu"
 msgstr "ØÙØØØØ"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:644
 msgid "We"
 msgstr "ØØØØØØ"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:645
 msgid "Th"
 msgstr "ØÙÙØ"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:645
 msgid "Fr"
 msgstr "ØÙØØ"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:645
 msgid "Sa"
 msgstr "ØÙØØ"
 
-#: ../calendar/gui/print.c:3001
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:3139
 msgid " to "
 msgstr " ØÙÙ "
 
-#: ../calendar/gui/print.c:3011
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:3149
 msgid " (Completed "
 msgstr " (ÙÙÙØØ "
 
-#: ../calendar/gui/print.c:3017
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3155
 msgid "Completed "
 msgstr "ÙÙÙØØ "
 
-#: ../calendar/gui/print.c:3027
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3165
 msgid " (Due "
 msgstr " (ÙÙØØØÙ "
 
-#: ../calendar/gui/print.c:3034
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:3172
 msgid "Due "
 msgstr "ÙÙØØØÙ "
 
-#: ../calendar/gui/print.c:3199
+#: ../calendar/gui/print.c:3337
 #, c-format
 msgid "Summary: %s"
 msgstr "ØÙÙÙØÙØ: %s"
 
-#: ../calendar/gui/print.c:3226
+#: ../calendar/gui/print.c:3364
 msgid "Attendees: "
 msgstr "ØÙØØÙØ:"
 
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/print.c:3407
 #, c-format
 msgid "Status: %s"
 msgstr "ØÙØØÙØ: %s"
 
-#: ../calendar/gui/print.c:3284
+#: ../calendar/gui/print.c:3422
 #, c-format
 msgid "Priority: %s"
 msgstr "ØÙØÙÙÙÙØ: %s"
 
-#: ../calendar/gui/print.c:3302
+#: ../calendar/gui/print.c:3440
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ØÙÙÙØØØ ØÙÙÙÙØØØ: %i"
 
-#: ../calendar/gui/print.c:3313
+#: ../calendar/gui/print.c:3451
 #, c-format
 msgid "URL: %s"
 msgstr "ØÙØÙÙØÙ: %s"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3464
 #, c-format
 msgid "Categories: %s"
 msgstr "ØÙÙØØØ: %s"
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3475
 msgid "Contacts: "
 msgstr "ØÙÙØØØØÙÙÙ: "
 
@@ -4922,6 +5001,10 @@ msgstr "ØÙÙØØØØÙÙÙ: "
 msgid "% Completed"
 msgstr "% ÙÙØÙÙ"
 
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "ÙÙØÙ"
+
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "ØØØÙ"
@@ -4934,194 +5017,190 @@ msgstr "ØÙØØ ÙÙ"
 msgid "is less than"
 msgstr "ØØØØ ÙÙ"
 
-#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "ØÙÙÙØØÙØ ÙØÙØØØÙØØØØ"
 
-#: ../calendar/importers/icalendar-importer.c:350
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1958
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2170
 msgid "Opening calendar"
 msgstr "ÙØØ ØÙØÙÙÙÙ"
 
-#: ../calendar/importers/icalendar-importer.c:493
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "iCalendar files (.ics)"
 msgstr "ÙÙÙÙØØ iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution iCalendar importer"
 msgstr "ÙØØÙØØ iCalendar ÙØÙÙÙÙÙÙØÙÙ"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:674
 msgid "Reminder!"
 msgstr "ØØÙÙØ!"
 
-#: ../calendar/importers/icalendar-importer.c:662
+#: ../calendar/importers/icalendar-importer.c:758
 msgid "vCalendar files (.vcs)"
 msgstr "ÙÙÙÙØØ vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:663
+#: ../calendar/importers/icalendar-importer.c:759
 msgid "Evolution vCalendar importer"
 msgstr "ÙØØÙØØ vCalendar ÙØÙÙÙÙÙÙØÙÙ"
 
-#: ../calendar/importers/icalendar-importer.c:823
+#: ../calendar/importers/icalendar-importer.c:1038
 msgid "Calendar Events"
 msgstr "ØØØØØ ØÙØÙÙÙÙ"
 
-#: ../calendar/importers/icalendar-importer.c:861
+#: ../calendar/importers/icalendar-importer.c:1078
 msgid "Evolution Calendar intelligent importer"
 msgstr "ÙØØÙØÙØ ØÙÙÙÙ ØÙÙÙÙÙÙØÙÙ ØÙØÙÙÙ"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "ØØØÙØØ"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "ØØØ"
 
-#: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1149
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "ÙÙÙÙÙØ"
 
-#: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1466
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "ÙØÙØØ"
 
-#: ../calendar/importers/icalendar-importer.c:941
+#: ../calendar/importers/icalendar-importer.c:1161
 #, fuzzy
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ÙÙ ØØØØØØ."
 
-#: ../calendar/importers/icalendar-importer.c:946
+#: ../calendar/importers/icalendar-importer.c:1166
 #, fuzzy
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "ÙØÙ ØÙØØÙØ Ù ØÙØØÙØØ ØÙØÙØØÙØ"
 
-#: ../calendar/importers/icalendar-importer.c:951
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1171
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "ÙÙ ÙÙØÙÙØØ."
+msgid "has reminders"
+msgstr "ÙÙ ÙÙØÙØØ"
 
-#: ../calendar/importers/icalendar-importer.c:956
+#: ../calendar/importers/icalendar-importer.c:1176
 #, fuzzy
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ÙÙØÙÙ %s"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:969
+#: ../calendar/importers/icalendar-importer.c:1189
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "ØØÙ"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:972
+#: ../calendar/importers/icalendar-importer.c:1192
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "ØØØ"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:975
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "ØØÙÙ"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:979
+#: ../calendar/importers/icalendar-importer.c:1199
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "ØÙØØÙÙÙ"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:984
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "ØÙÙÙØÙØ"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:990
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "ØÙÙÙÙØ"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:998
-#: ../calendar/importers/icalendar-importer.c:1280
+#: ../calendar/importers/icalendar-importer.c:1218
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "ØÙØØØÙØ"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1009
+#: ../calendar/importers/icalendar-importer.c:1229
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "ÙÙØØØÙ "
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1021
+#: ../calendar/importers/icalendar-importer.c:1241
 msgctxt "iCalImp"
 msgid "End"
 msgstr "ØÙÙÙØÙØ"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1031
+#: ../calendar/importers/icalendar-importer.c:1251
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "ØÙÙØØØ"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../calendar/importers/icalendar-importer.c:1275
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ÙÙÙØØ"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1063
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1283
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "ØÙØÙÙØÙ"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1074
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1294
+#: ../calendar/importers/icalendar-importer.c:1297
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "ØÙÙÙØÙÙÙ"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1097
-#: ../calendar/importers/icalendar-importer.c:1100
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "ØÙØØÙØ"
 
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/importers/icalendar-importer.c:1334
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "ØÙÙØÙ"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1276
+#: ../calendar/importers/icalendar-importer.c:1497
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "ØÙÙÙÙØ"
@@ -6675,170 +6754,164 @@ msgstr "ØÙÙØØÙ/ÙØÙØ"
 msgid "Pacific/Yap"
 msgstr "ØÙÙØØÙ/ÙØØ"
 
-#: ../composer/e-composer-actions.c:204
+#: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "ØØÙØ ÙÙ..."
 
-#: ../composer/e-composer-actions.c:287
-#: ../widgets/misc/e-attachment-view.c:377
-msgid "Attach a file"
-msgstr "ØØÙØÙ ÙÙÙ"
-
-#: ../composer/e-composer-actions.c:292
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "_ØÙÙ"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
 msgstr "ØÙÙ ØÙÙÙÙ ØÙØØÙÙ"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:303
 msgid "New _Message"
 msgstr "_ØØØÙØ ØØÙØØ"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:305
 msgid "Open New Message window"
 msgstr "ØÙØØ ÙØÙØØ ØØØÙØ ØØÙØØ"
 
-#: ../composer/e-composer-actions.c:308 ../shell/e-shell-window-actions.c:1489
-#, fuzzy
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
-msgstr "ØØØØØØØ "
+msgstr "ØØØØØØØ ØÙÙÙÙÙÙØÙ"
 
-#: ../composer/e-composer-actions.c:315
+#: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
 msgstr "ØØÙØ ØÙÙÙÙ ØÙØØÙÙ"
 
-#: ../composer/e-composer-actions.c:320
+#: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
 msgstr "ØØÙØ _ÙÙ..."
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:326
 msgid "Save the current file with a different name"
 msgstr "ØØÙØ ØÙÙÙÙ ØÙØØÙÙ ØØØÙ ÙØØÙØ"
 
-#: ../composer/e-composer-actions.c:329
+#: ../composer/e-composer-actions.c:333
 msgid "Character _Encoding"
 msgstr "Ø_ØÙÙØ ØÙÙØØØÙ"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:350
 msgid "_Print..."
 msgstr "Ø_ØØØ..."
 
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:357
 msgid "Print Pre_view"
 msgstr "_ÙØØÙÙØ ÙØÙ ØÙØÙØØØØ"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:364
 msgid "Save as _Draft"
 msgstr "ØØÙØ ÙÙ_ØÙØØ"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
 msgstr "ØØÙØ _ÙÙØÙØØ"
 
-#: ../composer/e-composer-actions.c:367 ../composer/e-composer-private.c:347
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
 msgstr "ØØ_ØÙÙ"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:373
 msgid "Send this message"
 msgstr "ØØØÙÙ ÙØÙ ØÙØØØÙØ"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
 msgstr "_ØÙÙØ ØØØØØÙØÙ PGP"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
 msgstr "ØØÙÙØ ÙØÙ ØÙØØØÙØ ØØØØØØØÙ PGP"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
 msgstr "Ù_ÙÙØ ØØØØØÙØÙ PGP"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
 msgstr "ØÙÙÙØ ØÙØØØÙØ ØÙÙØØØ PGP ØÙØØØ ØÙ"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:397
 msgid "_Picture Gallery"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:399
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
 msgstr "ØØØØØ ØÙÙ_ÙÙØ ÙÙØØØÙØ"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:407
 msgid "Set the message priority to high"
 msgstr "ØÙÙ ØÙÙÙØ ØÙØØØÙØ ØÙÙ ØØÙÙ"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:413
 msgid "Re_quest Read Receipt"
 msgstr "ØØÙØ ØØ_ØØØØ ØØÙÙØØØØ"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:415
 msgid "Get delivery notification when your message is read"
 msgstr "ØØØÙØÙ ØØØØØÙØ ØØÙÙØÙÙ ØÙØÙØ ØØÙ ÙØØØØ ØØØÙØÙ"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:421
 msgid "S/MIME En_crypt"
 msgstr "_ØÙÙØ ØØØØØÙØÙ S/MIME"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:423
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ØØÙÙØ ÙØÙ ØÙØØØÙØ ØØÙØØØ ØØÙÙØ S/MIME ØÙØØØØ ØÙ"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
 msgstr "Ù_ÙÙØ ØØØØØÙØÙ S/MIME"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ØÙÙÙØ ØÙØØØÙØ ØØÙÙÙØ ØÙØØØ S/MIME ØØØØ ØÙ"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
 msgstr "ØÙÙ ØÙÙÙØØØ ØÙÙØØÙÙÙÙØ ØÙ_ÙØÙÙÙØ"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ØØØÙØ ÙØ ØØØ ÙØÙ ØÙÙ \"Ù.Ù.Ù\" ØØÙØÙØ"
 
-#: ../composer/e-composer-actions.c:441
+#: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
 msgstr "ØÙÙ ØÙ_ÙØØØ ØÙÙØØÙÙÙØ"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:447
 msgid "Toggles whether the CC field is displayed"
 msgstr "ØØØÙØ ÙØ ØØØ ÙØÙ ØÙÙ \"Ù.Ù\" ØØÙØÙØ"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
 msgstr "ØÙÙ ØÙ_ØÙØ ØÙÙ"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ØØØÙØ ÙØ ØØØ ÙØÙ ØÙÙ \"ØØ ØÙÙ\" ØØÙØÙØ"
 
-#: ../composer/e-composer-actions.c:510
+#: ../composer/e-composer-actions.c:514
 msgid "Save Draft"
 msgstr "ØØÙØ ØÙÙØÙØÙØ"
 
-#: ../composer/e-composer-header-table.c:36
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "ØØØÙ ÙØØÙÙÙÙÙ ØÙØÙØØÙØ"
 
-#: ../composer/e-composer-header-table.c:38
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "ØØØÙ ØÙØÙØÙÙÙ ØÙØÙ ØØØØÙÙ ÙØØØÙ ÙØØÙÙÙÙØ ÙÙ ØÙØÙØØÙØ"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../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"
@@ -6846,90 +6919,88 @@ msgstr ""
 "ØØØÙ ØÙØÙØÙÙÙ ØÙØÙ ØØØØÙÙ ÙØØØÙ ÙØØÙÙÙÙØ ÙÙ ØÙØÙØØÙØ ØÙÙ ØÙØÙÙÙØ ÙÙ ÙØØÙØ ÙØØÙÙÙÙÙ "
 "ØÙØÙØØÙØ."
 
-#: ../composer/e-composer-header-table.c:1004
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "_ÙÙ:"
 
-#: ../composer/e-composer-header-table.c:1013
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "_ØØ ØÙÙ"
 
-#: ../composer/e-composer-header-table.c:1017
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "Ø_ÙÙ:"
 
-#: ../composer/e-composer-header-table.c:1022
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
 msgstr "_Ù.Ù:"
 
-#: ../composer/e-composer-header-table.c:1027
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
 msgstr "Ù.Ù._Ø"
 
-#: ../composer/e-composer-header-table.c:1032
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
 msgstr "ØÙØØ _ÙÙ:"
 
-#: ../composer/e-composer-header-table.c:1036
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "ØÙÙÙ_ØÙØ:"
 
-#: ../composer/e-composer-header-table.c:1045
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "ØÙ_ÙÙØ:"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "ØÙÙÙØ ÙÙØ ÙØÙØØ ØÙØÙØÙÙÙ"
 
-#: ../composer/e-composer-post-header.c:127
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "ØÙÙØ ÙÙØ ÙØØØØ ØÙÙØÙØØØ ØÙØÙ ØØÙØØ ØÙØ"
 
-#: ../composer/e-composer-private.c:245
-#, fuzzy
+#: ../composer/e-composer-private.c:249
 msgid "Undo the last action"
-msgstr "ÙØØ ØÙÙÙØÙÙ"
+msgstr "ØØØØØ ØÙ ØÙÙØÙ ØÙØØÙØ"
 
-#: ../composer/e-composer-private.c:249
-#, fuzzy
+#: ../composer/e-composer-private.c:253
 msgid "Redo the last undone action"
-msgstr "ØØØÙÙ ØØØ ØÙÙØÙÙÙØØ"
+msgstr "ØØÙØ ØØØ ØÙÙÙØ ÙØØØØØ ØÙÙØ"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:257
 msgid "Search for text"
 msgstr "ØØØØ ØÙ ÙØÙ"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:261
 msgid "Search for and replace text"
 msgstr ""
 
-#: ../composer/e-composer-private.c:367
+#: ../composer/e-composer-private.c:372
 msgid "Save draft"
 msgstr "ØØÙØ ØÙÙØÙØÙØ"
 
-#: ../composer/e-msg-composer.c:784
+#: ../composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ÙØ ÙÙÙÙ ØÙÙÙØ ØÙØÙØØÙØ ØÙØØØØØ: ÙÙ ØØÙÙÙ ØÙØØØ ØÙÙÙØ ÙÙØØ ØÙØØØØ"
 
-#: ../composer/e-msg-composer.c:793
+#: ../composer/e-msg-composer.c:821
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ÙØ ÙÙÙÙ ØØÙÙØ ØÙØÙØØÙØ ØÙØØØØØ: ÙÙ ØØÙÙÙ ØÙØØØ ØØÙÙØ ÙÙØØ ØÙØØØØ"
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2058
+#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
 msgid "Compose Message"
 msgstr "ØÙØØ ØØØÙØ"
 
-#: ../composer/e-msg-composer.c:4116
+#: ../composer/e-msg-composer.c:4228
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "ÙØØÙÙ ØÙÙØÙÙ ØÙÙ ÙØÙ ØØØÙØ ØÙØ ÙØÙÙØ ÙÙØ ÙÙÙÙ ØØØÙØÙ."
 
-#: ../composer/e-msg-composer.c:4821
+#: ../composer/e-msg-composer.c:4933
 msgid "Untitled Message"
 msgstr "ØØØÙØ ØØÙÙ ØÙÙØÙ"
 
@@ -6954,9 +7025,8 @@ msgid "An error occurred while saving to your Outbox folder."
 msgstr "ØØØ ØØØ ØØÙØØ ØÙØÙØ ØÙÙ ÙØÙØ ØÙØÙØØØ"
 
 #: ../composer/mail-composer.error.xml.h:5
-#, fuzzy
 msgid "An error occurred while sending. How do you want to proceed?"
-msgstr "ØØØ ØØØ ØØÙØØ ØÙØØØØØ"
+msgstr "ØØØ ØØØ ØØÙØØ ØÙØØØØÙ. ÙÙÙ ØØÙØ ØÙ ØÙÙÙØ"
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
@@ -7032,10 +7102,9 @@ 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
-#, fuzzy
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
-msgstr "ØØØÙØ ÙÙØÙ ØÙØ &quot;{0}&quot;."
+msgstr "ØÙØØØ ØÙÙØÙØ ØÙÙ ÙÙ &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid ""
@@ -7085,30 +7154,16 @@ msgstr "Ø_ØÙØ ØÙÙ ØÙØÙÙ ØÙØÙØØØ"
 msgid "_Try Again"
 msgstr ""
 
-#: ../capplet/anjal-settings-main.c:184
-msgid "Run Anjal in a window"
-msgstr ""
-
-#: ../capplet/anjal-settings-main.c:185
-#, fuzzy
-msgid "Make Anjal the default email client"
-msgstr "ØÙÙ ÙÙØØÙØ ØÙÙØÙØØØ ØÙØ_ÙØØØØÙØ"
-
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:192
+#: ../capplet/anjal-settings-main.c:154
 msgid "ID of the socket to embed in"
 msgstr ""
 
-#: ../capplet/anjal-settings-main.c:193
+#: ../capplet/anjal-settings-main.c:155
 #, fuzzy
 msgid "socket"
 msgstr "ØØÙØ"
 
-#: ../capplet/anjal-settings-main.c:206
-#, fuzzy
-msgid "Anjal email client"
-msgstr "ØÙÙÙ ØÙØØÙØ ØÙØÙØØØØÙ"
-
 #: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "ØØØÙ ØØÙÙ ØÙÙØÙÙ."
@@ -7126,266 +7181,267 @@ msgid "Please enter your password."
 msgstr "ØØØÙ ÙÙÙØ ØÙØÙØ."
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
 msgstr "ØÙØÙ"
 
-#: ../capplet/settings/mail-account-view.c:463
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Personal details:"
 msgstr "ØÙØØÙÙ ØØØÙØ:"
 
-#: ../capplet/settings/mail-account-view.c:470
+#: ../capplet/settings/mail-account-view.c:487
 msgid "Name:"
 msgstr "ØÙØØÙ:"
 
-#: ../capplet/settings/mail-account-view.c:479
+#: ../capplet/settings/mail-account-view.c:496
 msgid "Email address:"
 msgstr "ØÙÙØÙ ØÙØØÙØ ØÙØÙÙØØÙÙÙ:"
 
-#: ../capplet/settings/mail-account-view.c:489
+#: ../capplet/settings/mail-account-view.c:506
 msgid "Details:"
 msgstr "ØÙØØÙÙ:"
 
-#: ../capplet/settings/mail-account-view.c:497
+#: ../capplet/settings/mail-account-view.c:514
 #, fuzzy
 msgid "Receiving"
 msgstr "ØØØÙØØÙ ØØÙØ"
 
-#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:521
 msgid "Server type:"
 msgstr "ÙÙØ ØÙØØØÙÙ:"
 
-#: ../capplet/settings/mail-account-view.c:513
+#: ../capplet/settings/mail-account-view.c:530
 msgid "Server address:"
 msgstr "ØÙÙØÙ ØÙØØØÙÙ:"
 
-#: ../capplet/settings/mail-account-view.c:522
+#: ../capplet/settings/mail-account-view.c:539
 msgid "Username:"
 msgstr "ØØÙ ØÙÙØØØØÙ:"
 
-#: ../capplet/settings/mail-account-view.c:531
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Use encryption:"
 msgstr "ØØØØÙÙ ØÙØØÙÙØ:"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 msgid "never"
 msgstr "ØØØÙØ"
 
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:565
 #, fuzzy
 msgid "Sending"
 msgstr "ØØØØØÙ"
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../capplet/settings/mail-account-view.c:607
 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
+#: ../capplet/settings/mail-account-view.c:609
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:594
+#: ../capplet/settings/mail-account-view.c:611
 #, fuzzy
 msgid "You can specify more options to configure the account."
 msgstr "ÙØ ÙÙÙÙ ÙÙ ØÙØ ØÙ ØØÙÙ ØØØØ ØÙÙØØÙÙØ ÙØØØ ÙÙØ."
 
-#: ../capplet/settings/mail-account-view.c:596
+#: ../capplet/settings/mail-account-view.c:613
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:615
 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:2143 ../mail/em-account-editor.c:2264
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
 msgid "Identity"
 msgstr "ØÙÙÙÙÙØ"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:630
 msgid "Next - Receiving mail"
 msgstr "ØÙØØÙÙ - ØÙÙÙÙ ØÙØØÙØ"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Receiving mail"
 msgstr "ØÙÙÙÙ ØÙØØÙØ"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Next - Sending mail"
 msgstr "ØÙØØÙÙ - ØØØØÙ ØÙØØÙØ"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Back - Identity"
 msgstr "ØÙØØØÙ - ØÙÙÙÙÙØ"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Next - Receiving options"
 msgstr "ØÙØÙØÙÙ - ØÙØØØØ ØÙØÙÙÙÙ"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Receiving options"
 msgstr "ØÙØØØØ ØÙØÙÙÙÙ"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving mail"
 msgstr "ØÙØØØÙ - ØÙÙÙÙ ØÙØØÙØ"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Sending mail"
 msgstr "ØØØØÙ ØÙØØÙØ"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 #, fuzzy
 msgid "Next - Review account"
 msgstr "ØØÙ ØÙØØØØØ"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 #, fuzzy
 msgid "Next - Defaults"
 msgstr "ØÙØÙØÙÙ - ØÙØÙØØØØÙÙØØ"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving options"
 msgstr "ØÙØÙØØÙ - ØÙØØØØ ØÙØÙÙÙÙ"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3095
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3377
 msgid "Defaults"
 msgstr "ØÙØÙØØØØÙÙØØ"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Back - Sending mail"
 msgstr "ØÙØÙØØÙ - ØØØØÙ ØÙØØÙØ"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 #, fuzzy
 msgid "Review account"
 msgstr "ØØÙ ØÙØØØØØ"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 #, fuzzy
 msgid "Finish"
 msgstr "ÙÙØÙ"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 #, fuzzy
 msgid "Back - Sending"
 msgstr "ØØØØØÙ"
 
-#: ../capplet/settings/mail-account-view.c:740
+#: ../capplet/settings/mail-account-view.c:760
 #, fuzzy
 msgid "Setup Google contacts with Evolution"
 msgstr "ÙØØØØÙÙ WebDAV"
 
-#: ../capplet/settings/mail-account-view.c:741
+#: ../capplet/settings/mail-account-view.c:761
 msgid "Setup Google calendar with Evolution"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:746
+#: ../capplet/settings/mail-account-view.c:766
 msgid "You may need to enable IMAP access."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:754
+#: ../capplet/settings/mail-account-view.c:774
 #, fuzzy
 msgid "Google account settings:"
 msgstr "ÙØØÙ ØÙÙØØ ØÙØØØÙØØÙ ÙØØØØØØ ÙØØØØØØØ ØÙÙÙÙÙÙØÙ"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:800
 msgid "Setup Yahoo calendar with Evolution"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:784
+#: ../capplet/settings/mail-account-view.c:804
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
 "correct."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:793
+#: ../capplet/settings/mail-account-view.c:813
 #, fuzzy
 msgid "Yahoo account settings:"
 msgstr "ÙØØÙ ØÙÙØØ ØÙØØØÙØØÙ ÙØØØØØØ ÙØØØØØØØ ØÙÙÙÙÙÙØÙ"
 
-#: ../capplet/settings/mail-account-view.c:807
+#: ../capplet/settings/mail-account-view.c:827
 #, fuzzy
 msgid "Yahoo Calendar name:"
 msgstr "ØØØØ ÙÙÙ"
 
-#: ../capplet/settings/mail-account-view.c:1079
+#: ../capplet/settings/mail-account-view.c:1098
 msgid "Password:"
 msgstr "ÙÙÙØ ØÙØØ:"
 
-#: ../capplet/settings/mail-account-view.c:1130
-#: ../capplet/settings/mail-settings-view.c:248
+#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-settings-view.c:254
 msgid "Close Tab"
 msgstr "ØØÙÙ ØÙÙÙØØÙ"
 
-#: ../capplet/settings/mail-account-view.c:1140
+#: ../capplet/settings/mail-account-view.c:1160
 #, fuzzy
 msgid "Account Wizard"
 msgstr "ÙØØÙØ ØÙØØØØØØ"
 
-#: ../capplet/settings/mail-capplet-shell.c:209
+#: ../capplet/settings/mail-capplet-shell.c:215
 msgid "Evolution account assistant"
 msgstr "ÙØØØØ ØØØØØØ ØÙÙÙÙÙØÙ"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:353 ../mail/e-mail-migrate.c:680
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1721
-#: ../modules/addressbook/e-book-shell-backend.c:92
-#: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:103
-#: ../modules/calendar/e-cal-shell-migrate.c:150
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:117
+#: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
+#: ../mail/e-mail-migrate.c:750 ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:159
+#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:168
+#: ../mail/em-folder-tree-model.c:170
+#: ../modules/addressbook/e-book-shell-backend.c:100
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:102
+#: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "ØÙÙ ÙØØ ØÙØØØÙØ"
 
-#: ../capplet/settings/mail-settings-view.c:145
+#: ../capplet/settings/mail-settings-view.c:150
 #, fuzzy, c-format
 msgid "Modify %s..."
 msgstr "ØÙÙÙØ"
 
-#: ../capplet/settings/mail-settings-view.c:147
+#: ../capplet/settings/mail-settings-view.c:152
 msgid "Add a new account"
 msgstr "ØØÙÙ ØØØØÙØ ØØÙØÙØ"
 
-#: ../capplet/settings/mail-settings-view.c:183
+#: ../capplet/settings/mail-settings-view.c:188
 msgid "Account management"
 msgstr "ØØØØØ ØÙØØØØØØ"
 
-#: ../capplet/settings/mail-settings-view.c:258
+#: ../capplet/settings/mail-settings-view.c:264
 msgid "Settings"
 msgstr "ØÙØØØØØØ"
 
@@ -7399,9 +7455,9 @@ msgstr "ÙØÙÙÙØØ ØÙØÙÙÙÙ"
 msgid "Evolution Alarm Notify"
 msgstr "ÙØØÙØØ elm ÙØÙÙÙÙÙÙØÙÙ"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:952
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:253
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
 msgstr "ØÙÙÙÙÙÙØÙ"
 
@@ -7409,7 +7465,7 @@ msgstr "ØÙÙÙÙÙÙØÙ"
 msgid "Evolution Mail and Calendar"
 msgstr "ØØÙØ Ù ØÙÙÙÙ ØÙÙÙÙÙÙØÙÙ"
 
-#: ../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:654
 msgid "Groupware Suite"
 msgstr "ØÙØÙØ Groupware"
 
@@ -7427,36 +7483,36 @@ msgid "Email Settings"
 msgstr "ØØØØØØØ ØÙØØÙØ"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:223
+#: ../e-util/e-activity.c:227
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (ÙÙØÙ)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:226
+#: ../e-util/e-activity.c:230
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (ÙÙØÙÙ)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:229
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (ÙÙØØØ)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:237
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (ÙÙÙØÙ)"
 
-#: ../e-util/e-activity.c:235
+#: ../e-util/e-activity.c:239
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:240
+#: ../e-util/e-activity.c:244
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ØØÙ)"
@@ -7539,125 +7595,125 @@ msgid "Visual"
 msgstr "ÙØØÙ"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../e-util/e-datetime-format.c:206
+#: ../modules/calendar/e-cal-shell-view-actions.c:1856
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:308
+#: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "ØÙÙÙÙ"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "ØØØ"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "ØØÙØÙØ"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:217
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:227
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "ØÙØØÙÙÙ ØÙÙØØÙ"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:223
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:233
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "ØÙØÙØØØØ ØÙÙØØÙØ"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:229
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:239
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "ØÙØØØØØØ ØÙÙØØÙØ"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:235
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:245
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "ØÙØÙÙØ ØÙÙØØÙ"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:241
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:251
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "ØÙØÙØØ ØÙÙØØÙØ"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:247
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:257
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "ØÙØØØ ØÙÙØØÙ"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:253
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:263
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "ØÙØØØ ØÙÙØØÙ"
 
-#: ../e-util/e-datetime-format.c:335 ../e-util/e-datetime-format.c:345
-#: ../e-util/e-datetime-format.c:354
+#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
+#: ../e-util/e-datetime-format.c:369
 #, fuzzy
 msgid "Use locale default"
 msgstr "ØØØ_ØØÙ ØÙØØØØØØ ØÙÙØØÙ"
 
-#: ../e-util/e-datetime-format.c:551
+#: ../e-util/e-datetime-format.c:574
 msgid "Format:"
 msgstr "ØÙØÙÙØØ:"
 
-#: ../e-util/e-file-utils.c:152
+#: ../e-util/e-file-utils.c:151
 msgid "(Unknown Filename)"
 msgstr "(ØØÙ ØÙÙÙÙ ÙØÙÙÙ)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:156
+#: ../e-util/e-file-utils.c:155
 #, c-format
 msgid "Writing \"%s\""
 msgstr "ÙØØØØ \"%s\""
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:161
+#: ../e-util/e-file-utils.c:160
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "ÙØØØØ \"%s\" ØÙÙ %s"
 
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:378
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:388
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "ØØØØÙØ"
 
-#: ../e-util/e-print.c:157
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "ØØØ ØØØ ØØÙØØ ØÙØØØØØ"
 
-#: ../e-util/e-print.c:164
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "ØØÙØ ÙØØÙ ØÙØØØØØ ØÙ ØÙØØÙÙ ØÙØØØ ØÙØØÙØ:"
 
-#: ../e-util/e-print.c:170
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "ÙÙ ÙØÙØ ÙØØÙ ØÙØØØØØ ØÙ ØÙ ØÙØØÙÙ ØØØÙÙØ ØÙ ØÙØØØ."
 
-#: ../e-util/e-signature.c:707
+#: ../e-util/e-signature.c:708
 msgid "Autogenerated"
 msgstr "ÙÙÙÙØ ØÙÙÙÙØ"
 
@@ -7681,133 +7737,125 @@ msgstr "ØØØØØ ÙÙ ØÙÙØØØØ ÙÙÙÙØ"
 msgid "File exists \"{0}\"."
 msgstr "ØÙÙÙÙ ÙÙØÙØ \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:157
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "Ø_ÙØØ ÙÙÙÙ"
 
-#: ../e-util/e-util.c:141
+#: ../e-util/e-util.c:117
 #, fuzzy
 msgid "Could not open the link."
 msgstr "ØØØØ ÙØØ ÙÙÙ ØÙØÙØ ØÙØÙÙ"
 
-#: ../e-util/e-util.c:188
+#: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
 msgstr "ØØØØ ØØØ ÙØØØØØ ØÙÙÙÙÙÙØÙÙ."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
 msgstr "ØØØ GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1343
 msgid "All further errors shown only on terminal."
 msgstr "ÙÙ ØÙØØØØØ ØÙØØØÙÙØ ØØØØ ÙÙØ ÙÙ ØÙØØÙÙØ."
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1060
 #: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "ÙÙ"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "ØØ ØÙÙ"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2397 ../mail/em-format-html.c:2465
-#: ../mail/em-format-html.c:2488 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1063
+#: ../mail/em-format-html.c:2593 ../mail/em-format-html.c:2661
+#: ../mail/em-format-html.c:2684 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Ù.Ù"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2398 ../mail/em-format-html.c:2469
-#: ../mail/em-format-html.c:2491 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1064
+#: ../mail/em-format-html.c:2594 ../mail/em-format-html.c:2665
+#: ../mail/em-format-html.c:2687 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Ù.Ù.Ù"
 
-#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1055
+#: ../em-format/em-format-quote.c:464 ../em-format/em-format.c:1065
 #: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
-#: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../smime/lib/e-cert.c:1151
 msgid "Subject"
 msgstr "ØÙÙÙØÙØ"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2585
-#: ../modules/mail/em-mailer-prefs.c:1119
+#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
+#: ../modules/mail/em-mailer-prefs.c:1028
 msgid "Mailer"
 msgstr "ØØØÙ ØÙØØÙØ"
 
-#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1179
+#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ØØØÙØ ÙÙØÙØØ -------- "
 
-#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
+#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "ØÙØÙØØÙØ"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "ÙØÙÙØØØ ØØØØØ"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ØÙÙØÙ"
 
-#: ../em-format/em-format.c:1455
+#: ../em-format/em-format.c:1472
 #, c-format
 msgid "%s attachment"
 msgstr "ÙÙØÙÙ %s"
 
-#: ../em-format/em-format.c:1566
+#: ../em-format/em-format.c:1583
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ÙÙ ÙÙÙÙ ØØÙÙÙ ØØØÙØ S/MIME: ØØØ ÙØÙÙÙ"
 
-#: ../em-format/em-format.c:1748 ../em-format/em-format.c:1942
+#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ÙÙ ÙÙÙÙ ØØÙÙÙ ØØØÙØ MIME. ØØÙØØØ ÙÙØØØ."
 
-#: ../em-format/em-format.c:1758
+#: ../em-format/em-format.c:1788
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ÙÙØ ØØÙÙØ ØÙØ ÙØØÙÙ ÙØØÙØ ØÙØØØØØ/ÙØÙÙØ"
 
-#: ../em-format/em-format.c:1778
+#: ../em-format/em-format.c:1808
 msgid "Could not parse PGP/MIME message"
 msgstr "ØØØØ ØØÙÙÙ ØØØÙØ PGP/MIME"
 
-#: ../em-format/em-format.c:1779
+#: ../em-format/em-format.c:1809
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ØØØØ ØØÙÙÙ ØØØÙØ PGP/MIME: ØØØ ÙØÙÙÙ"
 
-#: ../em-format/em-format.c:1967
+#: ../em-format/em-format.c:2030
 msgid "Unsupported signature format"
 msgstr "ØÙØØ ØÙÙÙØ ØÙØ ÙØØÙÙØ"
 
-#: ../em-format/em-format.c:1980 ../em-format/em-format.c:2159
+#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
 msgid "Error verifying signature"
 msgstr "ØØØ ØØÙØØ ØÙØÙØÙÙ ÙÙ ØÙØÙÙÙÙØ"
 
-#: ../em-format/em-format.c:1981 ../em-format/em-format.c:2146
-#: ../em-format/em-format.c:2160
+#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
+#: ../em-format/em-format.c:2226
 msgid "Unknown error verifying signature"
 msgstr "ØØØ ÙØÙÙÙ ØØÙØØ ØÙØÙØÙÙÙ ÙÙ ØÙØÙÙÙÙØ"
 
-#: ../em-format/em-format.c:2251
+#: ../em-format/em-format.c:2318
 msgid "Could not parse PGP message: "
 msgstr "ØØØØ ØØÙÙÙ ØØØÙØ PGP:"
 
-#: ../em-format/em-format.c:2257 ../mail/em-folder-tree.c:656
-#: ../mail/mail-ops.c:624 ../plugins/caldav/caldav-browse-server.c:210
-#: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:100
-msgid "Unknown error"
-msgstr "ØØØ ÙØÙÙÙ"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
 #: ../filter/e-filter-datespec.c:66
@@ -7978,85 +8026,83 @@ msgstr "ØÙØÙ"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:282
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "ØØØØ ÙÙØ ÙÙÙÙØØÙØ ØÙ"
 
-#: ../filter/e-filter-file.c:188
+#: ../filter/e-filter-file.c:190
 msgid "Choose a File"
 msgstr "ØØØØ ÙÙÙÙÙØ"
 
-#: ../filter/e-filter-rule.c:662
+#: ../filter/e-filter-rule.c:666
 msgid "R_ule name:"
 msgstr "ØØÙ ØÙÙ_ØØØØ:"
 
-#: ../filter/e-filter-rule.c:692
+#: ../filter/e-filter-rule.c:696
 #, fuzzy
 msgid "Find items that meet the following conditions"
 msgstr "ØØØØ ØÙÙ ØÙØÙØØØ ØÙØÙ ØÙÙ ØØÙÙØØÙÙØ ØÙØØÙÙØ"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:721
 #, fuzzy
 msgid "If all conditions are met"
 msgstr "ØØØ ÙÙØÙØ ØÙÙØ ØÙÙØØÙÙØ"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:722
 #, fuzzy
 msgid "If any conditions are met"
 msgstr "ØØØ ÙÙØÙ ØÙ ÙØÙØØ"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:725
 msgid "_Find items:"
 msgstr "_ØÙØÙ ØÙØØØ:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#. Translators: Used in send options dialog
-#: ../filter/e-filter-rule.c:750
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
-#: ../widgets/misc/e-send-options.ui.h:12
+#: ../filter/e-filter-rule.c:754
 msgid "None"
 msgstr "ÙØ ØÙØ"
 
-#: ../filter/e-filter-rule.c:751
+#: ../filter/e-filter-rule.c:755
 msgid "All related"
 msgstr "ÙÙ ØÙÙØØÙÙÙ"
 
-#: ../filter/e-filter-rule.c:752 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "ØÙØØÙØ"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:757
 msgid "Replies and parents"
 msgstr "ØÙØØÙØ ÙØÙØØÙÙ"
 
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:758
 msgid "No reply or parent"
 msgstr "ÙØ ØØ ÙÙØ ØØÙ"
 
-#: ../filter/e-filter-rule.c:757
-msgid "I_nclude threads"
+#: ../filter/e-filter-rule.c:761
+#, fuzzy
+msgid "I_nclude threads:"
 msgstr "ØÙÙÙ ØÙÙÙØÙ_ØØØ"
 
-#: ../filter/e-filter-rule.c:782
+#: ../filter/e-filter-rule.c:786
 #, fuzzy
 msgid "A_dd Condition"
 msgstr "ØØÙÙ ØØØØØÙØ"
 
-#: ../filter/e-filter-rule.c:1130 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:320
+#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:321
 msgid "Incoming"
 msgstr "ØÙÙØØÙØ"
 
-#: ../filter/e-filter-rule.c:1130 ../mail/em-utils.c:321
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:322
 msgid "Outgoing"
 msgstr "ØÙØØØØØ"
 
-#: ../filter/e-rule-editor.c:263
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "ØØÙÙ ÙØØØØ"
 
-#: ../filter/e-rule-editor.c:349
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "ØØÙØ ÙØØØØ"
 
@@ -8080,7 +8126,7 @@ msgstr "ØÙØØØÙØ ÙÙÙÙØ"
 msgid "Missing file name."
 msgstr "ØØÙ ØÙÙÙÙ ÙÙÙÙØ."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "ØØÙ ÙÙÙÙØ."
 
@@ -8136,7 +8182,7 @@ msgstr ""
 "ØÙÙØØÙ ØØØÙØ ØÙØÙØØÙØ ÙØ\n"
 "ØÙÙÙØ ØÙØØÙÙ ØÙØ ØÙØØØÙØ."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
 msgid "_Filter Rules"
 msgstr "ÙÙØØØ ØÙ_ÙØØÙÙØ"
 
@@ -8174,10 +8220,145 @@ msgstr "ØÙÙÙØ ØÙØÙ ØØØÙØÙ ØÙØ"
 msgid "years"
 msgstr "ØÙÙØØ"
 
-#: ../mail/e-mail-attachment-bar.c:86 ../mail/e-mail-attachment-bar.c:91
-#: ../mail/em-format-html-display.c:1122 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:124
-#: ../widgets/misc/e-attachment-paned.c:129
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+#, fuzzy
+msgctxt "mail-signature"
+msgid "None"
+msgstr "ÙØ ØÙØ"
+
+#: ../mail/em-account-editor.c:946
+msgid "Never"
+msgstr "ØØØÙØ"
+
+#: ../mail/em-account-editor.c:947
+msgid "Always"
+msgstr "ØØØÙÙØ"
+
+#: ../mail/em-account-editor.c:948
+msgid "Ask for each message"
+msgstr "ØØØÙ ÙÙÙ ØØØÙØ"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:131
+#, fuzzy
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "ÙØ ØÙØ"
+
+#: ../mail/em-account-editor.c:2237
+msgid "Fil_e:"
+msgstr ""
+
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "ØÙ_ÙØØØ:"
+
+#: ../mail/em-account-editor.c:2286
+msgid "Mail Configuration"
+msgstr "ØØØØØØØ ØÙØØÙØ"
+
+#: ../mail/em-account-editor.c:2287
+#, fuzzy
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"ÙØØØØ ØÙ ÙÙ ÙØØØØ ØØØØØ ØØÙØ ØÙÙÙÙÙØÙ.\n"
+"\n"
+"ØÙØØØØ ÙÙØ \"ØÙØÙ\" ÙÙØØØ. "
+
+#: ../mail/em-account-editor.c:2290
+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:2292 ../mail/em-account-editor.c:2484
+msgid "Receiving Email"
+msgstr "ØØØÙØØÙ ØØÙØ"
+
+#: ../mail/em-account-editor.c:2293
+#, fuzzy
+msgid "Please configure the following account settings."
+msgstr "ØÙØØØØ ØÙØÙØÙØØ ÙÙ ØÙØÙØØØØ ØÙØØÙÙØ"
+
+#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+msgid "Sending Email"
+msgstr "ØØØØÙ ØØÙØ"
+
+#: ../mail/em-account-editor.c:2296
+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:2298 ../mail/mail-config.ui.h:1
+#, fuzzy
+msgid "Account Information"
+msgstr "ÙØ ÙØÙÙÙØØ"
+
+#: ../mail/em-account-editor.c:2299
+#, fuzzy
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"ØØØØ ØØØÙ ØØÙÙØ ÙÙØÙ ÙØØ ØÙØØØØ ÙÙ ØÙÙØØØØ ØØÙØÙ.\n"
+"ØÙØÙ ØØØØÙØÙ ÙØØ ØÙØØÙ ÙØØØØØ ØÙØØØ ÙÙØ."
+
+#: ../mail/em-account-editor.c:2303
+msgid "Done"
+msgstr "ØÙ"
+
+#: ../mail/em-account-editor.c:2304
+#, fuzzy
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"ØÙØÙÙÙØØ ÙÙØ ØÙÙ ØØØØØ ØØÙØÙ.\n"
+"\n"
+"ØÙÙÙ ØØÙØÙ ØÙØÙ ÙØØØØÙ Ù ØÙÙÙ ØÙØØÙØ ØÙØÙÙØØÙÙÙ \n"
+"ÙØØØÙÙÙØ ØÙÙÙÙÙØÙÙ.\n"
+"\n"
+"ØÙØØØØ ÙÙØ \"ØØÙ\" ÙØÙØ ØØØØØØØÙ."
+
+#: ../mail/em-account-editor.c:2843
+msgid "Check for _new messages every"
+msgstr "ØØÙÙ ÙÙ ØÙØØØØÙ ØÙ_ØØÙØØ ÙÙÙÙ"
+
+#: ../mail/em-account-editor.c:2851
+msgid "minu_tes"
+msgstr "ØÙØØ_Ù"
+
+#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "ØÙÙ"
+
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:3575 ../mail/em-account-editor.c:3658
+msgid "Receiving Options"
+msgstr "ØÙØØØØ ØÙØÙÙÙ"
+
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+msgid "Checking for New Messages"
+msgstr "ØØØ ØÙÙØØ ÙÙØØØ ØÙ ØØØØÙ ØØÙØØ"
+
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1416 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
 #, fuzzy
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -8188,157 +8369,229 @@ msgstr[3] "ÙÙØÙÙ"
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../mail/e-mail-attachment-bar.c:604
-#: ../widgets/misc/e-attachment-paned.c:619
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
 #, fuzzy
 msgid "Icon View"
 msgstr "ÙØÙØ ØÙØÙÙØ"
 
-#: ../mail/e-mail-attachment-bar.c:606
-#: ../widgets/misc/e-attachment-paned.c:621
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
 msgstr "ÙØÙØ ØÙÙØØÙØ"
 
-#: ../mail/e-mail-browser.c:125 ../shell/e-shell-window-actions.c:1405
-#: ../shell/e-shell-window-actions.c:1412
-#: ../shell/e-shell-window-actions.c:1419
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "ØÙÙ ÙØÙ ØÙÙØÙØØ"
 
-#: ../mail/e-mail-browser.c:282
+#: ../mail/e-mail-browser.c:293
 msgid "(No Subject)"
 msgstr "(ØÙÙ ÙÙØÙØ)"
 
-#: ../mail/e-mail-display.c:62
+#: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
 msgstr "Ø_ØÙ ØÙÙ ØÙØØ ØÙØÙØÙÙÙ..."
 
-#: ../mail/e-mail-display.c:69
+#: ../mail/e-mail-display.c:73
 #, fuzzy
 msgid "_To This Address"
 msgstr "Ø_ÙÙ ÙØØ ØÙØÙÙØÙ"
 
-#: ../mail/e-mail-display.c:76
+#: ../mail/e-mail-display.c:80
 #, fuzzy
 msgid "_From This Address"
 msgstr "_ÙÙ ÙØØ ØÙØÙÙØÙ"
 
-#: ../mail/e-mail-display.c:85
+#: ../mail/e-mail-display.c:87
+#, fuzzy
+msgid "Send _Reply To..."
+msgstr "ØØØÙ ØÙÙ:"
+
+#: ../mail/e-mail-display.c:89
+#, fuzzy
+msgid "Send a reply message to this address"
+msgstr "ØØØÙ ØØØÙØ ØÙÙ ÙØØ ØÙØÙÙØ"
+
+#: ../mail/e-mail-display.c:96
 msgid "Create Search _Folder"
 msgstr "ØÙØØ ÙØÙÙØ _ØØØ"
 
-#: ../mail/e-mail-folder-utils.c:88
+#: ../mail/e-mail-folder-utils.c:111
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "ØÙØ ØÙØÙØØÙØ ÙÙ ØÙÙØÙÙØ '%s'"
 
-#: ../mail/e-mail-label-dialog.c:219
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "ØÙØØØØÙ ØÙÙÙØÙØØ"
+
+#: ../mail/e-mail-folder-utils.c:391
+#, fuzzy
+msgid "Scanning messages for duplicates"
+msgstr "ØÙÙÙ ØÙØØØÙØ ØÙÙÙØÙØØ ÙÙØØÙ"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "ÙØØÙ ØØØ %d ØØØÙØ"
+msgstr[1] "ÙØØÙ ØØØ %d ØØØÙØ"
+msgstr[2] "ÙØØÙ ØØØ %d ØØØÙØ"
+msgstr[3] "ÙØØÙ ØØØ %d ØØØÙØ"
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../mail/e-mail-folder-utils.c:834
+#, fuzzy, c-format
+msgid "Removing folder '%s'"
+msgstr "ÙØØÙ ØØØÙØ ØÙÙØÙÙØ %s"
+
+#: ../mail/e-mail-folder-utils.c:968
+#, fuzzy, c-format
+msgid "File \"%s\" has been removed."
+msgstr "ÙÙ ØÙØÙØØØØØ ØØÙÙØ."
+
+#: ../mail/e-mail-folder-utils.c:972
+#, fuzzy
+msgid "File has been removed."
+msgstr "ÙÙ ØÙØÙØØØØØ ØØÙÙØ."
+
+#: ../mail/e-mail-folder-utils.c:1031
+#, fuzzy
+msgid "Removing attachments"
+msgstr "ÙØØÙ ØÙØ ØÙÙÙØÙÙ"
+
+#: ../mail/e-mail-folder-utils.c:1195
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "ÙØÙØ ØØØÙØ %d"
+msgstr[1] "ÙØÙØ ØØØØÙ %d"
+msgstr[2] "ÙØØÙ ØÙØ %d ØØØÙØ"
+msgstr[3] "ÙØØÙ ØÙØ %d ØØØÙØ"
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:613
+#, fuzzy, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "ÙØÙØ ØÙØ ØØÙØ: `%s'"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr ""
+
+#: ../mail/e-mail-label-dialog.c:223
 #, fuzzy
 msgid "_Label name:"
 msgstr "Ø_ØÙ ØÙÙØÙÙØ:"
 
-#: ../mail/e-mail-label-list-store.c:37
+#: ../mail/e-mail-label-list-store.c:41
 msgid "I_mportant"
 msgstr "Ù_ÙÙ"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:38
+#: ../mail/e-mail-label-list-store.c:42
 msgid "_Work"
 msgstr "ØÙ_Ù"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:39
+#: ../mail/e-mail-label-list-store.c:43
 msgid "_Personal"
 msgstr "Ø_ØØÙ"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:40
+#: ../mail/e-mail-label-list-store.c:44
 msgid "_To Do"
 msgstr "ÙÙÙ_ÙØÙ ØÙ"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:45
 msgid "_Later"
 msgstr "ÙØ_ØÙÙØ"
 
-#: ../mail/e-mail-label-manager.c:161
-#: ../modules/mail/e-mail-shell-view-actions.c:627
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:684
 msgid "Add Label"
 msgstr "ØØÙ ÙØÙÙØ"
 
-#: ../mail/e-mail-label-manager.c:212
+#: ../mail/e-mail-label-manager.c:216
 msgid "Edit Label"
 msgstr "ØØÙÙØ ÙØÙÙØ"
 
-#: ../mail/e-mail-label-manager.c:346
+#: ../mail/e-mail-label-manager.c:350
 #, fuzzy
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr "ÙÙØØØØ: ØÙØØØÙØ ØÙØÙÙÙ ÙÙ ØØÙ ØÙÙØÙÙØ ÙÙØØØÙÙ ÙÙÙØÙØÙÙÙ ØØÙÙØÙ ÙÙ ØÙÙØØÙØ."
 
-#: ../mail/e-mail-label-tree-view.c:84
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "ØÙÙÙÙ"
 
-#: ../mail/e-mail-label-tree-view.c:94
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1296
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../widgets/menus/gal-define-views-dialog.c:334
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../plugins/caldav/caldav-browse-server.c:1358
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "ØÙØØÙ"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:738 ../mail/em-folder-tree.c:3138
-#: ../modules/mail/e-mail-shell-view-private.c:1118
-#: ../modules/mail/e-mail-shell-view-private.c:1129
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
+#: ../mail/em-folder-tree-model.c:720
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "ØÙØÙÙ ØÙØÙØØÙ"
 
-#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1116
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "ÙØÙÙØØØ"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:742
-#: ../modules/mail/e-mail-shell-view-private.c:1120
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "ØÙØÙÙ ØÙØÙØØØ"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:744
-#: ../modules/mail/e-mail-shell-view-private.c:1122
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "ØØØÙÙ"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:733
-#: ../modules/mail/e-mail-shell-view-private.c:1124
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:581
+#: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
+#: ../plugins/templates/templates.c:1322
 msgid "Templates"
 msgstr "ÙÙØÙØ"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:134
 msgid "Migrating..."
 msgstr "ÙØØÙ ØÙØØÙÙØ..."
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:169
 #, fuzzy
 msgid "Migration"
 msgstr "ÙØØÙ ØÙØØÙÙØ..."
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:210
 #, c-format
 msgid "Migrating '%s':"
 msgstr "ØÙÙÙÙ '%s':"
 
-#: ../mail/e-mail-migrate.c:660
+#: ../mail/e-mail-migrate.c:728
 #, fuzzy
 msgid "Migrating Folders"
 msgstr "ØÙØØØ ØÙÙØÙÙØ `%s'"
 
-#: ../mail/e-mail-migrate.c:661
+#: ../mail/e-mail-migrate.c:729
 #, fuzzy
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
@@ -8351,775 +8604,755 @@ msgstr ""
 "\n"
 "ØØØØÙ ÙÙ ØØÙØØ ØÙÙÙØ ÙÙÙÙ ØÙÙÙÙÙÙØÙÙ ÙØÙØØØÙ..."
 
-#: ../mail/e-mail-migrate.c:1126
+#: ../mail/e-mail-migrate.c:1527
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "ØØØØ ØÙØØØ ÙØÙÙØØØ ØÙØØÙØ ØÙÙØÙÙÙØ ÙÙ `%s': %s"
 
-#: ../mail/e-mail-notebook-view.c:562
+#: ../mail/e-mail-notebook-view.c:621
 #, fuzzy
 msgid "Please select a folder"
 msgstr "ØÙØØØØ ØÙØÙØØ ÙØØØØÙ."
 
-#: ../mail/e-mail-reader-utils.c:109
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-msgid "Do not ask me again"
-msgstr "ÙØ ØØØÙÙÙ ÙØØ ØØØÙ"
-
-#: ../mail/e-mail-reader.c:306 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ØÙØØ ÙÙÙØÙÙØ"
 
-#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "ØÙ_ØØ"
 
-#. Translators: %s is replaced with a folder name
-#. %d with count of duplicate messages.
-#: ../mail/e-mail-reader.c:523
-#, c-format
-msgid ""
-"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: ../mail/e-mail-reader.c:987 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ØÙÙÙ ÙÙÙØÙÙØ"
 
-#: ../mail/e-mail-reader.c:987 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "Ø_ÙÙÙ"
 
-#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1437
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "ÙØ Ø_ØØÙÙÙ ÙØØ ØØØÙ."
 
-#: ../mail/e-mail-reader.c:1480
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1596
-#, fuzzy
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "ØØÙØ ØÙØÙØØÙØ..."
-msgstr[1] "ØØÙØ ØÙØÙØØÙØ..."
-msgstr[2] "ØØÙØ ØÙØÙØØÙØ..."
-msgstr[3] "ØØÙØ ØÙØÙØØÙØ..."
-msgstr[4] "ØØÙØ ØÙØÙØØÙØ..."
-msgstr[5] "ØØÙØ ØÙØÙØØÙØ..."
-
-#. Translators: This is a part of a suggested file name
-#. * used when saving a message or multiple messages to an
-#. * mbox format, when the first message doesn't have a
-#. * Subject. The extension ".mbox" is appended to this
-#. * string, thus it will be something like "Message.mbox"
-#. * at the end.
-#: ../mail/e-mail-reader.c:1617
-#: ../plugins/groupwise-features/notification.ui.h:1
-#: ../plugins/groupwise-features/properties.ui.h:3
-#, fuzzy
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "ØØØÙØ"
-msgstr[1] "ØØØÙØ"
-msgstr[2] "ØØØÙØ"
-msgstr[3] "ØØØÙØ"
-msgstr[4] "ØØØÙØ"
-msgstr[5] "ØØØÙØ"
-
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "Ø_ØÙÙ ØÙÙØØÙÙ ÙØÙØØ ØÙØÙØÙÙÙ"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "ØØÙÙ ØÙÙØØÙÙ ØÙÙ ØÙØØ ØÙØÙØÙÙÙ"
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "ÙØØ ØØØÙØ ØÙ ØÙÙÙØÙØ"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "ØØØ ØÙØØØØÙ ØÙÙÙØÙØÙ ØØØÙØ ØÙ ØÙØØÙØ ØÙÙÙØÙØ"
 
-#: ../mail/e-mail-reader.c:1905
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "ØÙ_ØØ ÙÙÙØÙÙØ..."
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "ÙØØ ØÙØÙØØÙØ ØÙÙÙØÙØØ ØÙÙ ÙØÙÙØ ØØØ"
 
-#: ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "ØØ_ØÙ ØÙØØØÙØ"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "ØÙÙÙ ØÙØØØÙØ ØÙÙÙØÙØØ ÙÙØØÙ"
 
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "ØØØ ØÙØØÙ ØÙÙ ØÙ_ÙØØÙØ ØÙØØÙØÙØ..."
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ØÙØØ ÙØÙÙÙ ÙØØØÙØ ØÙØÙØØØÙ ØÙÙ ÙØÙ ØÙÙØØÙØ ØÙØØÙØÙØ"
 
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "ØØØ ØÙØØÙ ØÙÙ ØÙÙÙØØÙ ØÙ_ÙÙÙ..."
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ØÙØØ ÙØÙÙÙ ÙØØØÙØ ØÙØÙØØØÙ ØÙÙ ÙØÙØØ ØÙÙØØÙÙ ØÙÙÙÙ"
 
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "ØØØ ØÙØØ ØÙÙ ØÙ_ÙÙØØÙÙ..."
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
 msgstr "ØÙØØ ÙØÙÙÙ ÙØØØÙØ ØÙØÙØØØÙ ÙÙ ÙØØ ØÙÙØØÙÙ"
 
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "ØØÙÙÙØ ØÙØØÙ ØÙÙ ØÙ_ÙÙØÙØ..."
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
 msgstr "ØÙØØ ÙØÙÙÙ ÙØØØÙØ ØÙØÙØØØÙ ØÙØÙ ÙÙØ ÙØØ ØÙØÙÙØÙ"
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "Ø_ØØÙÙ ØÙÙØØØØØ"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "ØØØÙÙ ÙÙØØØ ØÙØØØÙØ ØÙÙ ØÙØØØØÙ ØÙÙÙØÙØØ"
 
-#: ../mail/e-mail-reader.c:1954
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "ØÙ_ØØ ÙÙ ØÙØØØÙØ..."
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
 msgstr "ØØØ ØÙ ØÙÙÙØ ÙÙ ØÙØØØÙØ ØÙÙØØÙØØ"
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "ØÙØ_Ø ØÙØÙÙ"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1847
 #, fuzzy
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "ØØÙÙÙ ØØ ØÙÙ ÙØØÙÙ ØÙØÙØØÙØ ØÙÙÙØÙØØ"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "ØÙÙ ÙÙÙÙØØ"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1854
 #, fuzzy
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ØÙØÙØØ ØÙÙØ ØÙØÙØØØÙ ÙÙ ÙÙØ ØØØØ ØÙØÙØØÙØ ØÙÙÙØÙØØ"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "_ØØØØ..."
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
 msgstr "ØÙÙÙ ØÙØØØÙØ ØÙÙÙØÙØØ ÙÙÙØØØØØ"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "ÙØ_ÙÙ"
 
-#: ../mail/e-mail-reader.c:1984 ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ØÙØÙÙ ØÙØØØÙØ ØÙÙÙØÙØØ ØÙÙ ØØØ ÙØ ÙÙÙØÙÙ"
 
-#: ../mail/e-mail-reader.c:1989
-#, fuzzy
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
-msgstr "Ù_ØØ ØÙÙØØ..."
+msgstr "Ù_ØÙØ ÙÙØÙÙ"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "_ØÙÙ ØÙØÙÙØÙ"
 
-#: ../mail/e-mail-reader.c:1998 ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 msgid "Forward the selected message in the body of a new message"
 msgstr "ØÙØÙÙ ØÙØØØÙØ ØÙÙÙØÙØØ ØÙÙ ØØØÙØ ØØÙØØ"
 
-#: ../mail/e-mail-reader.c:2003
-#, fuzzy
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
-msgstr "Ù_ØØ ØÙÙØØ..."
+msgstr "ÙØÙØ ØÙÙ ØÙ_ØÙØÙ"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "Ù_ÙØØØ"
 
-#: ../mail/e-mail-reader.c:2012 ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "ØÙØÙÙ ØÙØØØÙØ ØÙÙÙØÙØØ ÙÙØØÙØØ ÙØØÙ"
 
-#: ../mail/e-mail-reader.c:2017
-#, fuzzy
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
-msgstr "Ù_ØØ ØÙÙØØ..."
+msgstr "ÙØØ ÙØ_ÙØØØØ"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "_ØÙÙ ØÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "ØØØØØ ØØÙÙÙ ØÙØÙØ ÙÙ ØØÙØ HTML"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "Ù_ÙÙ"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "ØÙÙ ØÙØØØØÙ ØÙÙÙØÙØÙ ØÙÙ ØÙÙØ ÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "_ÙÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "ØÙÙ ØÙØØØØÙ ØÙÙÙØÙØÙ ØÙÙ ØÙÙØ ÙÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "_ÙÙØ ÙÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "ØÙÙ ØÙØØØØÙ ØÙÙÙØÙØÙ ØÙÙ ØÙÙØ ÙÙØØ ÙÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "_ÙÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "ØÙÙ ØÙØØØØÙ ØÙÙÙØÙØÙ ØÙÙ ØÙÙØ ÙÙØÙØØ"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "Ø_ÙØ ÙÙÙ"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "ØÙÙ ØÙØØØØÙ ØÙÙÙØÙØÙ ØÙÙ ØÙÙØ ØÙØ ÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "_ØÙØ ÙÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "ØÙÙÙ ØÙØØØØÙ ØÙÙÙØÙØÙ ØÙÙ ØÙÙØ ÙÙ ØÙØØ ØØØ"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "_ØØÙØ ÙØØØÙØÙ ØØÙØØ..."
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "ØÙØØ ØÙØØØØÙ ØÙÙÙØÙØÙ ÙÙ ÙØÙØØ ØÙØØÙÙÙ ÙØØØÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "ØØÙÙÙ ØØØÙØ _ØØÙØØ"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
 msgstr "ÙØØ ÙØÙØØ ØØÙØØ ÙØØÙÙÙ ØØØÙØ ØØÙØÙÙØ"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "ØÙØ_Ø ÙÙ ÙØÙØÙ ØØÙØØ"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "ØÙØØ ØÙØØØØÙ ØÙÙÙØÙØÙ ÙÙ ÙØÙØØ ØØÙØØ"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "Ø_ÙÙÙ ÙÙÙØÙÙØ..."
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "ØÙÙÙ ØÙØØØØÙ ØÙÙÙØÙØÙ ØÙÙ ÙØÙØ ØØØ"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:1985
 #, fuzzy
 msgid "_Switch to Folder"
 msgstr "ØØØÙÙ ØÙÙ %s"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:1987
 #, fuzzy
 msgid "Display the parent folder"
 msgstr "ØÙÙÙØ ØÙÙØÙØ ØÙÙØØØÙ"
 
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:1992
 #, fuzzy
 msgid "Switch to _next tab"
 msgstr "ØØØÙÙ ØÙÙ %s"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:1999
 #, fuzzy
 msgid "Switch to _previous tab"
 msgstr "ØØØÙÙ ØÙÙ %s"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2006
 #, fuzzy
 msgid "Cl_ose current tab"
 msgstr "ØÙÙ ØÙÙÙÙ ØÙØØÙÙ"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2008
 #, fuzzy
 msgid "Close current tab"
 msgstr "ØÙÙ ØÙÙÙÙ ØÙØØÙÙ"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "ØÙØÙØØÙØ ØÙ_ØÙØÙÙØ"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "ØØØ ØÙØØØÙØ ØÙØØÙÙØ"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "ØÙØØØÙØ ØÙ_ÙÙÙÙØ ØÙØØÙÙØ"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "ØØØ ØÙØØØÙØ ØÙÙÙÙØ ØÙØØÙÙØ"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "ØÙ_ÙÙÙØØ ØÙØØÙÙ"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "ØØØØ ØÙØÙØ ØÙØØÙÙ"
 
-#: ../mail/e-mail-reader.c:2150
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "ØÙØÙØØÙØ _ØÙØ ØÙÙÙØÙØØ ØÙØØÙÙØ"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "ØØØØ ØÙØØØÙØ ØÙØ ØÙÙÙØÙØØ ØÙØØÙÙØ"
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "ØÙ_ØÙØØÙØ ØÙØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "ØØØ ØÙØØØÙØ ØÙØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "ØÙØØØÙØ ØÙÙÙÙÙØ ØÙ_ØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "ØØØ ØÙØØØÙØ ØÙÙÙÙØ ØÙØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2055
 #, fuzzy
 msgid "Previous T_hread"
 msgstr "ØÙ_ØÙØØÙØ ØÙØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2057
 #, fuzzy
 msgid "Display the previous thread"
 msgstr "ØØØ ØÙØØØÙØ ØÙØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "ØÙØØØÙØ ØÙØ ØÙÙÙØÙØØ ØÙ_ØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "ØØØØ ØÙØØØÙØ ØÙØ ØÙÙÙØÙØØ ØÙØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "ØØØ ÙØÙ ØÙØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "ØØÙÙÙ ØÙØØØÙØ ÙØÙ ØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "ØØÙØ ØÙØÙÙ"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "ØØÙØ ØÙØÙÙ (bounce) ØÙØØØÙØ ØÙÙØØÙØØ ØÙÙ ØØØ ÙØ"
 
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2090
 #, fuzzy
 msgid "Remo_ve Attachments"
 msgstr "ØØÙØ ØÙÙØÙÙØØ"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2092
 #, fuzzy
 msgid "Remove attachments"
 msgstr "ØØÙØ ØÙÙØ ØÙÙØÙÙØØ"
 
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2097
 #, fuzzy
 msgid "Remove Du_plicate Messages"
 msgstr "ØØÙÙ ØÙØÙØØØÙ ØÙÙÙØÙØÙ"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2099
 #, fuzzy
 msgid "Checks selected messages for duplicates"
 msgstr "ØÙÙÙ ØÙØØØÙØ ØÙÙÙØÙØØ ÙÙØØÙ"
 
-#: ../mail/e-mail-reader.c:2220 ../mail/mail.error.xml.h:102
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
-#: ../modules/mail/e-mail-attachment-handler.c:179
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "ØÙØ ØÙÙ ØÙ_ÙÙ"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2106
 #, fuzzy
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "ØØÙÙÙ ØØÙ ØÙÙ ÙÙ ØÙÙØØÙÙ ØÙÙÙÙ ÙÙØØØÙØ ØÙÙÙØÙØØ"
 
-#: ../mail/e-mail-reader.c:2227 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "ØÙØ ØÙÙ ØÙ_ÙØØÙØ"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "ØØÙÙÙ ØØ ØÙÙ ØÙÙØØÙØ ØÙØØÙØÙÙØ ÙÙØÙØØÙØ ØÙÙÙØÙØØ"
 
-#: ../mail/e-mail-reader.c:2234
-#: ../modules/mail/e-mail-attachment-handler.c:186
+#: ../mail/e-mail-reader.c:2118
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_ØØ ØÙÙ ØÙÙØØÙÙ"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "ØØÙÙÙ ØØ ØÙÙ ÙØØÙÙ ØÙØÙØØÙØ ØÙÙÙØÙØØ"
 
-#: ../mail/e-mail-reader.c:2241
-#, fuzzy
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
-msgstr "ØØÙØ ÙÙ..."
+msgstr "Ø_ØÙØ Ùâ mbox..."
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2127
 #, fuzzy
 msgid "Save selected messages as an mbox file"
 msgstr "ØØÙØ ØÙØØØØÙ ØÙÙÙØÙØÙ ÙÙÙÙ ÙØÙÙ"
 
-#: ../mail/e-mail-reader.c:2248
-msgid "Search Folder from Mailing _List..."
-msgstr "ÙØÙØ ØØØ ÙÙ ÙØ_ØÙØ ØØÙØÙØ..."
-
-#: ../mail/e-mail-reader.c:2250
-#, fuzzy
-msgid "Create a search folder for this mailing list"
-msgstr "ØÙØØ ÙØÙÙØ ØØØ ÙÙÙØØÙØ ØÙØØÙØÙØ ÙØÙ"
-
-#: ../mail/e-mail-reader.c:2255
-msgid "Search Folder from Recipien_ts..."
-msgstr "ÙØÙØ ØØØ ÙÙØØØØÙ ØØÙÙØØ_ÙÙÙÙ..."
-
-#: ../mail/e-mail-reader.c:2257
-#, fuzzy
-msgid "Create a search folder for these recipients"
-msgstr "ØÙØØ ÙØÙÙØ ØØØ ÙÙØÙØØ ØÙÙØØÙÙ ØÙÙÙÙ"
-
-#: ../mail/e-mail-reader.c:2262
-msgid "Search Folder from Sen_der..."
-msgstr "ÙØÙØ ØØØ ÙÙØØØØÙ ÙÙ ØÙ_ÙØØÙÙ..."
-
-#: ../mail/e-mail-reader.c:2264
-#, fuzzy
-msgid "Create a search folder for this sender"
-msgstr "ØÙØØ ÙØÙÙØ ØØØ ÙÙØØ ØÙÙØØÙÙ"
-
-#: ../mail/e-mail-reader.c:2269
-msgid "Search Folder from S_ubject..."
-msgstr "ÙØÙØ ØØØ ÙÙØØØØÙ ØØÙÙÙ_ØÙØ..."
-
-#: ../mail/e-mail-reader.c:2271
-#, fuzzy
-msgid "Create a search folder for this subject"
-msgstr "ØÙØØ ÙØÙÙØ ØØØ ÙÙØØ ØÙÙÙØÙØ"
-
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "Ù_ØØØ ØÙØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "ØØÙØ ÙØØØ ØÙØØÙØ ØÙØÙÙØØÙÙÙ ØÙØØÙ ÙÙØÙØØÙØ"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "ØØØØØ ØÙ Ø_ØÙ ØÙØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "ØØØØØ ØÙ ØØÙ ØÙØØØØÙ ØÙÙÙØÙØÙ"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "ØØÙ _ØØØÙ"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "ØØÙØ ØØØ ØÙÙÙØ ÙØØÙÙ ØÙØØÙÙ"
 
-#: ../mail/e-mail-reader.c:2304
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "Ø_ÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "ØÙØ ØØÙ ØÙÙÙØ"
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "Ø_ØØÙØ"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "ØÙØ ØØÙ ØÙÙØ"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "ØÙØØ _ÙØØØØ"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "ØØÙÙØ ØÙÙ_ØØØÙ"
 
-#: ../mail/e-mail-reader.c:2334
-#, fuzzy
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
-msgstr "Ù_ØØ ØÙÙØØ..."
+msgstr "Ù_ØØ"
 
-#: ../mail/e-mail-reader.c:2341
-#, fuzzy
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
-msgstr "_ØØ"
+msgstr "_ØØ ØÙØØÙ"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "Ø_ØÙØ ØÙÙ"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2211
 #, fuzzy
 msgid "Mar_k As"
 msgstr "Ù_ØØ ØÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "_ØØØÙØ"
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "ØØ_ØÙÙ"
 
-#: ../mail/e-mail-reader.c:2394
-msgid "Mark for Follo_w Up..."
-msgstr "ØÙÙÙ ÙÙÙØØØ_ØØ..."
-
-#: ../mail/e-mail-reader.c:2402
-msgid "Mark as _Important"
-msgstr "_ØÙÙÙ ØÙÙ ØÙÙØ _ÙÙÙÙØ"
+#: ../mail/e-mail-reader.c:2235
+msgid "Search Folder from Mailing _List..."
+msgstr "ÙØÙØ ØØØ ÙÙ ÙØ_ØÙØ ØØÙØÙØ..."
 
-#: ../mail/e-mail-reader.c:2406
+#: ../mail/e-mail-reader.c:2237
+#, fuzzy
+msgid "Create a search folder for this mailing list"
+msgstr "ØÙØØ ÙØÙÙØ ØØØ ÙÙÙØØÙØ ØÙØØÙØÙØ ÙØÙ"
+
+#: ../mail/e-mail-reader.c:2242
+msgid "Search Folder from Recipien_ts..."
+msgstr "ÙØÙØ ØØØ ÙÙØØØØÙ ØØÙÙØØ_ÙÙÙÙ..."
+
+#: ../mail/e-mail-reader.c:2244
+#, fuzzy
+msgid "Create a search folder for these recipients"
+msgstr "ØÙØØ ÙØÙÙØ ØØØ ÙÙØÙØØ ØÙÙØØÙÙ ØÙÙÙÙ"
+
+#: ../mail/e-mail-reader.c:2249
+msgid "Search Folder from Sen_der..."
+msgstr "ÙØÙØ ØØØ ÙÙØØØØÙ ÙÙ ØÙ_ÙØØÙÙ..."
+
+#: ../mail/e-mail-reader.c:2251
+#, fuzzy
+msgid "Create a search folder for this sender"
+msgstr "ØÙØØ ÙØÙÙØ ØØØ ÙÙØØ ØÙÙØØÙÙ"
+
+#: ../mail/e-mail-reader.c:2256
+msgid "Search Folder from S_ubject..."
+msgstr "ÙØÙØ ØØØ ÙÙØØØØÙ ØØÙÙÙ_ØÙØ..."
+
+#: ../mail/e-mail-reader.c:2258
+#, fuzzy
+msgid "Create a search folder for this subject"
+msgstr "ØÙØØ ÙØÙÙØ ØØØ ÙÙØØ ØÙÙÙØÙØ"
+
+#: ../mail/e-mail-reader.c:2281
+msgid "Mark for Follo_w Up..."
+msgstr "ØÙÙÙ ÙÙÙØØØ_ØØ..."
+
+#: ../mail/e-mail-reader.c:2289
+msgid "Mark as _Important"
+msgstr "_ØÙÙÙ ØÙÙ ØÙÙØ _ÙÙÙÙØ"
+
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "ØÙÙÙ Ù_ÙÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "ØÙÙÙ ÙÙÙØ _ÙÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2414
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "ØÙÙÙ Ù _ÙÙØÙØØ"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2305
 #, fuzzy
 msgid "Mark as Uni_mportant"
 msgstr "ØÙÙÙ ØÙÙ ØÙÙØ Ø_ÙØ ÙÙÙÙØ"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "_ØÙÙÙ Ù_ØÙØ ÙÙØÙØ"
 
-#: ../mail/e-mail-reader.c:2466
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "ÙØØ ØØÙØØ ØÙÙØ_ØØ"
 
-#: ../mail/e-mail-reader.c:2468
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ØØÙØ ÙØØÙØ ÙØÙØ ÙÙ ÙØÙ ØÙØÙØØØÙ ØÙÙØØÙØØ"
 
-#: ../mail/e-mail-reader.c:2474
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "ÙÙ _ØØÙÙØØØ ØÙØØØØÙ"
 
-#: ../mail/e-mail-reader.c:2476
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "ØØÙØ ØÙØÙØØØÙ ÙØ ÙÙ ØØÙÙØØØ ØÙØØÙØ ØÙØÙÙØØÙÙÙ"
 
-#: ../mail/e-mail-reader.c:2714
-msgid "Unable to retrieve message"
-msgstr "ÙÙ ØØØØÙØ ØÙØ ØÙØØØÙØ"
-
-#: ../mail/e-mail-reader.c:2776 ../mail/mail-ops.c:2068
+#: ../mail/e-mail-reader.c:2659
 #, fuzzy, 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:3394 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:538
-#: ../plugins/google-account-setup/google-source.c:674
-#: ../widgets/misc/e-account-tree-view.c:249
+#. * other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:316
+#: ../plugins/google-account-setup/google-source.c:565
+#: ../plugins/google-account-setup/google-source.c:704
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "ØÙØÙØØØØ"
 
-#: ../mail/e-mail-reader.c:3565
-#: ../modules/mail/e-mail-attachment-handler.c:172
+#: ../mail/e-mail-reader.c:3415
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_ÙØÙØ"
 
-#: ../mail/e-mail-reader.c:3566
+#: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "ØÙØÙÙ ØÙØØØÙØ ØÙÙÙØÙØØ ÙØØØ ÙØ"
 
-#: ../mail/e-mail-reader.c:3585
-#, fuzzy
+#: ../mail/e-mail-reader.c:3435
 msgid "Group Reply"
-msgstr "ØÙÙÙØ ØÙØÙØØØ ØØØ"
+msgstr "ØØ ØÙØØÙ"
 
-#: ../mail/e-mail-reader.c:3586
+#: ../mail/e-mail-reader.c:3436
 #, fuzzy
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "ØØÙÙÙ ØØ ØÙÙ ØÙÙØØÙØ ØÙØØÙØÙÙØ ÙÙØÙØØÙØ ØÙÙÙØÙØØ"
 
-#: ../mail/e-mail-reader.c:3631 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:746
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "ØØØÙ"
 
-#: ../mail/e-mail-reader.c:3664
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
-#: ../widgets/misc/e-calendar.c:201
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "ØÙØÙØÙÙ"
 
-#: ../mail/e-mail-reader.c:3668
-#: ../modules/calendar/e-cal-shell-view-actions.c:1304
-#: ../widgets/misc/e-calendar.c:177
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "ØÙØØØÙ"
 
-#: ../mail/e-mail-reader.c:3678 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "ØØ"
 
-#: ../mail/e-mail-reader.c:4313
+#: ../mail/e-mail-reader.c:4205
 #, fuzzy, c-format
 msgid "Folder '%s'"
 msgstr "ÙØÙÙØ"
 
-#: ../mail/e-mail-session.c:643
+#: ../mail/e-mail-reader-utils.c:145
+#, fuzzy
+msgid "Do not warn me again"
+msgstr "ÙØ ØØØÙÙÙ ÙØØ ØØØÙ"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:670
+#, c-format
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../mail/e-mail-reader-utils.c:1047
+#, fuzzy
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "ØØÙØ ØÙØÙØØÙØ..."
+msgstr[1] "ØØÙØ ØÙØÙØØÙØ..."
+msgstr[2] "ØØÙØ ØÙØÙØØÙØ..."
+msgstr[3] "ØØÙØ ØÙØÙØØÙØ..."
+msgstr[4] "ØØÙØ ØÙØÙØØÙØ..."
+msgstr[5] "ØØÙØ ØÙØÙØØÙØ..."
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * mbox format, when the first message doesn't have a
+#. * subject.  The extension ".mbox" is appended to the
+#. * string; for example "Message.mbox".
+#: ../mail/e-mail-reader-utils.c:1068
+#, fuzzy
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "ØØØÙØ"
+msgstr[1] "ØØØÙØ"
+msgstr[2] "ØØØÙØ"
+msgstr[3] "ØØØÙØ"
+msgstr[4] "ØØØÙØ"
+msgstr[5] "ØØØÙØ"
+
+#: ../mail/e-mail-session.c:870
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "ØØØÙ ØÙÙØ ØÙØØ ÙÙ%s"
 
-#: ../mail/e-mail-session.c:645
+#: ../mail/e-mail-session.c:874
 msgid "Enter Passphrase"
 msgstr "ØØØÙ ØÙÙØ ØÙØØ"
 
-#: ../mail/e-mail-session.c:648
+#: ../mail/e-mail-session.c:878
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ØØØÙ ÙÙÙØ ØÙØØ ÙÙ %s"
 
-#: ../mail/e-mail-session.c:650
+#: ../mail/e-mail-session.c:882
 msgid "Enter Password"
 msgstr "ØØØÙ ÙÙÙØ ØÙØÙØ"
 
-#: ../mail/e-mail-session.c:703
+#: ../mail/e-mail-session.c:933
 #, c-format
 msgid "User canceled operation."
 msgstr "ØÙÙÙØ ØÙØØÙØ ØÙÙØØØØÙ."
 
-#: ../mail/e-mail-session.c:873
+#: ../mail/e-mail-session.c:1046
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 
-#: ../mail/e-mail-session.c:882
+#: ../mail/e-mail-session.c:1055
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 
-#: ../mail/e-mail-session.c:1286 ../mail/mail-ops.c:1220
-#, fuzzy, c-format
-msgid "Opening folder '%s'"
-msgstr "ÙØØÙ ÙØØ ØÙÙØÙÙØ %s"
-
-#: ../mail/e-mail-session.c:1302
+#: ../mail/e-mail-session-utils.c:419
 #, fuzzy, c-format
-msgid "Invalid folder: %s"
-msgstr "ÙØÙØ ØÙØ ØØÙØ: `%s'"
+msgid "Cannot get transport for account '%s'"
+msgstr "ØØØ ÙØØØÙÙ ØÙØØØØ '%s'"
 
-#: ../mail/e-mail-session-utils.c:490 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ÙØÙ ØØØÙÙ ÙØØØØØ ØÙØØÙØ ØÙØØØØ: %s"
 
-#: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
 #, fuzzy, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9128,194 +9361,45 @@ msgstr ""
 "ÙØÙ ØÙØÙØØÙ ØÙÙ %s: %s\n"
 "ØÙØÙ ØÙØÙØØÙ ØÙÙ ÙØÙØ `ØÙØØÙ' ØÙÙØÙÙ ØØÙÙØ ÙÙÙ."
 
-#: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
 #, fuzzy, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ÙØÙ ØÙØÙØØÙ ØÙÙ ÙØÙØ `ØÙØØÙÙ' ØÙÙØÙÙ: %s"
 
-#: ../mail/e-mail-session-utils.c:779 ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "ØØØÙ ØØØØÙ ØÙØÙØØÙØ"
 
-#: ../mail/e-mail-session-utils.c:850
+#: ../mail/e-mail-session-utils.c:873
 #, fuzzy, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "ØÙØØØ ØÙØØØØØÙ ÙÙ ØÙÙØÙØ  \"%s\""
 
-#: ../mail/e-mail-store-utils.c:39
+#: ../mail/e-mail-store-utils.c:168
 #, fuzzy, c-format
 msgid "Disconnecting from '%s'"
 msgstr "ÙØØÙ ÙØØ ØÙØØØØÙ ØÙ%s"
 
-#: ../mail/e-mail-store-utils.c:130
+#: ../mail/e-mail-store-utils.c:259
 #, fuzzy, c-format
 msgid "Reconnecting to '%s'"
 msgstr "ÙØØÙ ØØØØØ ØÙØØØØÙ ØÙ %s"
 
+#: ../mail/e-mail-store-utils.c:334
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "ØØØÙ ØØØÙØ ØØØØ '%s' ÙÙØÙÙ ØÙÙ ØØØØÙ."
+
 #: ../mail/e-mail-tag-editor.c:291
 msgid "Flag to Follow Up"
 msgstr "ØÙÙ ÙÙÙØØØØØ"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:567 ../mail/mail-config.ui.h:69
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "ÙØ ØØÙÙØ"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:571 ../mail/mail-config.ui.h:126
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "ØØÙÙØ TLS"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c: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:838 ../widgets/misc/e-signature-combo-box.c:75
-#, fuzzy
-msgctxt "mail-signature"
-msgid "None"
-msgstr "ÙØ ØÙØ"
-
-#: ../mail/em-account-editor.c:919
-msgid "Never"
-msgstr "ØØØÙØ"
-
-#: ../mail/em-account-editor.c:920
-msgid "Always"
-msgstr "ØØØÙÙØ"
-
-#: ../mail/em-account-editor.c:921
-msgid "Ask for each message"
-msgstr "ØØØÙ ÙÙÙ ØØØÙØ"
-
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1741 ../widgets/misc/e-account-tree-view.c:127
-#, fuzzy
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "ÙØ ØÙØ"
-
-#: ../mail/em-account-editor.c:2140
-msgid "Mail Configuration"
-msgstr "ØØØØØØØ ØÙØØÙØ"
-
-#: ../mail/em-account-editor.c:2141
-#, fuzzy
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"ÙØØØØ ØÙ ÙÙ ÙØØØØ ØØØØØ ØØÙØ ØÙÙÙÙÙØÙ.\n"
-"\n"
-"ØÙØØØØ ÙÙØ \"ØÙØÙ\" ÙÙØØØ. "
-
-#: ../mail/em-account-editor.c:2144
-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:2146 ../mail/em-account-editor.c:2309
-msgid "Receiving Email"
-msgstr "ØØØÙØØÙ ØØÙØ"
-
-#: ../mail/em-account-editor.c:2147
-#, fuzzy
-msgid "Please configure the following account settings."
-msgstr "ØÙØØØØ ØÙØÙØÙØØ ÙÙ ØÙØÙØØØØ ØÙØØÙÙØ"
-
-#: ../mail/em-account-editor.c:2149 ../mail/em-account-editor.c:2809
-msgid "Sending Email"
-msgstr "ØØØØÙ ØØÙØ"
-
-#: ../mail/em-account-editor.c:2150
-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:2152 ../mail/mail-config.ui.h:1
-#, fuzzy
-msgid "Account Information"
-msgstr "ÙØ ÙØÙÙÙØØ"
-
-#: ../mail/em-account-editor.c:2153
-#, fuzzy
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"ØØØØ ØØØÙ ØØÙÙØ ÙÙØÙ ÙØØ ØÙØØØØ ÙÙ ØÙÙØØØØ ØØÙØÙ.\n"
-"ØÙØÙ ØØØØÙØÙ ÙØØ ØÙØØÙ ÙØØØØØ ØÙØØØ ÙÙØ."
-
-#: ../mail/em-account-editor.c:2157
-msgid "Done"
-msgstr "ØÙ"
-
-#: ../mail/em-account-editor.c:2158
-#, fuzzy
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"ØÙØÙÙÙØØ ÙÙØ ØÙÙ ØØØØØ ØØÙØÙ.\n"
-"\n"
-"ØÙÙÙ ØØÙØÙ ØÙØÙ ÙØØØØÙ Ù ØÙÙÙ ØÙØØÙØ ØÙØÙÙØØÙÙÙ \n"
-"ÙØØØÙÙÙØ ØÙÙÙÙÙØÙÙ.\n"
-"\n"
-"ØÙØØØØ ÙÙØ \"ØØÙ\" ÙØÙØ ØØØØØØØÙ."
-
-#: ../mail/em-account-editor.c:2623
-msgid "Check for _new messages every"
-msgstr "ØØÙÙ ÙÙ ØÙØØØØÙ ØÙ_ØØÙØØ ÙÙÙÙ"
-
-#: ../mail/em-account-editor.c:2631
-msgid "minu_tes"
-msgstr "ØÙØØ_Ù"
-
-#: ../mail/em-account-editor.c:2914
-#, fuzzy
-msgid "Please select a folder from the current account."
-msgstr "ØØØØ ØØØØ ØÙØØ ÙÙØØ ØÙÙØØØØÙ"
-
-#: ../mail/em-account-editor.c:3224 ../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:3270 ../mail/em-account-editor.c:3338
-msgid "Receiving Options"
-msgstr "ØÙØØØØ ØÙØÙÙÙ"
-
-#: ../mail/em-account-editor.c:3271 ../mail/em-account-editor.c:3339
-msgid "Checking for New Messages"
-msgstr "ØØØ ØÙÙØØ ÙÙØØØ ØÙ ØØØØÙ ØØÙØØ"
-
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1173
+#. 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:1197
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9323,35 +9407,35 @@ msgstr ""
 "ÙÙ ${AbbrevWeekdayName}Ø ${Day}-${Month}-${Year} ØÙØ ${24Hour}:${Minute} "
 "${TimeZone} Ø ÙØØ ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1184
+#: ../mail/em-composer-utils.c:1208
 msgid "-----Original Message-----"
 msgstr "-------- ØÙØØØÙØ ØÙØØÙÙØ -------- "
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1851
+#: ../mail/em-composer-utils.c:1992
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1905
+#: ../mail/em-composer-utils.c:2052
 #, fuzzy, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ØØØØØ ØÙØØØØØ ØÙØØÙØÙ"
 
-#: ../mail/em-composer-utils.c:2356
+#: ../mail/em-composer-utils.c:2592
 msgid "an unknown sender"
 msgstr "ÙØØÙÙ ÙØÙÙÙ"
 
-#: ../mail/em-composer-utils.c:2787
+#: ../mail/em-composer-utils.c:2998
 msgid "Posting destination"
 msgstr "ÙØÙØ ØÙÙØØ"
 
-#: ../mail/em-composer-utils.c:2788
+#: ../mail/em-composer-utils.c:2999
 msgid "Choose folders to post the message to."
 msgstr "ØØØØ ÙØÙØØØ ÙÙØØ ØÙØØØÙØ ØÙØ."
 
-#: ../mail/em-filter-folder-element.c:339
+#: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
 msgstr "ØÙØÙÙ ÙØÙÙØÙØ"
 
@@ -9468,7 +9552,7 @@ msgstr "ÙÙ ÙØØØ"
 msgid "is set"
 msgstr "ØÙØÙØÙ "
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "ÙÙØÙØ"
 
@@ -9518,7 +9602,7 @@ msgid "Play Sound"
 msgstr "ØØØÙ ØÙØ"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "ØÙØØ"
 
@@ -9599,16 +9683,15 @@ msgid "Unset Status"
 msgstr "ØÙØ ØØØ ØÙØØÙØ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:536
+#: ../mail/em-filter-rule.c:561
 msgid "Then"
 msgstr "ØÙÙ"
 
-#: ../mail/em-filter-rule.c:567
+#: ../mail/em-filter-rule.c:592
 msgid "Add Ac_tion"
 msgstr "ØØÙÙ ØØØØØÙØ"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:124
+#: ../mail/em-folder-properties.c:145
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ØÙØØØØÙ ØÙØ ØÙÙÙØÙØØ:"
@@ -9618,9 +9701,7 @@ msgstr[3] "ØÙØØØØÙ ØÙØ ØÙÙÙØÙØØ:"
 msgstr[4] "ØÙØØØØÙ ØÙØ ØÙÙÙØÙØØ:"
 msgstr[5] "ØÙØØØØÙ ØÙØ ØÙÙÙØÙØØ:"
 
-#. TODO: can this be done in a loop?
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:128
+#: ../mail/em-folder-properties.c:156
 #, fuzzy
 msgid "Total messages:"
 msgid_plural "Total messages:"
@@ -9631,183 +9712,241 @@ msgstr[3] "ÙØÙÙØ ØÙØØØØÙ:"
 msgstr[4] "ÙØÙÙØ ØÙØØØØÙ:"
 msgstr[5] "ÙØÙÙØ ØÙØØØØÙ:"
 
-#: ../mail/em-folder-properties.c:146
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "ØØØØØØÙ ØÙØØØ  (%s):"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:179
 #, c-format
 msgid "Quota usage"
 msgstr "ØØØØØØÙ ØÙØØØ"
 
-#: ../mail/em-folder-properties.c:290
+#: ../mail/em-folder-properties.c:317
 msgid "Folder Properties"
 msgstr "ØØØØØ ØÙÙØÙÙØ"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:79
 msgid "<click here to select a folder>"
 msgstr "<ØÙÙÙØ ÙÙØ ÙØÙØÙØØ ÙØÙÙØ>"
 
-#: ../mail/em-folder-selector.c:261
+#: ../mail/em-folder-selector.c:436
 msgid "C_reate"
 msgstr "ØÙ_ØØ"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:442
 msgid "Folder _name:"
 msgstr "Ø_ØÙ ØÙÙØÙÙØ:"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
-msgid "Search Folders"
-msgstr "ÙØÙØØØ ØÙØØØ"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr "ØÙØ ÙØØØÙ"
-
-#: ../mail/em-folder-tree-model.c:808 ../mail/em-folder-tree-model.c:1085
-msgid "Loading..."
-msgstr "ÙØØÙ ØÙØÙØÙÙÙ..."
-
-#: ../mail/em-folder-tree.c:197
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "ÙØØ ØÙØØØØÙ ÙÙ \"%s\""
-
-#: ../mail/em-folder-tree.c:625
+#: ../mail/em-folder-tree.c:647
 msgid "Folder names cannot contain '/'"
 msgstr "ÙØ ÙÙÙÙ ØÙ ÙØØÙÙ ØØÙ ØÙÙØÙÙØ ØÙØÙØ '/'."
 
-#: ../mail/em-folder-tree.c:1245
+#: ../mail/em-folder-tree.c:768
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1482
+#: ../mail/em-folder-tree.c:1590
 msgid "Mail Folder Tree"
 msgstr "ØØØØ ÙØÙÙØ ØÙØØÙØ"
 
-#: ../mail/em-folder-tree.c:1938 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "ÙÙÙ ØÙÙØÙØ %s"
 
-#: ../mail/em-folder-tree.c:1942 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "ÙØØ ØÙÙØÙØ %s"
 
-#: ../mail/em-folder-tree.c:1951 ../mail/message-list.c:2243
+#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ÙÙÙ ØÙØØØØÙ ØÙÙ ØÙÙØÙÙØ %s"
 
-#: ../mail/em-folder-tree.c:1955 ../mail/message-list.c:2245
+#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ÙØØ ØÙØØØØÙ ØÙÙ ØÙÙØÙÙØ %s"
 
-#: ../mail/em-folder-tree.c:1974
+#: ../mail/em-folder-tree.c:2102
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ØÙØ ÙØØØ ØÙÙ ØØØ ØÙØØØÙØ/ØÙØØØØÙ ØÙÙ ÙØØÙÙ ØÙØØØÙÙ ØÙØÙÙÙ"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:163 ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
+#: ../mail/mail-vfolder.c:1125 ../mail/mail-vfolder.c:1239
+msgid "Search Folders"
+msgstr "ÙØÙØØØ ØÙØØØ"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
+msgid "UNMATCHED"
+msgstr "ØÙØ ÙØØØÙ"
+
+#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
+msgid "Loading..."
+msgstr "ÙØØÙ ØÙØÙØÙÙÙ..."
+
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "ØÙÙÙ ØÙÙØÙÙØ ØÙÙ..."
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "ØÙØØ ØÙÙØÙÙØ ØÙÙ..."
 
-#: ../mail/em-folder-utils.c:571
-#: ../plugins/groupwise-features/share-folder-common.c:138
-#, fuzzy, c-format
-msgid "Creating folder '%s'"
-msgstr "ØÙØØØ ØÙÙØÙÙØ '%s'"
-
-#: ../mail/em-folder-utils.c:741
+#: ../mail/em-folder-utils.c:590
 msgid "Create Folder"
 msgstr "ØÙØØ ÙØÙÙØÙØ"
 
-#: ../mail/em-folder-utils.c:742
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../mail/em-folder-utils.c:591
 msgid "Specify where to create the folder:"
 msgstr "ØØÙØ ØÙÙ ØÙØÙ ØÙØØØ ØÙÙØÙÙØ:"
 
-#: ../mail/em-format-html-display.c:84 ../mail/em-format-html.c:1601
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "ÙØØÙ ØÙÙØØ ØÙØØØÙØ"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "ÙØØÙ ØÙÙØØ ØÙØØØÙØ..."
+
+#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1572
+#, fuzzy, c-format
+msgid "Retrieving '%s'"
+msgstr "ÙØØÙ ØØØ '%s'"
+
+#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "ØÙØ ÙÙÙÙØØ"
 
-#: ../mail/em-format-html-display.c:84
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "ÙØÙ ØÙØÙØØÙØ ØÙØ ÙÙÙÙØØ. ÙØ ØÙØÙ ØØÙ ÙØÙ ØÙØØØÙØ ØØÙÙÙØ."
-
-#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1602
+#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "ØÙÙÙØ ØÙÙÙ"
 
-#: ../mail/em-format-html-display.c:85
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "ÙØÙ ØÙØÙØØÙØ ÙÙÙÙØØ Ù ØÙÙÙØ ÙÙØ ÙØÙÙ ØÙÙØ ÙÙ ØÙØØÙØ ØØÙÙÙØ."
-
-#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "ØÙÙÙØ ØÙØ ØØÙØ"
 
-#: ../mail/em-format-html-display.c:86
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr "ÙØ ÙÙÙÙ ØÙØÙØÙÙÙ ÙÙ ØÙÙÙØ ÙØÙ ØÙØÙØØÙØØ ØØÙÙØ ØÙÙÙØØ ØØÙØØ ØÙÙÙÙÙ."
-
-#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "ØÙÙÙØ ØØÙØ ÙÙÙ ØØØØ ØÙØÙØÙÙÙ ÙÙ ØÙÙØØÙÙ"
 
-#: ../mail/em-format-html-display.c:87
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr "ÙØÙ ØÙØÙØØÙØ ÙÙÙÙØØ ØØÙÙÙØÙ ØÙÙÙØ Ù ÙÙÙ ØØØØ ØÙØÙØÙÙÙ ÙÙ ÙØØÙÙ ØÙØÙØØÙØ."
-
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1605
+#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
 msgid "Signature exists, but need public key"
 msgstr "ØÙØÙÙÙØ ÙÙØÙØ ÙÙÙÙÙ ÙØØØØ ÙÙØØØÙØ ØØÙÙØ"
 
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "ØÙØ ÙØÙÙØØ"
+
+#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "ÙØÙÙØØØ ØØÙÙØ"
+
+#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "ÙØÙÙØØ"
+
+#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "ÙØÙÙØØØ ØÙÙÙØ"
+
+#: ../mail/em-format-html.c:2136
+msgid "Unknown external-body part."
+msgstr "ØØØ ØÙÙØÙ ØÙØØØØÙ ØÙØ ÙØØÙÙ.."
+
+#: ../mail/em-format-html.c:2146
+msgid "Malformed external-body part."
+msgstr "ØØØ ØÙÙØÙ ØÙØØØØÙ ÙØÙÙÙ."
+
+#: ../mail/em-format-html.c:2177
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "ÙØØÙØ ÙÙÙÙØ FTP (%s)"
+
+#: ../mail/em-format-html.c:2188
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "ÙØØÙØ ÙÙÙÙÙÙ ÙØÙÙÙ (%s) ØØÙØ ÙÙ ØÙÙÙÙØ \"%s\""
+
+#: ../mail/em-format-html.c:2190
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "ÙØØÙØ ÙÙÙÙ ÙØÙÙÙ (%s)"
+
+#: ../mail/em-format-html.c:2211
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "ÙØØÙØ ÙØÙØÙØØ ØØÙØØ (%s)"
+
+#: ../mail/em-format-html.c:2226
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "ÙØØÙØ ÙØÙØÙØØ ØØØØÙÙØ ÙØÙÙÙØ (ÙØØ \"%s\")"
+
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2934
+#: ../plugins/mail-notification/mail-notification.c:402
+#, fuzzy, c-format
+msgid "From: %s"
+msgstr "ÙÙ %s:"
+
+#: ../mail/em-format-html.c:2956
+#, fuzzy
+msgid "(no subject)"
+msgstr "(ØÙÙ ÙÙØÙØ)"
+
+#: ../mail/em-format-html.c:3032
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "ØØØÙ %s ÙØÙ ØÙØØØÙØ ØØÙÙÙØØØ ØÙ %s"
+
+#: ../mail/em-format-html-display.c:89
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "ÙØÙ ØÙØÙØØÙØ ØÙØ ÙÙÙÙØØ. ÙØ ØÙØÙ ØØÙ ÙØÙ ØÙØØØÙØ ØØÙÙÙØ."
+
+#: ../mail/em-format-html-display.c:90
+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:91
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr "ÙØ ÙÙÙÙ ØÙØÙØÙÙÙ ÙÙ ØÙÙÙØ ÙØÙ ØÙØÙØØÙØØ ØØÙÙØ ØÙÙÙØØ ØØÙØØ ØÙÙÙÙÙ."
+
+#: ../mail/em-format-html-display.c:92
+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:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "ÙØÙ ØÙØÙØØÙØ ÙÙÙÙØØ ØØÙÙÙØØ ÙÙÙÙ ÙØ ÙÙØØØ ØØÙ ÙØØØØÙØ ØØÙØÙÙÙØ."
 
-#: ../mail/em-format-html-display.c:95 ../mail/em-format-html.c:1611
-msgid "Unencrypted"
-msgstr "ØÙØ ÙØÙÙØØ"
-
-#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 "ÙØÙ ØÙØÙØØÙØ ÙÙØØ ÙØÙÙØØ. ÙÙ ØÙÙÙÙÙ ÙØØÙØØ ÙØØÙØÙØ ØØÙØØ ÙÙÙÙØ ØØØ ØÙØÙØØÙØ."
 
-#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1612
-msgid "Encrypted, weak"
-msgstr "ÙØÙÙØØØ ØØÙÙØ"
-
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:101
 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 "
@@ -9816,21 +9955,13 @@ msgstr ""
 "ÙØÙ ØÙØÙØØÙØ ÙØÙÙØØØ Ù ÙÙÙ ØØÙØØØÙÙØ ØØÙÙØ ØØÙÙØ. ØÙØØØ Ù ÙÙÙ ÙÙ ÙØØØÙÙ ØÙÙ "
 "ØØØ ØØØØÙ ÙØØÙØØ ÙØØÙÙ ÙØÙ ØÙØÙØØÙØ ØÙÙ ÙØØØÙ ØÙÙÙÙØ ÙØÙÙÙØ."
 
-#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1613
-msgid "Encrypted"
-msgstr "ÙØÙÙØØ"
-
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "ÙØÙ ØÙØÙØØÙØ ÙØÙÙØØ. ÙÙ ØÙØØØ ØÙÙ ØØØ ØØØØÙ ÙØØÙØØ ÙØØÙØÙØ."
 
-#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1614
-msgid "Encrypted, strong"
-msgstr "ÙØÙÙØØØ ØÙÙÙØ"
-
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:103
 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 "
@@ -9839,15 +9970,15 @@ msgstr ""
 "ÙØÙ ØÙØÙØØÙØ ÙØÙÙØØ ØØÙØØØÙÙØ ØØÙÙØ ÙÙÙÙØ. ØÙÙÙÙ ÙÙ ØÙØÙØØ ØØÙÙØ ØÙÙ ØÙÙ ØØØ ØØØØÙ "
 "ØÙ ÙØØÙØ ÙØØÙÙ ÙØÙ ØÙØÙØØÙØ ØÙÙ ÙØØØÙ ØÙÙÙÙØ ÙØÙÙÙØ."
 
-#: ../mail/em-format-html-display.c:236 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "Ø_ØØØ ØÙØÙØØØ"
 
-#: ../mail/em-format-html-display.c:249
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
 msgstr "ÙØÙ ØÙØÙØØØ ÙÙØØ ÙØØÙØ ÙÙØØØ"
 
-#: ../mail/em-format-html-display.c:538
+#: ../mail/em-format-html-display.c:566
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9855,29 +9986,43 @@ msgstr ""
 "ØÙÙÙÙÙÙØÙ ØÙØ ÙØØØ ØÙÙ ØØÙÙØ ÙØÙ ØÙØØØÙØ ÙØÙÙØ ØÙØØ ÙÙ ØÙ ÙØØÙØÙØ. ÙÙÙÙÙ "
 "ØØØÙØ ØÙÙ ØÙÙØØ ØÙ ØÙØØØ ÙØÙØ ØØØØÙ."
 
+#: ../mail/em-format-html-display.c:756
+#, fuzzy
+msgid "Save Image"
+msgstr "ØØÙØ ØÙØÙØØÙØ..."
+
 #: ../mail/em-format-html-display.c:804
 #, fuzzy
+msgid "Save _Image..."
+msgstr "ØØÙØ ÙÙ..."
+
+#: ../mail/em-format-html-display.c:806
+#, fuzzy
+msgid "Save the image to a file"
+msgstr "ØØÙØ ØÙÙÙÙ ØÙØØÙÙ"
+
+#: ../mail/em-format-html-display.c:1034
+#, fuzzy
 msgid "Completed on"
 msgstr "ØÙØÙÙ ÙÙ"
 
-#: ../mail/em-format-html-display.c:812
+#: ../mail/em-format-html-display.c:1046
 msgid "Overdue:"
 msgstr "_ÙØØØ ÙÙØØÙØ:"
 
-#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:816
+#: ../mail/em-format-html-display.c:1054
 msgid "by"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1047 ../mail/em-format-html-display.c:1094
+#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
 msgid "View _Unformatted"
 msgstr "ØØØØ _ØÙØ ØÙÙÙÙØ"
 
-#: ../mail/em-format-html-display.c:1049
+#: ../mail/em-format-html-display.c:1337
 msgid "Hide _Unformatted"
 msgstr "ØØÙÙ _ØÙØ ØÙÙÙÙØ"
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1408
 msgid "O_pen With"
 msgstr "ÙØ_Ø ØØØØØØØÙ"
 
@@ -9886,123 +10031,70 @@ msgstr "ÙØ_Ø ØØØØØØØÙ"
 msgid "Page %d of %d"
 msgstr "ØÙØÙÙØØ %d ÙÙ %d"
 
-#: ../mail/em-format-html.c:161
-msgid "Formatting message"
-msgstr "ÙØØÙ ØÙÙØØ ØÙØØØÙØ"
-
-#: ../mail/em-format-html.c:360
-msgid "Formatting Message..."
-msgstr "ÙØØÙ ØÙÙØØ ØÙØØØÙØ..."
-
-#: ../mail/em-format-html.c:1445 ../mail/em-format-html.c:1455
-#, fuzzy, c-format
-msgid "Retrieving '%s'"
-msgstr "ÙØØÙ ØØØ '%s'"
-
-#: ../mail/em-format-html.c:1976
-msgid "Unknown external-body part."
-msgstr "ØØØ ØÙÙØÙ ØÙØØØØÙ ØÙØ ÙØØÙÙ.."
-
-#: ../mail/em-format-html.c:1984
-msgid "Malformed external-body part."
-msgstr "ØØØ ØÙÙØÙ ØÙØØØØÙ ÙØÙÙÙ."
-
-#: ../mail/em-format-html.c:2014
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "ÙØØÙØ ÙÙÙÙØ FTP (%s)"
-
-#: ../mail/em-format-html.c:2025
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "ÙØØÙØ ÙÙÙÙÙÙ ÙØÙÙÙ (%s) ØØÙØ ÙÙ ØÙÙÙÙØ \"%s\""
-
-#: ../mail/em-format-html.c:2027
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "ÙØØÙØ ÙÙÙÙ ÙØÙÙÙ (%s)"
-
-#: ../mail/em-format-html.c:2048
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "ÙØØÙØ ÙØÙØÙØØ ØØÙØØ (%s)"
-
-#: ../mail/em-format-html.c:2059
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "ÙØØÙØ ÙØÙØÙØØ ØØØØÙÙØ ÙØÙÙÙØ (ÙØØ \"%s\")"
-
-#. To translators: This message suggests to the receipients that the sender of the mail is
-#. different from the one listed in From field.
-#: ../mail/em-format-html.c:2763
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "ØØØÙ %s ÙØÙ ØÙØØØÙØ ØØÙÙÙØØØ ØÙ %s"
-
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, fuzzy, c-format
 msgid "No HTML stream available"
 msgstr "ÙØ ÙÙØØ ÙÙØÙØ."
 
-#: ../mail/em-subscription-editor.c:1105
+#: ../mail/em-subscription-editor.c:1162
 msgid "Folder Subscriptions"
 msgstr "ØØØØØÙØØ ØÙÙØÙÙØØØ"
 
-#: ../mail/em-subscription-editor.c:1144
+#: ../mail/em-subscription-editor.c:1201
 msgid "_Account:"
 msgstr "ØÙ_ØØØØ:"
 
-#: ../mail/em-subscription-editor.c:1159
+#: ../mail/em-subscription-editor.c:1216
 #, fuzzy
 msgid "Clear Search"
 msgstr "ØØØØ ØØØÙÙØ"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1234
 #, fuzzy
 msgid "Sho_w items that contain:"
 msgstr "ÙØ ÙØØÙÙ"
 
-#: ../mail/em-subscription-editor.c:1216
+#: ../mail/em-subscription-editor.c:1273
 #, fuzzy
 msgid "Subscribe to the selected folder"
 msgstr "ØØÙØ ØØÙÙØ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../mail/em-subscription-editor.c:1217
+#: ../mail/em-subscription-editor.c:1274
 msgid "Su_bscribe"
 msgstr "Ø_ØØØÙ"
 
-#: ../mail/em-subscription-editor.c:1228
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../mail/em-subscription-editor.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Unsubscribe from the selected folder"
 msgstr "ØÙØ ØØØØØÙ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../mail/em-subscription-editor.c:1229
-#: ../modules/mail/e-mail-shell-view-actions.c:1176
+#: ../mail/em-subscription-editor.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "_Unsubscribe"
 msgstr "ØÙ_ØØØ ØÙØØØØØÙ"
 
-#: ../mail/em-subscription-editor.c:1240
+#: ../mail/em-subscription-editor.c:1297
 msgid "Collapse all folders"
 msgstr "ØØÙÙ ÙÙÙ ØÙÙØÙØØØ"
 
-#: ../mail/em-subscription-editor.c:1241
+#: ../mail/em-subscription-editor.c:1298
 msgid "C_ollapse All"
 msgstr "Ø_ØÙÙ ØÙÙÙÙ"
 
-#: ../mail/em-subscription-editor.c:1251
+#: ../mail/em-subscription-editor.c:1308
 msgid "Expand all folders"
 msgstr "ÙØÙØ ÙÙ ØÙÙØÙÙØØØ"
 
-#: ../mail/em-subscription-editor.c:1252
+#: ../mail/em-subscription-editor.c:1309
 msgid "E_xpand All"
 msgstr "ÙØÙ_Ø ØÙÙÙÙ"
 
-#: ../mail/em-subscription-editor.c:1262
+#: ../mail/em-subscription-editor.c:1319
 msgid "Refresh the folder list"
 msgstr "ØØÙØ ÙØØÙØ ØÙÙØÙÙØØØ"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1331
 msgid "Stop the current operation"
 msgstr "ØÙØÙ ØÙØÙÙÙÙØ ØÙØØÙÙÙØ"
 
@@ -10010,7 +10102,7 @@ msgstr "ØÙØÙ ØÙØÙÙÙÙØ ØÙØØÙÙÙØ"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:102
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
@@ -10021,16 +10113,16 @@ msgstr[3] "ØÙØØÙÙØ ØÙÙÙ ØØÙØ ÙØØ %d ØØØØÙ ØÙØØ ÙØØ
 msgstr[4] "ØÙØØÙÙØ ØÙÙ ØØÙØ ÙØØ %d ØØØÙØ ØÙØØ ÙØØØØØ"
 msgstr[5] "ØÙØØÙÙØ ØÙÙ ØØÙØ ÙØØ %d ØØØÙØ ØÙØØ ÙØØØØØ"
 
-#: ../mail/em-utils.c:157
-#: ../modules/mailto-handler/evolution-mailto-handler.c:151
+#: ../mail/em-utils.c:158
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "ÙØ Ø_ØÙØ ÙØÙ ØÙØØØÙØ ÙØØ ØØØÙ"
 
-#: ../mail/em-utils.c:332
+#: ../mail/em-utils.c:333
 msgid "Message Filters"
 msgstr "ÙØØÙÙØØØ ØÙØØØØÙÙ"
 
-#: ../mail/em-utils.c:908
+#: ../mail/em-utils.c:918
 #, c-format
 msgid "Messages from %s"
 msgstr "ØØØØÙÙ ÙÙ %s"
@@ -10039,7 +10131,7 @@ msgstr "ØØØØÙÙ ÙÙ %s"
 msgid "Search _Folders"
 msgstr "_ÙØÙØØØ ØÙØØØ"
 
-#: ../mail/em-vfolder-rule.c:610
+#: ../mail/em-vfolder-rule.c:618
 msgid "Add Folder"
 msgstr "ØØÙ ÙØÙÙØÙØ"
 
@@ -10105,7 +10197,7 @@ msgid "Always request read receipt"
 msgstr "ØØÙØ ØØØÙØ ØØØØØÙØ ØØÙÙØØØØ ÙÙØÙ ØÙØØØÙØ"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "ÙÙØØØ ØÙÙÙØ ØØÙØÙØÙÙ ØÙØÙ ØÙØÙÙ ÙÙÙ ØÙØØØ ØØÙØØ ØÙÙ ØØÙØ ØÙÙØÙÙÙØØ."
 
@@ -10245,16 +10337,22 @@ msgstr "ØÙØØØ ØÙØÙØØØØÙ ÙÙØÙØØ ØÙÙØÙÙÙ. "
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 "ÙØØØ ÙÙÙØ ØØØ ØÙØØØ ØÙ ØÙØÙØÙÙÙ ÙØØØÙØ ØÙØØØØ ÙÙ ØÙØØØ ØÙØÙØÙÙÙ ØÙÙØÙÙØ ÙÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "ÙØØØ ÙÙÙØ ØØØ ØÙÙØØØ ÙÙ ØÙØØ ØÙØÙØÙÙÙ ØÙ ØÙØØÙØ ØÙÙØØÙÙÙ ÙÙÙØØÙÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10265,11 +10363,11 @@ msgstr ""
 "ÙØØ ØÙ ÙÙÙÙ ØØØÙØ. ØÙØØØ ÙÙ ØÙØÙØØØ ØÙÙÙØÙÙÙÙØ ÙÙØØÙØÙ ØÙØÙÙØØÙ. ÙØ ÙÙÙÙ ØØÙØØØ "
 "ØØØ ØÙ ØØÙÙÙ ØÙØØØ ØÙØÙØÙÙÙ ØÙØØÙØØ (ÙØÙ LDAP) ÙÙØØÙØÙ ØÙØÙÙØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "ÙØØØ ÙØ ØØØ ØÙØØØØÙ ØØÙÙØØØ ÙÙØØØØ ÙÙØØÙØ ÙÙ ØÙØØÙØ ØÙÙÙØÙØ "
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10278,7 +10376,7 @@ msgstr ""
 "ÙØØØ ÙØ ØØØ ØÙØØØØÙ ØØÙÙØØØ ÙÙØØØØ ÙÙØØÙØ ÙÙ ØÙØØÙØ ØÙÙÙØÙØ. ØØØ ØÙ ØÙÙÙÙ ÙØØ "
 "ØÙØÙØØ ÙØÙ ØÙØ ØÙØØÙÙØØØØ ÙØÙØÙ ØØØÙÙ ØØØØ ØÙØØÙØ ÙÙ ØÙØØÙØ ØÙÙÙØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -10286,86 +10384,86 @@ msgstr ""
 "ÙØØØ ÙØ ØØØ ØÙØØØØÙ ÙÙØ ØÙØØÙØ ÙÙÙ ÙÙ ØØÙ \"ÙÙ\" Ù\"ØÙÙÙØÙØ\" ÙÙ ØÙÙØ "
 "\"ØÙØØØØÙ\" ØØØÙ ØÙÙØÙØ ØÙØÙÙØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "ØÙÙÙ ØÙØ/ØØÙØÙ ÙÙÙØØ ÙÙÙØÙÙÙÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "ØÙÙÙ ØÙØ ÙÙÙØØ ÙØØÙÙ ØÙØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 #, fuzzy
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "ÙØØÙ ØÙ ÙÙØÙ ÙØØ ØØÙØØ ØÙÙØÙØØØ ÙÙ ØØØØ ØÙÙØÙØØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 #, fuzzy
 msgid "Do not add signature delimiter"
 msgstr "ØÙØ ÙØØØ ØÙÙ ØÙØ ÙÙÙ ØÙØÙÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ØØØÙ ÙØØÙØØØ ÙØØØØØ ØÙØÙÙØØØ ØÙÙ ØÙÙÙÙØØ ØÙÙÙØ ØÙØØ ØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "ØÙØØ ÙØÙÙØØØ ØÙØØÙØ ØÙÙÙÙÙ ØÙØ ØÙØØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "ØÙØØ ÙØÙÙØØØ ØÙÙÙÙÙØØ ØÙØ ØÙØØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "ØÙØØ ØÙÙØ ÙØÙÙØØØ ØÙØØÙØ ØÙÙÙÙÙ ØÙØ ØÙØØÙØ ÙÙ ØÙÙÙÙÙÙØÙÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ØÙØØ ØÙÙØ ÙØÙÙØØØ ØÙÙÙÙÙØØ ØÙØ ØÙØØÙØ ÙÙ ØÙÙÙÙÙÙØÙÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "ÙØÙ ØÙØ ØÙÙØØÙØØ ØØÙÙ ÙÙÙÙÙ ØØÙØ ÙØØÙØ ØÙØ ÙØØØØ ØÙØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "ÙØÙÙ ØÙ ØØÙ ÙÙØØØ ØÙÙØØØ ØÙØØØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 #, fuzzy
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "ÙØÙØÙÙ ØÙ ØØØÙÙ ØÙÙØØ ØØÙØØ ÙØØ ØÙØÙØØ ØÙÙ ØØØ ØØØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "ÙØÙÙ ØÙ ØØÙ ÙÙØØ ØÙØØØ ØØÙØØ ØÙÙØØØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
 msgstr "ÙØÙÙÙ ÙØÙØØØ ØÙØØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
 msgstr "ÙØÙÙÙ ÙØÙÙØØØ ØÙØØØ ØÙØ ØØØÙØ ØÙØØØÙÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10373,32 +10471,32 @@ msgstr ""
 "ÙÙÙÙÙÙ ÙØØ ÙØØØØØØÙ ÙÙØØØ ØÙÙØØØ ÙÙØÙÙÙ ÙÙ ÙØØÙÙØ ØÙØØØÙØ Ù ÙØØØØ ØÙØØØØÙ "
 "ÙØÙÙØÙØØØ. "
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 #, fuzzy
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "ÙÙÙÙÙÙ ÙØØ ÙØØØØØØÙ ÙÙØØØ ØÙÙØØØ ÙÙØÙÙÙ ÙÙ ÙØØÙÙØ ØÙØØØÙØ Ù ÙØØØØ ØÙØØØØÙ "
 "ÙØÙÙØÙØØØ. "
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "ÙØÙÙ/ØØÙÙ ØÙØ ØÙÙØØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -10406,32 +10504,31 @@ msgid ""
 "standard."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:76
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Forward message."
-msgstr "ØØØÙØ ÙÙØØØ"
+msgstr "ÙØÙØ ØÙØØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "ØØØÙØØ ÙÙØ ÙØØÙØ ØÙØÙØØØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "ØØØÙØØ ÙÙØ ÙØØÙØ ØÙØÙØØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ÙØÙÙ ØÙÙØØÙÙØ ØØØ ØÙÙØÙØ ÙÙØÙÙ ØÙØØØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10439,7 +10536,7 @@ msgstr ""
 "ØØØ ØØÙÙ ÙØØØØÙ ÙØØ ØÙØØ ÙÙ 10 ØØØØÙ ØÙ ØÙØØ ÙÙ ÙÙØ ÙØØØ ØØØÙ ØÙÙØØØØÙ ØØØ "
 "ÙØÙ ØÙØ ÙØÙØ ØÙÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 #, fuzzy
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
@@ -10450,11 +10547,11 @@ msgstr ""
 "ÙØÙÙ ÙØÙØ ÙÙ ÙØÙ ØÙÙØØÙØ ÙØØØ ÙØ ØØØØ ÙÙÙÙ ØÙÙÙØÙ ÙÙ ÙØØØØ ØÙØÙØØ ÙØÙÙ "
 "ØÙØØØØØ ÙØÙÙÙ ÙØØØ ØÙÙØØÙÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 #, fuzzy
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
@@ -10463,7 +10560,7 @@ msgstr ""
 "ØÙØØØÙØØ ØÙÙØØØÙ ÙÙØÙØØ \"ØØØÙ Ù ØÙÙÙ ØÙØØÙØ\". ØØØÙØ ØÙÙÙÙØ ØÙØ ØØÙÙØ ØØÙ "
 "ØÙÙØÙØØ ØÙØØÙÙØÙ ÙÙ ØÙÙØØØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 #, fuzzy
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
@@ -10472,7 +10569,7 @@ msgstr ""
 "ØÙØØØÙØØ ØÙÙØØØÙ ÙÙØÙØØ \"ØØØÙ Ù ØÙÙÙ ØÙØØÙØ\". ØØØÙØ ØÙÙÙÙØ ØÙØ ØØÙÙØ ØØÙ "
 "ØÙÙØÙØØ ØÙØØÙÙØÙ ÙÙ ØÙÙØØØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 #, fuzzy
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
@@ -10481,7 +10578,7 @@ msgstr ""
 "ØÙØØØÙØØ ØÙÙØØØÙ ÙÙØÙØØ \"ØØØÙ Ù ØÙÙÙ ØÙØØÙØ\". ØØØÙØ ØÙÙÙÙØ ØÙØ ØØÙÙØ ØØÙ "
 "ØÙÙØÙØØ ØÙØØÙÙØÙ ÙÙ ØÙÙØØØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10489,7 +10586,7 @@ msgstr ""
 "ØÙØØØÙØØ ØÙÙØØØÙ ÙÙØÙØØ \"ØØØÙ Ù ØÙÙÙ ØÙØØÙØ\". ØØØÙØ ØÙÙÙÙØ ØÙØ ØØÙÙØ ØØÙ "
 "ØÙÙØÙØØ ØÙØØÙÙØÙ ÙÙ ØÙÙØØØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 #, fuzzy
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
@@ -10502,7 +10599,7 @@ msgstr ""
 "ØÙÙÙÙÙØÙ ÙØÙ ÙØÙØØ \"ØØØÙ Ù ØÙÙÙ ØÙØØÙØ\" ÙØ ÙÙÙÙ ØÙØÙØÙØ. ÙØØ ØÙÙÙØØØ ÙÙØÙØ "
 "ÙØÙØÙÙ ØÙØÙÙÙ ÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 #, fuzzy
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
@@ -10515,7 +10612,7 @@ msgstr ""
 "ØÙÙÙÙÙØÙ ÙØÙ ÙØÙØØ \"ØØØÙ Ù ØÙÙÙ ØÙØØÙØ\" ÙØ ÙÙÙÙ ØÙØÙØÙØ. ÙØØ ØÙÙÙØØØ ÙÙØÙØ "
 "ÙØÙØÙÙ ØÙØÙÙÙ ÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 #, fuzzy
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
@@ -10528,7 +10625,7 @@ msgstr ""
 "ØÙÙÙÙÙØÙ ÙØÙ ÙØÙØØ \"ØØØÙ Ù ØÙÙÙ ØÙØØÙØ\" ÙØ ÙÙÙÙ ØÙØÙØÙØ. ÙØØ ØÙÙÙØØØ ÙÙØÙØ "
 "ÙØÙØÙÙ ØÙØÙÙÙ ÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10541,7 +10638,7 @@ msgstr ""
 "ØÙÙÙÙÙØÙ ÙØÙ ÙØÙØØ \"ØØØÙ Ù ØÙÙÙ ØÙØØÙØ\" ÙØ ÙÙÙÙ ØÙØÙØÙØ. ÙØØ ØÙÙÙØØØ ÙÙØÙØ "
 "ÙØÙØÙÙ ØÙØÙÙÙ ÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 #, fuzzy
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
@@ -10550,7 +10647,7 @@ msgstr ""
 "ØÙØØØ ØÙÙØØØÙ ÙÙØÙØØ \"Send and Receive Mail\". ÙØÙ ØÙÙÙÙØ ØØØÙØ ØÙØ ØØÙÙØ "
 "ØÙÙØØØØÙ ÙØØÙ ØÙÙØÙØØ ØÙÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 #, fuzzy
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
@@ -10559,7 +10656,7 @@ msgstr ""
 "ØÙØØØ ØÙÙØØØÙ ÙÙØÙØØ \"Send and Receive Mail\". ÙØÙ ØÙÙÙÙØ ØØØÙØ ØÙØ ØØÙÙØ "
 "ØÙÙØØØØÙ ÙØØÙ ØÙÙØÙØØ ØÙÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 #, fuzzy
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
@@ -10568,7 +10665,7 @@ msgstr ""
 "ØÙØØØ ØÙÙØØØÙ ÙÙØÙØØ \"Send and Receive Mail\". ÙØÙ ØÙÙÙÙØ ØØØÙØ ØÙØ ØØÙÙØ "
 "ØÙÙØØØØÙ ÙØØÙ ØÙÙØÙØØ ØÙÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10576,7 +10673,7 @@ msgstr ""
 "ØÙØØØ ØÙÙØØØÙ ÙÙØÙØØ \"Send and Receive Mail\". ÙØÙ ØÙÙÙÙØ ØØØÙØ ØÙØ ØØÙÙØ "
 "ØÙÙØØØØÙ ÙØØÙ ØÙÙØÙØØ ØÙÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -10584,7 +10681,7 @@ msgid ""
 "replying."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -10593,7 +10690,7 @@ msgstr ""
 "ØØØÙ/ØÙÙÙ ØÙØÙØÙÙ ØÙÙØÙØØ ÙÙ ØÙØØØÙØ ØÙÙ ØÙ ØØÙ ØÙØØØØÙ ÙÙ ÙØÙØ ØÙØØØ ÙÙÙÙ ÙØÙØ "
 "ØØÙØØÙ ØÙÙÙØØÙ ÙÙØØØÙØØ ÙÙÙØ ÙÙØ ØØØÙØÙØ ÙÙ ÙØØØØ ØÙØØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -10602,7 +10699,7 @@ msgstr ""
 "ØØØÙ/ØÙÙÙ ØÙØÙØÙÙ ØÙÙØÙØØ ÙÙ ØÙØØØÙØ ØÙÙ ØÙ ØØÙ ØÙØØØØÙ ÙÙ ÙØÙØ ØÙØØØ ÙÙÙÙ ÙØÙØ "
 "ØØÙØØÙ ØÙÙÙØØÙ ÙÙØØØÙØØ ÙÙÙØ ÙÙØ ØØØÙØÙØ ÙÙ ÙØØØØ ØÙØØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -10610,14 +10707,14 @@ msgid ""
 msgstr ""
 "ÙØØÙÙ ØÙÙÙØØ ØÙØ ØØÙØ ÙØØØØ ÙØÙØØØ ÙÙØØØÙ ØÙ ÙØÙØ ØÙÙØØÙÙØ ØÙÙ ØØØØÙ ÙØÙÙØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
@@ -10626,44 +10723,44 @@ msgstr ""
 "ØØØÙ/ØÙÙÙ ØÙØÙØÙÙ ØÙÙØÙØØ ÙÙ ØÙØØØÙØ ØÙÙ ØÙ ØØÙ ØÙØØØØÙ ÙÙ ÙØÙØ ØÙØØØ ÙÙÙÙ ÙØÙØ "
 "ØØÙØØÙ ØÙÙÙØØÙ ÙÙØØØÙØØ ÙÙÙØ ÙÙØ ØØØÙØÙØ ÙÙ ÙØØØØ ØÙØØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 #, fuzzy
 msgid "Last time Empty Junk was run"
 msgstr "ØØØ ÙØØ ØÙØØØ ÙÙÙØ ØÙØØÙØ ØÙÙÙÙÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 #, fuzzy
 msgid "Last time Empty Trash was run"
 msgstr "ØØØ ÙØØ ØÙØØØ ÙÙÙØ ØÙØ ØÙÙÙÙÙØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 #, fuzzy
 msgid "Layout style"
 msgstr "Ø_ØØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:105
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:106
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "ØÙÙØØÙÙ ØÙØÙ ØØØ ØÙ ØØØÙØÙ ÙÙØÙÙØØ ØØØÙÙ ØÙØØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "ÙØØÙØ ØØÙØØÙÙØØ ÙØÙØÙÙØÙ ØÙÙØØØØØ ØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 #, fuzzy
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ÙØØÙØ ØÙÙØØ mime ÙÙØÙÙØÙØ ÙÙ ØØÙ ØØØØØØ ÙÙÙÙÙØØ ØÙÙÙØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "ÙØØÙØ ØØÙØØØØÙØ ØÙÙÙØÙÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "ÙØØÙØ ØØÙØØØØØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10671,15 +10768,15 @@ msgstr ""
 "ÙØØÙØ  ØØÙØØØØØØ ØÙÙØØÙÙØ ÙÙÙÙÙ ØÙØØÙØ ÙÙ ØÙÙÙÙÙÙØÙ. ØØØÙÙ ØÙÙØØÙØ ØÙÙ ØØØÙÙ "
 "ÙØÙØØØ ØØÙÙØØØ ØÙÙ /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr "ÙØØÙØ ØØÙØØÙÙØØØ ØÙÙØØÙØØ ÙÙØ ØØØ ÙØÙØ ÙÙØÙÙØ ØÙ ÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ÙØØÙØ ØØÙÙØ ÙØØØ ØÙÙØÙÙØ ØÙÙØØØØÙ ÙÙØØÙÙÙ ØÙØÙÙØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -10687,16 +10784,16 @@ msgstr ""
 "ÙØØÙØ ØØÙØØÙÙØØ ØÙÙØØÙÙØ ÙÙÙÙÙ ØÙØØÙØ ÙÙ ØÙÙÙÙÙÙØÙ. ØØØÙÙ ØÙÙØØÙØ ØÙÙ ØØÙØ "
 "ØÙØ ØÙØØÙ:ØÙÙÙÙ ÙØÙÙÙÙ ÙÙØØ ØØØÙÙØ HTML ØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "ÙØØÙØ ØØØÙØØ ØÙØØÙØÙÙÙÙØØ ØÙØÙ ÙÙØÙÙØ ØØØØÙØÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 #, fuzzy
 msgid "Load images for HTML messages over HTTP"
 msgstr "ØÙÙÙ ØÙØ ØØØØÙ HTML ØØØ http"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 #, fuzzy
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
@@ -10707,146 +10804,146 @@ msgstr ""
 "ØÙØØÙØ ØØØØ. \"1\" - ØÙÙ ØÙØÙØ ÙÙØØØØÙ ÙÙ ØÙÙØØØØÙÙÙ. \"2\" - ØÙÙÙ ØÙØÙØ ÙÙ "
 "ØÙØØÙØ ØØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "ØØÙÙ ØØØØØØØ ØÙÙØØÙÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "ØØÙÙ ØØØØØØØ ØÙÙØØÙÙØ ØÙÙ ÙÙÙ ØÙØÙØÙ ØÙÙØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
 msgstr "ÙÙÙ ØÙØÙØÙ ÙØØØÙÙ ØØØØØØØ ØÙÙØØÙÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
 msgstr "ÙÙÙ ØÙØÙØÙ ÙØØØÙÙ ØØØØØØØ ØÙÙØØÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 #, fuzzy
 msgid "Mail browser height"
 msgstr "ØØØÙØØ ØÙÙÙ ÙÙØØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 #, fuzzy
 msgid "Mail browser width"
 msgstr "ÙØØØ ØÙØØÙØ ØÙØÙÙØØÙÙÙ ØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "ØÙÙÙ ÙÙÙØØØÙØ ØØØ ØÙÙÙÙØ ØÙÙØØÙØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "ØÙÙÙ ÙÙÙØØØÙØ ØØØ ØÙÙÙÙØ ØÙÙØØÙØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "ØÙÙÙ ØÙØÙØØØØØØ ÙÙ \"ÙØØÙÙØ\" ØÙØÙØØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ØÙÙÙ ØÙØÙØØØØØØ ÙÙ \"ÙØØÙÙØ\" ØÙØÙØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "ØØÙÙØ ØØØ ØÙØØØØÙ (\"normal\" (ØØØÙ), \"full headers\" (ØØÙÙØØØ ÙØÙÙØ), "
 "\"source\" (ØÙÙØØØ))"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ØÙÙØØØ ØÙØÙÙØ ØØÙØÙØÙ ÙØÙØØØ ØÙØØÙØ ØÙÙÙÙÙ ØÙØ ØÙØØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ØÙØØ ØÙØØÙÙ ØØÙØÙØÙ ØÙÙ ÙØØØ ØÙØØØ ØÙØ ØÙÙÙÙÙØØ ØÙØ ØÙØØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ØÙÙÙØ ØÙØØÙÙ ØÙÙ ÙØØØ ØÙØØØ ØÙØ ØÙÙÙÙÙØØ ØÙØ ØÙØØÙØØ ØØÙØÙØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ØÙÙÙØ ØÙØØÙÙ ØÙÙ ÙØØØ ØÙØØØ ØÙØ ØÙÙÙÙÙØØ ØÙØ ØÙØØÙØØ ØØÙØÙØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ØØØ ØÙØÙØÙÙÙ ØÙØÙ ÙØÙ ØØÙØØÙØ ÙÙ ØÙØÙÙÙ ÙÙ ÙÙ.Ù ÙÙ.Ù.Ù"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 #, fuzzy
 msgid "Original message."
 msgstr "-------- ØÙØØØÙØ ØÙØØÙÙØ -------- "
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "ØÙÙØØØÙØ ØÙ ÙÙØÙØ ØØÙÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ÙØØØÙØ ØÙÙØØØØÙ ØÙØÙØ ÙØØÙÙ ÙØÙ ÙØÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ÙØØØÙØ ØÙÙØØØØÙ ØÙØÙØ ÙØØÙÙ ØØØØÙ ØØØÙØÙ ØÙÙ ÙÙØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "ØÙØØØÙ ØÙØ ØØÙ ØØØØÙ ÙÙ ÙØÙØ ØÙØØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 #, fuzzy
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "ØÙØØØÙ ØÙØ ØØÙÙÙ ØØØØÙ ÙØØØØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 #, fuzzy
 msgid "Prompt when replying privately to list messages"
 msgstr "ØÙØØØÙ ØÙØ ØØÙÙÙ ØØØØÙ ÙØØØØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 #, fuzzy
 msgid "Prompt when replying to many recipients"
 msgstr "ØÙØØØÙ ØÙØ ØØØØÙ ØÙØØØØÙ ÙØ ØØØÙØ ÙÙØÙÙÙÙ ØÙÙØØ ØÙÙØØÙÙÙÙØ ØÙÙØÙÙÙØ ÙÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "ØÙÙØØØÙØ ØÙÙ ÙÙÙÙ ØÙÙØØØØÙ ØØÙÙØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr "ØÙÙØØØÙØ ØÙÙ ÙØ ÙÙÙØ ØÙÙØØØØÙ ØÙÙ ØÙÙ ØÙÙÙØØØ ØÙÙØØÙÙÙÙØ ØÙÙØÙÙÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ØÙØØØÙ ØÙØ ÙØØÙÙØ ØÙÙØØØØÙ ÙØØ ÙÙ ØØØØÙ ØÙ ØÙØØ ØÙØØ ÙØØØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -10854,179 +10951,179 @@ msgstr ""
 "ØÙÙØØØÙØ ØÙÙ ÙØØÙÙ ØÙÙØØØØÙ ØØØØÙ ØØÙØ HTML ØÙÙ ÙØØÙÙÙÙ ÙØ ÙØ ÙØØØÙÙ ØØØØÙØÙ "
 "ØØÙØ HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "ØÙÙØØØÙØ ØÙÙ ÙØØÙÙ ØÙÙØØØØÙ ØØØØÙ ØØØÙØÙ ØÙÙ ÙØØÙÙÙ \"ØÙÙ\" ØÙ \"ÙØØØ ÙØØÙÙÙÙØ"
 "\"."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ØÙÙØØØÙØ ØÙÙ ÙØØÙÙ ØÙÙØØØØÙ ØØØØÙ HTML ØÙØ ÙØØÙØÙ ÙÙÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "ØÙØØØÙ ØÙØ ØØÙÙÙ ØØØØÙ ÙØØØØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 #, fuzzy
 msgid "Put the cursor at the bottom of replies"
 msgstr "ØØØØ ØÙ_ÙØØØØ ÙÙ ØÙØØÙÙ ØÙØ ØÙØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "ØØØÙÙ ØÙÙØ ØÙÙ ØÙØØØØÙØ ØÙØØÙÙÙØ ÙÙ ØÙÙÙØ Ù ØØØØØÙÙØ ØØÙØÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "ØÙØÙØØÙÙ ØÙÙ ØÙÙØÙØØ ÙÙ ØÙÙÙØ Ù ØÙØØØØØØÙ ØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "ØÙÙÙØ ØØØØØØ ØÙÙÙØÙØ ØÙÙ ØÙØØÙØ ØÙÙØØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "ØÙÙÙ ØÙØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
 msgstr "ØØÙØØØ ØÙ ØÙØØ ØÙÙØØÙ ÙÙ ØÙØØØ ØÙØÙØÙÙÙ ØÙÙØÙÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "ØØØÙÙ ØØÙØ HTML ØÙØØØØÙÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "ØØØÙÙ ØØÙØ HTML ØÙØØØØÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
 msgstr "ØØÙØ ØÙÙØ ØÙÙØÙ ØØÙØ ØÙÙØØÙ ÙÙ ÙØØÙØ ØÙØØØØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "ÙØØØ ØÙÙØØÙÙØ ÙØ ØÙØØØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:170
 #, fuzzy
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "ØÙØ ØÙØÙØ ÙÙ_ÙÙÙØ ØÙØ ØØØØÙ ØØÙØ ÙØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "ØØÙØ ØÙØÙØÙÙ ØÙÙØØØÙÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:172
 #, fuzzy
 msgid "Show all message headers"
 msgstr "ØØÙ ÙÙ ØÙÙØ ØÙÙÙØÙØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:173
 #, fuzzy
 msgid "Show all the headers when viewing a messages."
 msgstr "ØÙØ ØÙØÙØ ÙÙ_ÙÙÙØ ØÙØ ØØØØÙ ØØÙØ ÙØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "ØØÙØ ØÙØÙÙØ ØÙÙØØØÙÙØ ÙØØÙÙ ÙØØØÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "ØØÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ (ØØØÙÙ ÙØØØÙØ) ÙÙ ÙØØÙØ ØÙØÙØØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr "ØØÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ ÙÙ ÙØØÙØ ØÙØÙØØØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:177
 #, fuzzy
 msgid "Show image animations"
 msgstr "Ø_ØÙØ ØÙØÙØ ØÙÙØØØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "ØØÙØ ØÙØØ ØÙÙÙØØÙÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "ØØÙØ ØÙØØÙØ ØÙØÙÙØØÙÙÙ ÙÙÙØØÙ ÙÙ ØÙÙØ ÙÙÙØÙ ØÙÙ ÙØØÙØ ØÙØØØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "ØØÙØ ØÙØØ ØÙÙØØÙ ÙÙ ÙÙØ ÙØØØØ ØÙØØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -11037,41 +11134,45 @@ msgid ""
 "Post: header, if there is one."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "ÙØØ ØÙØØØ ØÙÙ ØÙØÙÙØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "ÙÙÙ ØÙØØÙÙÙ ØÙØÙÙØØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "ÙØØØ ØÙØØÙÙÙ ØÙØÙÙØØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
 msgstr "ØØ ØÙØØØØ ØÙØØÙÙÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The default plugin for Junk hook"
 msgstr "ØÙÙÙØÙ ØÙØØØÙÙ ÙÙÙØØ ØØØÙØ ØÙØØÙØ ØÙÙÙÙÙ ÙÙ ØÙØÙØÙÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:195
 #, fuzzy
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "ØØØ ÙØØ ØÙ ÙÙÙØ ØÙØØØ ØÙØØÙØ ØÙÙÙÙÙØ ÙØØÙØØ ØØÙØÙØÙ ÙÙØ ØØØÙØ ØØØ ØÙØØØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:196
 #, fuzzy
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "ØØØ ÙØØ ØÙ ÙÙÙØ ØÙØØØ ØÙØ ØÙÙÙÙÙØØØ ÙØØÙØØ ØØÙØÙØÙ ÙÙØ ØØØÙØ ØØØ ØÙØØØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11079,40 +11180,40 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
 msgstr "ØØ ØÙØØØØ ØÙØØÙÙÙØ ÙØØØ ØÙØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
 msgstr "ØÙØØ ØÙÙØØÙÙØ ØÙØØØ ÙØØØ ØÙØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
 "ÙÙØØ ØÙØØ ØÙØØØØ ÙØØØØ. \"0\" ÙÙØØØØØ. \"1\" ÙÙØÙØÙÙØØ. \"2\" ÙØØØØÙ ØÙØÙÙÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:204
 #, fuzzy
 msgid ""
 "This decides the max size of the message text that will be displayed under "
@@ -11122,7 +11223,7 @@ msgstr ""
 "ÙØØ ÙØØØ ØÙØØÙ ØÙØÙØÙ ÙÙØØØ ØÙÙØÙ ØÙØÙ ÙÙÙÙ ØÙÙØØÙ ÙÙ ØÙÙÙÙÙÙØÙ. ØÙÙÙÙØ "
 "ØÙØÙØØØØÙØ ÙÙ Ù ÙÙØØØØÙØ / ÙÙÙÙ ÙÙÙÙØØÙØ ÙÙØÙ ØØØÙØÙ ØØÙÙÙÙÙØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11131,7 +11232,7 @@ msgstr ""
 "ÙØØ ÙÙ ÙÙØÙ ØÙØØÙØ ØÙÙÙÙÙ ØÙØÙØØØØÙØ ØØÙ ØÙ ÙÙØÙ ØØØ ÙÙØÙØØ ÙÙØÙÙØ. ØØØ ØÙØÙÙ "
 "ØÙÙÙØÙ ØÙÙØØÙØ ØÙØØØØÙÙØØ ÙÙÙ ÙØÙ ØÙØØØØØ ØÙÙ ØÙÙÙØÙØØ ØÙØØØÙ ØÙÙØØØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11139,7 +11240,7 @@ msgstr ""
 "ÙØØ ØÙÙÙØØØ ÙÙÙØØ ÙØØ ÙØØØØ ÙÙØØØ ØØÙÙØÙ ØÙÙ \"ØØØ\" ØØØ ØÙÙØØØØ. ÙØØ ØÙÙØÙ "
 "ØØØÙØ ØÙØØÙØ ÙÙ ØÙÙØØÙØ ÙØÙÙ ÙØÙÙ ÙØØÙÙØ ØÙÙ ØÙÙØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11150,7 +11251,7 @@ msgstr ""
 "ÙØØ ØØÙØØÙØ. ÙÙØØ ØÙÙØ XML ÙÙ &lt;header enabled&gt; - ØÙÙÙØ ØÙÙ ÙÙÙØÙÙÙ ØÙ ÙØÙ "
 "ÙØØ ØØØ ØÙØØÙÙØØ ÙÙ ÙØÙØ ØÙØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11160,11 +11261,11 @@ msgstr ""
 "ØÙ ØÙØÙØÙÙÙ ÙÙ ØÙØØ ØÙØÙØÙÙÙ ØÙÙØÙÙ ÙÙØ ÙØÙØØØ ØÙØØÙØ ØÙÙØØÙ ÙÙ ØÙÙØØØØÙÙÙ "
 "ØÙÙØØÙÙÙÙ ÙÙ ÙØØÙØ ØÙØØØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr "ÙØØ ØÙØÙØØ ØÙØØØØ ÙÙ ØØØÙÙ ØØØØ ØÙØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11172,7 +11273,7 @@ msgstr ""
 "ÙØØ ÙØÙÙ ØØØ ØÙØÙØÙÙÙ ØÙØÙ ÙØÙ ØØÙØØÙØ ÙÙ ÙØÙØ ÙØØÙØ ØÙØØØØÙ ØÙØÙØØØØÙØ "
 "ÙØÙØÙ ØØØ ØØØØ ØÙÙ ÙØÙ ØØÙØØ '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:211
 #, fuzzy
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
@@ -11181,7 +11282,7 @@ msgstr ""
 "ÙØØ ØÙØØØØØ ÙØØØ ÙØ ØØØ ÙØÙØ ØÙÙÙØÙØØØ ØØÙÙÙ ÙÙ ØØÙØ ØÙØÙØÙØ ØÙ ØÙØÙÙ "
 "ØÙØØØØÙÙØ. ØÙØØØØ ØÙÙÙÙÙÙØÙ ØÙ ØØÙØ ØØØÙÙÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11190,41 +11291,33 @@ msgstr ""
 "ÙØØ ØÙØØØØØ ÙØØØ ÙØ ØØØ ÙØÙØ ØÙÙÙØÙØØØ ØØÙÙØØ ØÙØØ ØÙÙ ØØØ ØØØÙØ ÙÙ ÙÙ ÙÙØØ "
 "ØØÙ ØÙÙØØ ØØØØÙØ ØÙØØØÙØ. ØÙØØØØ ØÙÙÙÙÙÙØÙ ØÙ ØØÙØ ØØØÙÙÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
 "set path is not pointing to the existent folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "ØØØÙØ ÙØØÙØ ØÙØÙØØØÙ ØØØ ØÙÙÙØÙØ"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "ÙÙÙØ ÙØÙ ØØÙÙÙ ØÙØØØÙØ ÙÙÙØÙØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "ÙÙÙØ ÙØÙ ØØÙÙÙ ØÙØØØÙØ ÙÙÙØÙØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
 msgstr "ØÙØÙØ ÙÙÙÙØ ØÙÙØØØØÙ ÙÙØØØØ ØÙØÙØØØØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ÙÙÙ ØØÙÙ ØÙØØØ ÙÙÙÙÙØØ ØÙØØØØØ ØÙØ ØØØØÙØÙ ØÙØØÙÙÙ ØØØÙ ØÙØÙØÙ."
 
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "Use SpamAssassin daemon and client"
-msgstr "ØØØØØÙ ØÙØÙØ ÙØÙÙÙ ÙØØÙ ØÙØØÙØ ØÙÙØØØ"
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "ØØØØØÙ ÙØØÙØ ÙØÙÙÙ SpamAssassin. (spamc/spamd)"
-
 #: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "ØØØØØÙ ØØÙØ ÙØØÙØØ"
@@ -11234,54 +11327,46 @@ msgid "Use custom fonts for displaying mail."
 msgstr "ØØØØÙÙ ØØÙØØ ÙØØÙØØ ÙØØØ ØÙØØÙØ."
 
 #: ../mail/evolution-mail.schemas.in.h:221
-msgid "Use only local spam tests."
-msgstr "ØØØØØØÙ ØØØØØØØØ ØÙØØØÙ ØÙÙØÙÙØ ÙÙØ."
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Use only the local spam tests (no DNS)."
-msgstr "ØØØØØØÙ ØØØØØØØØ ØÙØØØÙ ØÙÙØÙÙØ ÙÙØ (ÙØ DNS)."
-
-#: ../mail/evolution-mail.schemas.in.h:223
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "ØØ ÙØØÙØ ØÙØØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "ÙÙÙØ ØØØ ØÙÙÙØØÙ ØÙØØØØØ ØÙØ ÙØØØØ ØÙØÙØÙÙ ØÙÙ ÙÙ ØØØÙØ."
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:227
 #, fuzzy
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ØØØ ÙØ ØÙØØÙ ÙÙØØ ÙØØ ØØÙØØ ØÙÙØÙØØØ ÙÙ ØØØØ ØÙÙØÙØØØ."
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11289,112 +11374,110 @@ msgstr ""
 "ÙØ ØÙ ÙØÙ ÙØØ ØÙØØØÙØØ ØÙÙ ØÙØØÙÙØ ØØØ ØÙÙÙØÙØ ØÙØÙØ ÙØ ØØØÙÙ ØÙØØØØÙ ØÙÙ "
 "ØÙØØÙÙØØØ \"ØØÙØ ØÙÙ\" ØÙ \"ÙØØØØ\"."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "ÙÙÙØ ØØØ ØØÙÙØØ ØÙÙÙØÙØØØ ØÙØØ ØÙÙ ØØØ ØØØÙØ ÙÙ ÙØØ ØÙÙÙØØ"
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
 "one minute after the last action invocation."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "ØØØ ÙÙØ ÙØØÙØ ØÙØØØØÙ"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "ØØØ ÙÙØ ÙØØÙØ ØÙØØØØÙ."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
 msgstr "ÙØØÙ ØØØÙØØØ ØÙØÙØØ ØÙÙ"
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1044
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:511
+#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:458
+#: ../modules/mail/e-mail-shell-view.c:1051
+#: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "ØÙØØÙØ"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:396
 msgid "Evolution Elm importer"
 msgstr "ÙØØÙØØ elm ÙØÙÙÙÙÙÙØÙÙ"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:397
 msgid "Import mail from Elm."
 msgstr "ØØØÙØØØ ØØÙØ ÙÙ ØÙÙ."
 
-#: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:242
+#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../plugins/dbx-import/dbx-importer.c:250
 msgid "_Destination folder:"
 msgstr "ØÙÙØÙØ ØÙ_ÙØÙØ:"
 
-#: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:252
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../mail/importers/evolution-mbox-importer.c:145
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:460
 msgid "Select folder"
 msgstr "ØÙØÙÙ ÙØÙÙØ"
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/dbx-import/dbx-importer.c:253
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "Select folder to import into"
 msgstr "ØÙØÙØØ ÙØÙØÙØ ÙÙØØØÙØØØ ØÙÙÙ"
 
-#: ../mail/importers/evolution-mbox-importer.c:403
+#: ../mail/importers/evolution-mbox-importer.c:433
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "ØÙÙÙØÙØ"
 
-#: ../mail/importers/evolution-mbox-importer.c:408
+#: ../mail/importers/evolution-mbox-importer.c:438
 msgctxt "mboxImp"
 msgid "From"
 msgstr "ÙÙ"
 
-#: ../mail/importers/evolution-mbox-importer.c:452
-#: ../shell/e-shell-utils.c:253
+#: ../mail/importers/evolution-mbox-importer.c:482
+#: ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ØÙØÙÙ ØØÙØ ØÙØÙÙÙ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:453
+#: ../mail/importers/evolution-mbox-importer.c:483
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ÙØØÙØØ ÙØÙØØØ ÙÙØØ ØÙØÙÙ ØØÙØ ØÙØÙÙÙ"
 
-#: ../mail/importers/mail-importer.c:65
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "ÙØØÙ ØØØÙØØØ ØÙØÙÙ ØÙØØÙØ"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:593
-#: ../plugins/pst-import/pst-importer.c:480
-#: ../plugins/pst-import/pst-importer.c:589
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:610
+#: ../plugins/pst-import/pst-importer.c:648
 #, fuzzy, c-format
 msgid "Importing '%s'"
 msgstr "ÙØØÙ ØØØÙØØØ `%s'"
 
-#: ../mail/importers/mail-importer.c:308
+#: ../mail/importers/mail-importer.c:316
 #, c-format
 msgid "Scanning %s"
 msgstr "ÙØØÙ ÙØØ %s"
 
-#: ../mail/importers/pine-importer.c:223
+#: ../mail/importers/pine-importer.c:260
 msgid "Importing Pine data"
 msgstr "ÙØØÙ ØØØÙØØØ ØÙØÙØØ ØØÙÙ"
 
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../mail/importers/pine-importer.c:463
+#: ../modules/addressbook/addressbook-config.c:1081
 msgid "Address Book"
 msgstr "ØÙØØ ØÙØÙØÙÙÙ"
 
-#: ../mail/importers/pine-importer.c:462
+#: ../mail/importers/pine-importer.c:509
 msgid "Evolution Pine importer"
 msgstr "ÙØØÙØØ pine ÙØÙÙÙÙÙÙØÙÙ"
 
-#: ../mail/importers/pine-importer.c:463
+#: ../mail/importers/pine-importer.c:510
 msgid "Import mail from Pine."
 msgstr "ØØØÙØØØ ØØÙØ ÙÙ ØØÙÙ."
 
@@ -11403,22 +11486,22 @@ msgstr "ØØØÙØØØ ØØÙØ ÙÙ ØØÙÙ."
 msgid "Mail to %s"
 msgstr "ØÙØØÙØ ØÙÙ %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:280
+#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
 #, c-format
 msgid "Mail from %s"
 msgstr "ØÙØØÙØ ÙÙ %s"
 
-#: ../mail/mail-autofilter.c:264
+#: ../mail/mail-autofilter.c:254
 #, c-format
 msgid "Subject is %s"
 msgstr "ØÙÙÙØÙØ ÙÙ %s"
 
-#: ../mail/mail-autofilter.c:303
+#: ../mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "ÙØØÙØ %s ØÙØØÙØÙÙØ"
 
-#: ../mail/mail-autofilter.c:394
+#: ../mail/mail-autofilter.c:404
 msgid "Add Filter Rule"
 msgstr "ØØÙÙ ÙØØØØ ÙØØØØ"
 
@@ -11427,7 +11510,7 @@ msgstr "ØØÙÙ ÙØØØØ ÙØØØØ"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:492
+#: ../mail/mail-autofilter.c:507
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11451,477 +11534,508 @@ msgstr "ØØÙÙ ØÙ_ÙÙØÙØ ØØÙØÙØ..."
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "ÙÙØ ØÙØØØØÙ ØØØÙÙØ ØÙØ ØØØØØØÙ ÙØØ ØÙØØØØ"
 
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ØÙØ ØÙØÙØ ÙÙ_ÙÙÙØ ØÙØ ØØØØÙ ØØÙØ ÙØÙØ"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ØØØÙ ÙØØØ ÙØØÙÙÙØ (Ù.Ù) ØÙÙÙØ ØÙÙ:"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ØØØÙ ÙØØØ ÙØØÙÙÙØ ÙØÙÙØ (Ù.Ù.Ù) ØÙÙÙØ ØÙÙ:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ÙØÙÙ ØØØÙ ÙÙÙØØÙØÙ ØÙØ ØÙØØÙÙØ"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ØÙØ ØØØÙØ ØÙØØØØÙ ÙÙÙØÙ ØÙØ ØØØØÙ ØØÙØ ÙØÙØ"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "ØØÙØ ØØØÙØ ØØØØØØ ØØÙÙØØØØ"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr "ØØÙÙ ÙÙØ ØÙØ"
 
-#: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1088
 msgid "Authentication"
 msgstr "ØÙØÙØÙ"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "ØØØØ ØÙØØØØÙØ ØÙÙØØÙÙØ ØÙÙÙØ"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "ØÙ_ÙØØÙ:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "ÙØ_Ø ØÙØÙÙØØ ØÙÙØØÙÙØ"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "ØØÙÙ ØÙ ØØÙÙØØØ ÙØØØØ ÙÙØØØØ"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 #, fuzzy
 msgid "Check for new _messages on start"
 msgstr "ØØÙÙ ÙÙ ØÙØØØØÙ ØÙ_ØØÙØØ ØÙØ ØÙØØØÙØ"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 #, fuzzy
 msgid "Check for new messa_ges in all active accounts"
 msgstr "ØØÙÙ ÙÙ ØÙØØØØÙ ØÙ_ØØÙØØ ÙÙÙÙ"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "ÙØØ ØÙØØØØÙ ØÙ_ÙØØØØ ØØØÙØ ØÙ ØÙÙÙØÙØØ"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "ÙØØØØØ ØÙØÙÙØØØ ØØÙØØ ØÙ_ÙØØØØ"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "ØÙØ_Ø"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "ØÙ_ØØ"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "ÙÙÙ ØÙÙÙÙØØ ØÙÙØ_ÙØÙØØ ØØØÙ:"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 #, fuzzy
 msgid "Composing Messages"
 msgstr "ØÙØØ ØØØÙØ"
 
-#: ../mail/mail-config.ui.h:27
-#: ../modules/plugin-manager/evolution-plugin-manager.c:157
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:161
 msgid "Configuration"
 msgstr "ØØØØØØØ "
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "ØÙØØÙÙØ ØÙØ Ø_ØØ ÙØÙØ"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 #, fuzzy
 msgid "Confirmations"
 msgstr "ØØØØØØØ "
 
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:155
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Date/Time Format"
 msgstr "ØÙØÙÙ ØÙØÙØØÙØ ÙØÙÙÙØ"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 #, fuzzy
 msgid "Default Behavior"
 msgstr "ØÙØÙÙÙÙÙØ ØÙØÙØØØØÙÙØ:"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "ØØÙÙ_Ø ØÙÙØØØÙ ØÙØÙØØØØÙ:"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 #, fuzzy
 msgid "Delete Mail"
 msgstr "ÙÙØÙØ ØÙ"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "ØØØÙ ØØØØÙ ØÙØØÙØ ØÙÙÙØÙØ ØÙØ ØÙ_ØØÙØ"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ØÙÙÙ_Ø ØÙØØØØÙ ØÙØØØØØ ØÙÙÙÙØ (ØÙØØØØÙÙØ)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 #, fuzzy
 msgid "Displayed Message Headers"
 msgstr "ÙÙ _ØØÙÙØØØ ØÙØØØØÙ"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "ÙØ Ø_ØÙÙÙ ØÙØØØØÙ ÙØØØØ ØØØ ÙØÙ ØÙÙØØÙ ÙÙ ØÙØØ ØÙØÙÙÙÙ"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "ÙØ ØÙØØØ"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "ÙØÙØ ØÙ_ÙØÙØØØ:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "_ØÙÙØÙ ØÙØØÙØ ØÙØÙÙØØÙÙÙ:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "ØÙØØØ ØÙØ ØÙÙÙÙÙØØ ØÙØ ØÙ_ØØÙØ"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "ØÙØØØ ØÙØ_ØÙÙØ:"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "ØØÙÙØ ØÙØØØØÙ ØÙ_ØØØØØ (ØÙØØØØÙÙØ)"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "F_all back to threading messages by subject"
 msgstr "ØÙØØØØØ ØÙÙ ØØØØÙ ØÙÙÙØÙØØ ØØØ ØÙÙÙ_ØÙØ"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 #, fuzzy
 msgid "Fix_ed Width Font:"
 msgstr "ØØ ØÙØØØ ØÙ_ØØØØ:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "ØÙÙØØ ØÙÙÙÙÙØØ Ø_ØÙÙØØ HTML"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "ØÙØØÙ ØÙ_ÙØÙÙ:"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
-msgstr ""
+msgstr "ØÙØØÙ ØÙØÙØØÙ ÙØÙØ ØÙÙ ØÙÙØØÙØ ØÙØØÙØÙØ ÙÙØØ ØÙ ÙØÙ ØÙÙ ÙÙÙÙÙØ"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "ØØØØÙ ØØÙÙØØ HTML"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "ÙØÙØ H_TTP:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
+#, fuzzy
+msgid "Header content"
+msgstr "ØÙÙØØÙÙ ÙØØÙÙ"
+
+#: ../mail/mail-config.ui.h:57
+#, fuzzy
+msgid "Header name"
+msgstr "Ø_ØÙ ØÙØØÙÙØØ:"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "ØØÙÙØØØ"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "ØØØØØ ØÙØ_ÙØØØØØØ ØÙ"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 #, fuzzy
 msgid "Inline"
 msgstr "_ØÙÙ ØÙØÙÙØÙ"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "ØÙÙ ØÙØÙØÙ (ØØÙÙØ ØÙØÙÙÙ)"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ØÙØÙÙÙ"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "ØØÙÙ ØÙÙØØØ"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 #, fuzzy
 msgid "Loading Images"
 msgstr "_ØÙÙ ØÙØÙØ"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "ØØÙÙ ØØÙÙØØØ ØÙØØÙØ"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "ÙÙÙØ ØÙØÙÙ ØÙØØÙØ"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
 #, fuzzy
 msgid "Message Display"
 msgstr "ØØØØÙ"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 #, fuzzy
 msgid "Message Receipts"
 msgstr "ØØØ ØÙØØØÙØ"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "ÙØ Ù_ØÙØ Ù:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "ÙØ ØØÙÙØ"
+
+#: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "ØÙÙØØØÙÙ ÙØØ ØÙØÙØØ ØÙ ÙØØ ØØØØÙ ÙØ ØØÙÙØØØ ÙØØØØ ÙÙØØØØ. "
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 #, fuzzy
 msgid "Optional Information"
 msgstr "ØÙÙØÙÙÙØØ ØÙØØØÙØ"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "ØÙ_ÙÙØÙÙØ:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "ÙÙÙØ _ÙÙØØØ PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "_ÙÙÙØ ØÙØØ:"
 
-#: ../mail/mail-config.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../mail/mail-config.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Pick a color"
 msgstr "ØÙØÙÙ ÙÙÙÙØ"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "ØÙÙÙÙØ:"
 
-#: ../mail/mail-config.ui.h:78
-#, fuzzy
+#: ../mail/mail-config.ui.h:81
 msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "<span weight=\"bold\">ØØÙØØ ØÙØØÙØÙØ (PGP/GPG)</span>"
+msgstr "ØØÙØØ ØÙØØÙØÙØ (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 #, fuzzy
 msgid "Proxy Settings"
 msgstr "ØØØØØØ ØÙÙÙØÙØ"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Quoted"
 msgstr "ÙÙØØØ"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "Ø_ØÙØ ÙÙÙØ ØÙØØ"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "ØØ ØÙÙ:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "ØØÙØ _ÙÙÙØ ØÙØØ"
 
-#: ../mail/mail-config.ui.h:85
-#, fuzzy
+#: ../mail/mail-config.ui.h:88
 msgid "Replies and Forwards"
-msgstr "ØÙØØÙØ ÙØÙØØÙÙ"
+msgstr "ØÙØØÙØ ÙØÙØÙØÙØØØ"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 #, fuzzy
 msgid "Required Information"
 msgstr "ÙØÙÙÙØØ ØÙØØØÙÙ"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "ØØÙÙØ SSL "
+
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "ØÙØØØØÙ ØÙØÙÙ ØÙØØØØ SSL ÙÙØ ÙØØÙÙÙØ ØÙØØØØ ÙØÙ ØÙÙØØØ ÙÙ ØÙÙÙÙÙÙØÙ"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ØØØ_Ø ØÙ ØÙØØ ØÙÙØØÙ ÙÙØ ÙÙ ØÙØØØ ØÙØÙØÙÙÙ ØÙÙØÙÙ"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "ØÙØ_ÙØØ..."
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "ØØØÙ ØØØØØØØ ØÙÙ_ØÙÙ:"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "ØÙØØ ØÙÙÙØ_ØÙ:"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "ØÙØÙØØ ØØ HTML ØÙØÙØØØ ØÙØØØ"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "ØÙØÙØØ ØØ HTML ØÙÙØØÙÙØ ØÙØØØ"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "ØÙØØ ØÙÙØØÙ"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:106
 #, fuzzy
 msgid "Sending a _private reply to a mailing list message"
 msgstr "ØØÙÙÙ ØØ ØÙÙ ØÙÙØØÙØ ØÙØØÙØÙÙØ ÙÙØÙØØÙØ ØÙÙÙØÙØØ"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:108
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:110
 #, fuzzy
 msgid "Sending a message with an _empty subject line"
 msgstr "ØÙØØØÙ ØÙØ ØØØØÙ ØØØØÙ ØØÙÙ ÙÙØÙØ ÙØØØ"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:112
 #, fuzzy
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "ØÙØØØÙ ØÙØ ØØØØÙ ØÙØØØØÙ ÙØ ØØØÙØ ÙÙØÙÙÙÙ ØÙÙØØ ØÙÙØØÙÙÙÙØ ØÙÙØÙÙÙØ ÙÙØ"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "ÙØÙØ ØÙØØØ_ØÙ ØÙÙØØÙØ:"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "ÙØØÙØ ØÙ_ØØØÙÙ ØÙØÙØÙÙ"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 #, fuzzy
 msgid "Server Configuration"
 msgstr "ÙØÙÙÙØØ ØÙØØØÙÙ"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:118
 #, fuzzy
 msgid "Server _Type:"
 msgstr "_ÙÙØ ØÙØØØÙÙ:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:119
+#, fuzzy
+msgid "Set custom junk header"
+msgstr "ØØÙ ØØÙÙØØ ØØÙØ ÙÙØÙØ ÙÙØØØØ"
+
+#: ../mail/mail-config.ui.h:120
 #, fuzzy
 msgid "Si_gning algorithm:"
 msgstr "ØÙØØØ ØÙØÙÙ_ÙÙØ:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:121
 #, fuzzy
 msgid "Sig_natures"
 msgstr "ØÙÙÙØØØ"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "ØÙØØØ ØÙØÙÙ_ÙÙØ:"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "ØÙØÙÙ_ÙÙØ:"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "ØÙÙÙØØØ"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:125
 #, fuzzy
 msgid "Signing _algorithm:"
 msgstr "ØÙØØØ ØÙØÙÙ_ÙÙØ:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:126
 #, fuzzy
 msgid "Special Folders"
 msgstr "ÙØÙÙØØØ ÙØÙÙÙÙØ"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "ØÙØØØØ ÙÙ ØÙØÙØØØ"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "ØØØØ ØÙ_ÙØØØØ ÙÙ ØÙØØÙÙ ØÙØ ØÙØØ"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:129
 #, fuzzy
 msgid "Start up"
 msgstr "ÙØØØ:"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "ØØÙÙØ TLS"
+
+#: ../mail/mail-config.ui.h:131
 #, fuzzy
 msgid "T_ype:"
 msgstr "ØÙÙÙ_Ø "
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ÙØØÙØ ØÙÙØØØ ØÙÙÙØÙØØ ÙÙØ ÙØ ØØÙØ ØÙØ ØÙÙØØØ ØÙØÙ ÙÙØØ ÙÙØ ÙØÙÙØ ÙØÙØ."
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:133
 #, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
@@ -11932,13 +12046,13 @@ msgstr ""
 "ÙØÙÙÙØ ÙÙ. ØÙØØÙ ØÙØÙ ØØØØÙ ØÙØÙ ØØØØØØÙÙ\n"
 "ÙØØØØØ ØÙØØØ ÙÙØ."
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11946,153 +12060,145 @@ msgstr ""
 "ØÙØØ ØÙØØÙ ØÙØÙ ØØÙØ ØÙ ØÙØØØØØ ØÙÙ ÙØØ ØÙØØØØ.\n"
 "\"ØÙÙ\" ØÙ \"ØØØÙ\" ÙØÙØ"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "Ø_ØÙ ØÙÙØØØØÙ:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "ØØØØØÙ ØÙØØØÙ_ØØÙ"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:141
 #, fuzzy
 msgid "User _Name:"
 msgstr "Ø_ØÙ ØÙÙØØØØÙ:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "ØØÙÙ ØÙÙÙØ"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "ØÙÙ ØÙØÙØ ÙÙ ØÙØØÙØ ØØØÙÙØ"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "ÙÙØ ØÙØÙØÙ"
 
-#: ../mail/mail-config.ui.h:141
-msgid "_Default junk plugin:"
-msgstr "ÙÙØÙ ØÙØØÙØ ØÙÙ_ÙÙÙ ØÙØÙØØØØÙ:"
-
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:145
 msgid "_Direct connection to the Internet"
 msgstr "ØØØØÙ Ù_ØØØØ ØØÙØÙØØÙØ"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ÙØ ØÙÙØ ØÙØØØ ØÙØØØÙØØ (ÙÙØÙØÙÙ ÙØ ØÙØÙÙÙ)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "ØØÙÙØ ØÙØ_ÙØÙØ:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:148
 #, fuzzy
 msgid "_Junk Folder:"
 msgstr "ØÙÙØÙÙØ ØÙØØÙÙ"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:149
 #, fuzzy
 msgid "_Keep signature above the original message on replying"
 msgstr "ØØØÙ_Ø ØØÙØÙÙÙØ ÙÙÙ ÙØ ØÙØØØÙØ ØÙØØÙÙ ØÙØ ØÙØØ"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:150
 #, fuzzy
 msgid "_Languages"
 msgstr "ØÙÙÙØØ"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:151
 #, fuzzy
 msgid "_Load images only in messages from contacts"
 msgstr "_ØÙÙ ØÙØÙØ ØÙÙØÙÙØ ÙÙ ØÙØØÙØ ÙÙ ØÙÙØØØØÙÙÙ"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "Ø_ØØØ ÙÙ ØÙØØ ØÙØÙØÙÙÙ ØÙÙØÙÙ ÙÙØ"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "_ØØÙ ÙØØ ØØØØÙ ØÙØÙØØØØÙ"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "ØØÙÙÙ _ÙØÙÙ ÙÙÙØÙØ:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "ÙØ ØØÙÙ ØÙØØ ÙÙ ØÙØØÙØ ØØØÙØ"
 
-#: ../mail/mail-config.ui.h:154
-msgid "_Path:"
-msgstr "ØÙ_ÙØØØ:"
-
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "ØÙ_ÙÙÙÙØ:"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "ØÙÙÙÙ ÙØÙ ØØØØÙ ØØØÙØ HTML ÙÙÙØØØØÙÙÙ ØÙØÙÙ ÙØ ÙØÙØÙÙÙØ"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "ØØÙÙØ ØÙ_ØØ:"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "_ØØÙØÙØ ÙØÙ:"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "ÙØÙØ HTTP Ø_ÙÙ:"
 
-#: ../mail/mail-config.ui.h:161 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "ØÙ_ØØØÙÙ:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:166
 #, fuzzy
 msgid "_Show animated images"
 msgstr "ØØÙØ ØÙØÙÙØ ØÙÙØØØÙÙØ ÙØØÙÙ ÙØØØÙÙØ."
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "ØØ_ÙØ ØÙØØ ØÙÙØØÙ ÙÙ ÙØØÙÙØ ØÙØØÙØ"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:168
 #, fuzzy
 msgid "_Trash Folder:"
 msgstr "ÙØÙØ ØÙ_ÙØÙØØØ:"
 
-#: ../mail/mail-config.ui.h:166
-msgid "_Use Secure Connection:"
-msgstr "ØØØ_ØØÙ ØÙØØØØÙ ØÙØÙÙ:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
+msgstr "Ø_ØØØØÙ ØØØØÙ ØÙÙ:"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "ØØØ_ØØÙ ØÙØØØØØØ ØÙÙØØÙ"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "ØØØ_ØØÙ ÙÙØ ØÙØØÙØ ØÙØÙ ØØØØØÙÙØ ØÙØØØÙÙØØ ØÙØØØÙ"
 
-#: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 #, fuzzy
 msgid "a"
 msgstr "Ø"
 
-#: ../mail/mail-config.ui.h:170 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "ØÙÙÙÙÙ"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "ØÙÙØÙ"
 
@@ -12112,66 +12218,67 @@ msgstr "ÙÙ ØÙÙØÙØØØ ØÙÙØÙÙØ"
 msgid "Call"
 msgstr "ÙØØØ"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "ÙÙÙØ_Ø"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 #, fuzzy
 msgid "Digital Signature"
 msgstr "ØØØ ØÙØÙÙÙØ"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "ÙØ ØÙØØ"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 #, fuzzy
 msgid "Encryption"
 msgstr "ØØÙÙØ"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "ÙØØØØØ"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "ÙÙØÙÙÙØØÙ"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "ÙØØ"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "ØØÙØÙÙØ ØÙØØØÙØ"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "ÙØ ØØØÙ ÙÙØÙØ"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "ØØ ØÙÙ ØÙØÙÙØ"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "ÙØØØØØ"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 #, fuzzy
 msgid "Search Folder Sources"
 msgstr "ØØØØ ÙÙ ÙØØØ ØÙÙØÙÙØ"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "ÙØÙÙÙØØ ØÙØÙÙ"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "ÙØÙØØØ ÙØØØØ"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12179,23 +12286,23 @@ msgstr ""
 "ØÙØØØØÙ ØÙØÙ ØÙØÙÙØÙØ ÙÙÙØØØØØ ÙÙØÙØØ ØØÙØÙ.\n"
 "ØØØØ ØÙØÙ ØØØØØ ÙØØØØØ ÙÙ ÙØØÙØ \"ØÙÙ\"."
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "Ø_ÙØÙ ØÙØØØÙØ"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "ØØØÙØ ØÙØØØØÙØ_Ù:"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "ØÙ_ØÙÙ:"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "ØÙÙ ÙØØ ÙÙØÙÙ ØØÙØÙÙØ ØÙØØØÙØ"
 
-#: ../mail/mail-folder-cache.c:789
+#: ../mail/mail-folder-cache.c:779
 #, c-format
 msgid "Pinging %s"
 msgstr "ÙØØÙ ØÙØØÙØ ÙÙ ÙØÙØ %s"
@@ -12204,210 +12311,133 @@ msgstr "ÙØØÙ ØÙØØÙØ ÙÙ ÙØÙØ %s"
 msgid "Filtering Selected Messages"
 msgstr "ØØØÙØ ØÙØØØØÙ ØÙÙÙØÙØÙ"
 
-#: ../mail/mail-ops.c:226
+#: ../mail/mail-ops.c:205
 msgid "Fetching Mail"
 msgstr "ØØØ ØÙØØÙØ"
 
-#: ../mail/mail-ops.c:785
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "ÙØØÙ ØØØØÙ ØÙØØØÙØ %d ÙÙ %d"
 
-#: ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ÙØÙ ØØØØÙ %d ØØØÙØ ÙÙ ØØÙØÙÙ %d"
 
-#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:837
 msgid "Canceled."
 msgstr "ØÙÙØÙÙÙ."
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:839
 msgid "Complete."
 msgstr "ØÙ."
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:985
 #, fuzzy, c-format
 msgid "Moving messages to '%s'"
 msgstr "ÙØØÙ ÙÙÙ ØÙØØØØÙ ØÙÙ %s"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:986
 #, fuzzy, c-format
 msgid "Copying messages to '%s'"
 msgstr "ÙØØÙ ÙØØ ØÙØØØØÙ ØÙÙ %s"
 
-#: ../mail/mail-ops.c:1062
-#, fuzzy, c-format
-msgid "Scanning folders in '%s'"
-msgstr "ÙØØ ØÙØØØØÙ ÙÙ \"%s\""
-
-#: ../mail/mail-ops.c:1178
-msgid "Forwarded messages"
-msgstr "ØÙØØØØÙ ØÙÙÙØÙØØ"
-
-#: ../mail/mail-ops.c:1295
-#, fuzzy, c-format
-msgid "Retrieving quota information for folder '%s'"
-msgstr "ØÙØ ÙØÙÙÙØØ ØÙØØØ ÙÙÙØÙØ %s"
-
-#: ../mail/mail-ops.c:1370
-#, fuzzy, c-format
-msgid "Opening store '%s'"
-msgstr "ÙØØÙ ÙØØ ØÙÙØØÙ %s"
-
-#: ../mail/mail-ops.c:1446
-#, fuzzy, c-format
-msgid "Removing folder '%s'"
-msgstr "ÙØØÙ ØØØÙØ ØÙÙØÙÙØ %s"
-
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1104
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ÙØØÙ ØØØÙÙ ØÙÙØÙÙØ '%s'"
 
-#: ../mail/mail-ops.c:1678
+#: ../mail/mail-ops.c:1179
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ØØØ ÙØØØÙÙ ØÙØØØØ '%s'"
 
-#: ../mail/mail-ops.c:1679
+#: ../mail/mail-ops.c:1180
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ÙØØÙ ØØØÙÙ ØÙØØØØ '%s'"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1242
 #, fuzzy, c-format
 msgid "Refreshing folder '%s'"
 msgstr "ÙØØÙ ØØØÙØ ØÙÙØÙÙØ"
 
-#: ../mail/mail-ops.c:1901
+#: ../mail/mail-ops.c:1432
 #, fuzzy, c-format
 msgid "Expunging folder '%s'"
 msgstr "ÙØØÙ ØØØ ØÙÙØÙÙØ"
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:1517
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "ÙØØÙ ØÙØØØ ØÙØ ØÙÙÙÙÙØØ ÙÙ '%s'"
 
-#: ../mail/mail-ops.c:1974
-msgid "Local Folders"
-msgstr "ÙØÙÙØØØ ÙØÙÙÙÙØ"
-
-#: ../mail/mail-ops.c:2147
-#, fuzzy, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "ÙØØÙ ØØØ %d ØØØÙØ"
-msgstr[1] "ÙØØÙ ØØØ %d ØØØÙØ"
-msgstr[2] "ÙØØÙ ØØØ %d ØØØÙØ"
-msgstr[3] "ÙØØÙ ØØØ %d ØØØÙØ"
-
-#: ../mail/mail-ops.c:2240
-#, fuzzy, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "ÙØÙØ ØØØÙØ %d"
-msgstr[1] "ÙØÙØ ØØØØÙ %d"
-msgstr[2] "ÙØØÙ ØÙØ %d ØØØÙØ"
-msgstr[3] "ÙØØÙ ØÙØ %d ØØØÙØ"
-
-#: ../mail/mail-ops.c:2336
-#, fuzzy, c-format
-msgid "Error saving messages to: %s:\n"
-msgstr ""
-"ØØØ ØØØ ØØÙØØ ØÙØ ØÙØØØØÙ ØÙÙ: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2411
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "ØØØÙ ØØØÙØ ØØØØ '%s' ÙÙØÙÙ ØÙÙ ØØØØÙ."
-
-#: ../mail/mail-ops.c:2502
-msgid "Checking Service"
-msgstr "ÙØØÙ ÙØØ ØÙØØÙØ"
-
-#: ../mail/mail-ops.c:2582
+#: ../mail/mail-ops.c:1619
 #, fuzzy, c-format
 msgid "Disconnecting %s"
 msgstr "ÙØØÙ ÙØØ ØÙØØØØÙ ØÙ%s"
 
-#: ../mail/mail-ops.c:2639
-#, fuzzy, c-format
-msgid "Removing attachments"
-msgstr "ÙØØÙ ØÙØ ØÙÙÙØÙÙ"
-
-#: ../mail/mail-ops.c:2686
-#, fuzzy, c-format
-msgid "File \"%s\" has been removed."
-msgstr "ÙÙ ØÙØÙØØØØØ ØØÙÙØ."
-
-#: ../mail/mail-send-recv.c:191
+#: ../mail/mail-send-recv.c:198
 msgid "Canceling..."
 msgstr "ÙØØÙ ØÙØÙØØØ..."
 
-#: ../mail/mail-send-recv.c:436
+#: ../mail/mail-send-recv.c:454
 msgid "Send & Receive Mail"
 msgstr "ØØØÙÙ Ù ØÙÙÙ ØÙØØÙØ"
 
-#: ../mail/mail-send-recv.c:452
+#: ../mail/mail-send-recv.c:470
 msgid "Cancel _All"
 msgstr "ØÙØØØ ØÙ_ÙÙ"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
 msgid "Updating..."
 msgstr "ÙØØÙ ØÙØÙØØÙØ..."
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
 msgid "Waiting..."
 msgstr "ÙØØÙ ØÙØÙØØØØ..."
 
-#: ../mail/mail-send-recv.c:903
+#: ../mail/mail-send-recv.c:959
 #, c-format
 msgid "Checking for new mail"
 msgstr "ÙØØÙ ØÙÙÙÙØ ÙØÙÙ ØØÙØ ØØÙØ"
 
-#: ../mail/mail-tools.c:69
+#: ../mail/mail-tools.c:72
 #, fuzzy, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "ØÙØ ÙØØØ ØÙÙ ØÙØØØ ØÙÙÙ ØÙØØÙÙØ `%s': %s"
 
-#: ../mail/mail-tools.c:102
+#: ../mail/mail-tools.c:106
 #, fuzzy, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "ÙØØÙÙØ ÙÙÙ ØÙØØÙØ ØÙÙ ÙØØØ ÙÙØ mbox `%s'"
 
-#: ../mail/mail-tools.c:214
+#: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ØØØÙØ ÙÙØØØ - %s"
 
-#: ../mail/mail-tools.c:216
+#: ../mail/mail-tools.c:217
 msgid "Forwarded message"
 msgstr "ØØØÙØ ÙÙØØØ"
 
-#: ../mail/mail-vfolder.c:86
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "ØØØØØ ÙØÙØ ØÙØØØ: %s"
 
-#: ../mail/mail-vfolder.c:235
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
+#: ../mail/mail-vfolder.c:232
+#, fuzzy, c-format
+msgid "Updating Search Folders for '%s' : %s"
 msgstr "ÙØØÙ ØØØÙØ ÙØÙØØØ ØÙØØØ ÙÙ'%s:%s'"
 
-#: ../mail/mail-vfolder.c:242
-#, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "ÙØØÙ ØØØÙØ ÙØÙØØØ ØÙØØØ ÙÙ'%s'"
-
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:718
+#: ../mail/mail-vfolder.c:678
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12424,11 +12454,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ../mail/mail-vfolder.c:1297
+#: ../mail/mail-vfolder.c:1314
 msgid "Edit Search Folder"
 msgstr "ØØØÙØ ÙØÙØ ØÙØØØ"
 
-#: ../mail/mail-vfolder.c:1408
+#: ../mail/mail-vfolder.c:1423
 msgid "New Search Folder"
 msgstr "ÙØÙØ ØØØ ØØÙØ"
 
@@ -12639,59 +12669,55 @@ msgstr "ØÙÙ ÙØÙ ØÙÙØÙØØ"
 msgid "Could not save signature file."
 msgstr "ØÙØ ÙØØØ ØÙÙ ØÙØ ÙÙÙ ØÙØÙÙÙØ."
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "ØØÙ ØÙØØØØÙ ÙÙ ÙØÙØ ØÙØØØ \"{0}\"Ø"
-
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 #, fuzzy
 msgid "Do _Not Disable"
 msgstr "ÙØ ØØØÙ"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 #, fuzzy
 msgid "Do _Not Send"
 msgstr "ÙØ _ØØØÙÙ"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 #, fuzzy
 msgid "Do _Not Synchronize"
 msgstr "ÙØ Ø_ØØÙÙ"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "ÙÙ ØØÙØ ØÙ ØØØÙÙ ÙØÙÙÙØ ØÙÙØÙØØØ ØÙÙØØØØ ÙÙØØØØØØÙ ØÙÙ ØØØØÙØ"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "ÙÙ ØØÙØ ØØÙÙÙ ÙÙ ØÙØØØØÙ ÙÙÙØÙØØØ"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "ÙÙ ØØÙØ ØÙØ ØØÙÙØØØÙØ"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "ØØØÙ ÙÙÙØ ØØ."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "ØØØ ØØØ ØØÙØØ ØØÙÙÙ ØØØÙÙØØ ØÙÙØØØ."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "ØØØ ØØØ ØØÙØØ ØÙÙÙØÙ ØØÙØÙÙÙØ."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "ØØØ ØØØ ØØÙØØ {0}."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -12702,34 +12728,70 @@ msgid ""
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid "Evolution's local mail format has changed."
 msgstr ""
 
+#: ../mail/mail.error.xml.h:63
+#, fuzzy
+msgid "Failed to download messages for offline viewing."
+msgstr "_ØÙØÙÙ ØÙØØØØÙ ÙÙØØØØÙØ ØØÙÙ ØØØØÙ"
+
 #: ../mail/mail.error.xml.h:64
 #, fuzzy
+msgid "Failed to find duplicate messages."
+msgstr "ØÙØØØØÙ ØÙÙÙØÙØØ"
+
+#: ../mail/mail.error.xml.h:65
+#, fuzzy
+msgid "Failed to open folder."
+msgstr "ÙØÙØ ÙÙ ÙØØ ØÙØÙØØ"
+
+#: ../mail/mail.error.xml.h:66
+#, fuzzy
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr "ÙØØÙ ØÙØØØØÙØÙ ÙÙ ØÙØØØÙÙ ØÙ ÙØØÙØ ØØØØÙÙØ ØÙØÙØÙ ØÙÙØØÙÙØ."
+
+#: ../mail/mail.error.xml.h:67
+#, fuzzy
+msgid "Failed to remove attachments from messages."
+msgstr "ÙØÙ ØØØØÙ %d ØØØÙØ ÙÙ ØØÙØÙÙ %d"
+
+#: ../mail/mail.error.xml.h:68
+#, fuzzy
+msgid "Failed to retrieve messages."
+msgstr "ÙÙ ØØØØÙØ ØÙØ ØÙØØØÙØ"
+
+#: ../mail/mail.error.xml.h:69
+#, fuzzy
+msgid "Failed to save messages to disk."
+msgstr "ÙØÙ ØØØØÙ %d ØØØÙØ ÙÙ ØØÙØÙÙ %d"
+
+#: ../mail/mail.error.xml.h:70
+#, fuzzy
 msgid "Failed to unsubscribe from folder."
 msgstr "ÙÙ ØØÙØ ÙØÙÙØ ØÙØØØ ØÙØØØØØÙ ÙÙ ØÙÙØÙØ \"%s\"Ø"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "ØÙÙÙÙ ÙÙØÙØ ÙÙÙ ØÙÙØØØØ ÙÙÙÙ ØÙØ ÙÙÙÙØ."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "ØÙÙÙÙ ÙÙØÙØ ÙÙÙÙ ÙÙØ ÙÙÙÙØ ØØØÙÙØ."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:74
 #, fuzzy
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "ÙØ ÙØØÙÙ ÙØØ ØÙÙØÙÙ ØÙÙ ØØØÙØ ØÙÙÙÙ ØØÙØØ"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "ÙÙ ØØØØÙØ ØØØØØØØ ÙØÙ ØÙØØØØÙ ØÙ ØØØØØ."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:76
 #, fuzzy
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
@@ -12737,18 +12799,18 @@ msgid ""
 msgstr ""
 "ØÙ ØÙØÙØ ÙØØ ØÙÙØÙØ ÙØÙØÙ ØØÙ ÙÙ ÙØØÙÙØØÙ ÙÙØÙØØØÙ ØÙÙØØÙØ ØØÙØØ ØØØÙØ."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:77
 #, fuzzy
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "ØÙ ØÙØÙØ ÙØØ ØÙÙØÙØ ÙØÙØÙ ØØÙ ÙÙ ÙØØÙÙØØÙ ÙÙØÙØØØÙ ØÙÙØØÙØ ØØÙØØ ØØØÙØ."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "ØÙ ØÙÙÙØØ ØÙØÙ ØØÙ ÙÙ ØØØØØØ ØÙÙÙÙØØ ØØÙØØ ÙÙØØÙØ."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12756,34 +12818,34 @@ msgstr ""
 "ØÙ ØÙÙÙØØ ØÙØÙ ØØÙ ÙØÙÙÙØØ ØÙØØØØ\n"
 "ÙÙÙ ÙØÙÙÙØØ ØÙÙÙÙÙ ØØÙØØ ÙÙØØÙØ."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "ØÙ ØÙÙÙØØ ØÙØÙ ØØÙ ÙØÙÙÙØØ ØÙØØØØ ØØÙØØ ÙÙØØÙØ."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 "ØÙ ØÙÙÙØ ØÙÙÙÙÙÙØÙØ ÙÙ ÙØÙ ØØØØÙ ÙØÙ ØÙØØØØÙ ØÙØ ØØØ ÙØØ ØÙÙÙÙÙÙØÙ ÙØØ ØØØÙ."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "ØØØÙÙ"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "ØÙØÙ ØÙØ ØØÙØ"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "ÙØÙ ØØÙ ØÙØØÙØ"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "ØÙ ØØØÙØ ÙØØØØØ ØÙØØÙØ ØÙÙØØÙÙØ."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:87
 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 "
@@ -12795,37 +12857,48 @@ msgstr ""
 "ÙØØØØÙÙ ØÙÙ ÙØØÙØ ØÙÙ ÙØØÙØÙÙ ØØØÙØÙ. ÙØÙØØÙ ÙØØØ ÙØØ ØÙ ØØÙÙ ÙØØÙØÙÙØ ÙØØØÙØ "
 "ØÙÙ ØÙØÙÙ ÙÙ ØØÙØ ØÙÙ: ØÙ Ù.Ù:."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:88
+#, fuzzy
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"ØØØÙØ: ØØÙ ØÙØØØØÙ ÙÙ ÙØÙØ ØÙØØØ ØÙØØÙ ØÙØØØÙØ ØÙØÙÙÙÙØ ÙÙ ØØØ ÙØÙØØØÙ "
+"ØÙÙØÙÙØ ØÙ ØÙØØÙØØ. \n"
+"ÙÙ ØØØØ ÙÙ ÙØÙ ÙØØØ"
+
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "ÙØÙØ ÙÙÙÙØ."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:91
 #, fuzzy
 msgid "N_ever"
 msgstr "ØØØÙØ"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:92
 #, fuzzy
 msgid "No duplicate messages found."
 msgstr "ÙÙØÙØØ ØØØÙØ ØÙØ ÙÙØÙÙØ"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "ÙÙ ÙØÙ ØÙØÙØØ ÙØØØ."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr "ÙØØ ØØØ ÙØÙØ ÙÙ ØÙØØØØÙ ØÙØØ ÙØØØØ ÙØ ÙØØØØÙ ÙÙØÙØ ÙØÙØÙØ."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "ØØØØ ØÙØØ ØØØØØØØ ØÙØØØØ ØÙ ØØÙÙ ÙØØ ØØØÙ."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr "ØØØØ ÙØÙ ØØØØÙ ØÙ ØØØÙ ØØØØØØØÙ ØØØØ ØØØ."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:97
 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."
@@ -12833,7 +12906,7 @@ msgstr ""
 "ØØØØÙ ØØØÙ ØÙÙØÙ ØØÙØ ØØÙØ ÙÙ ØÙÙ ØÙÙ:. ÙÙÙÙÙ ØÙØØØ ØÙ ØÙØÙÙÙ ØÙØØÙØ "
 "ØÙØÙÙØØÙÙÙ ØØÙÙÙØ ØÙÙ ØØ ØÙÙ: ØØØÙØ ØÙØÙÙ ØÙØØØØÙ."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12842,67 +12915,67 @@ msgstr ""
 "ØØØØÙ ØØÙØ ÙÙ ØÙ ØÙÙØÙÙÙÙ ØÙØØÙØ ØØÙØØÙÙ ÙØØØÙÙ ÙÙØØØÙØÙÙ ØØØÙØØÙ ØØÙØ HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "ØØØØÙ ÙØÙ ØØÙÙØ ÙØÙØÙØ ÙØØØÙÙ ÙØØ ØÙØÙÙÙØ."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "ØØØØÙ ØÙØØØ."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ØØØ ÙÙ ØÙØÙØ ÙØÙØ ØÙØØÙØ ØÙÙØÙÙ \"{0}\"."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ÙØØÙ ØÙØØØØÙØÙ ÙÙ ØÙØØØÙÙ ØÙ ÙØØÙØ ØØØØÙÙØ ØÙØÙØÙ ØÙÙØØÙÙØ."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "ØÙ ØÙØ ØØØØØ ÙØØØØ."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ØØÙØ ØØØÙ ØÙÙØÙØ \"{0}\" ÙÙÙ ÙØÙØØØÙ ØÙÙØØÙØØ"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:106
 #, fuzzy
 msgid "Really delete folder \"{0}\"?"
 msgstr "ÙØ ÙÙÙÙ ØØÙ ØÙÙØÙØ \"{0}\"."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:107
 #, fuzzy
 msgid "Remove duplicate messages?"
 msgstr "ØÙØØØØÙ ØÙÙÙØÙØØ"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:108
 #, fuzzy
 msgid "Reply _Privately"
 msgstr "_ØØØ"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "ØÙ ØØØÙØ ÙØÙØØØ ØÙØØØ ØÙÙØØÙÙØ."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:113
 #, fuzzy
 msgid "Send reply to all recipients?"
 msgstr "ØØØÙÙ ØØØØØ ØÙÙØÙÙ"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "ØÙØÙÙÙØ ÙÙØÙØ ÙØØÙÙØ."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "ØØØÙØ ÙØØÙÙØ ØÙÙØÙØØØ ÙØÙÙÙØ ÙÙØØØØØØÙ ØØÙÙ ØØØØÙØ"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -12910,7 +12983,7 @@ msgstr ""
 "ÙØÙØØØ ØÙÙØØÙ ÙØÙÙØØ ÙÙÙ ÙØÙÙ ØÙÙÙÙÙÙØÙ ØØÙØØ ØØÙØØ ÙÙØ ÙÙÙÙ ØØØØØ ØØÙÙØÙØ ØÙ "
 "ÙÙÙÙØ ØÙ ØÙØØØÙØ."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12926,23 +12999,27 @@ msgstr ""
 "ÙØØØØÙÙ ØÙÙ ÙØØÙØ ØÙÙ ÙØØÙØÙÙ ØØØÙØÙ. ÙØÙØØÙ ÙØØØ ÙØØ ØÙ ØØÙÙ ÙØØÙØÙÙØ ÙØØØÙØ "
 "ØÙÙ ØÙØÙÙ ÙÙ ØØÙØ ØÙÙ: ØÙ Ù.Ù:."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "ÙØØ ØÙ ÙÙÙÙ ÙÙÙ ØÙØØÙØÙØ ØÙÙØÙ ÙÙØÙØÙØ ÙÙØØÙÙØ ÙÙØÙÙÙØ."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:126
+msgid "These messages are not copies."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12950,45 +13027,45 @@ msgstr ""
 "ÙÙÙÙ ØÙ ÙÙÙÙ ÙØØ ØÙÙØÙØ ÙØ ØÙØ ØØØÙØÙ ØÙÙÙÙØ\n"
 "ØÙ ØØØØØ ÙÙÙÙÙ ØÙØÙØØ ØÙÙ ÙØØØ ÙØÙØØØ ØÙØØØ ÙØØØÙØÙ ØØØØØÙ."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "ÙØ ÙÙÙÙ ØØØØÙ ÙØÙ ØÙØØØÙØ ÙØÙ ØÙØØØØ ØÙØÙ ØØØØØ ØÙØØØØÙ ØÙ ÙÙØ ÙÙØÙÙØ"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "ÙØ ÙÙÙÙ ØØØØÙ ÙØÙ ØÙØØØÙØ ÙØÙÙ ÙÙ ØØØØ ØÙ ÙØØÙÙÙÙ ÙÙØ"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "ÙØØ ØÙØØØÙÙ ÙØ ÙØØÙ ÙØØ ØÙÙÙØ ÙÙ ØÙØÙØÙ ÙÙØ ÙØ ÙØØÙ ØÙØÙØÙ ØØØØÙØ."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "ØÙ ØØÙÙØ ÙØØ ØÙØÙÙÙØØ ÙÙÙ ÙÙ ÙØÙ ØÙØÙ."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
 "ÙØØ ØÙØØ ØÙØÙØ ÙÙØÙØ ÙÙÙ ØÙØØØØÙ ÙÙ ØÙÙØÙØ ØÙÙÙØÙÙ ÙÙÙ ÙØÙØØØÙ ØÙÙØØÙØ."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:134
 #, fuzzy
 msgid "This will mark all messages as read in the selected folder."
 msgstr ""
 "ÙØØ ØÙØØ ØÙØÙØ ÙÙØÙØ ÙÙÙ ØÙØØØØÙ ÙÙ ØÙÙØÙØ ØÙÙÙØÙÙ ÙÙÙ ÙØÙØØØÙ ØÙÙØØÙØ."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "ØÙØ ÙØØØ ØÙÙ ØÙØØØØÙ ØØØØÙÙ ØØÙØÙØÙØ."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -12996,79 +13073,74 @@ msgstr ""
 "ØÙØ ÙØØØ ØÙÙ ÙØØ ÙØÙØ ØÙÙØÙØØØ ÙÙØØ ØÙØØØØ. ÙÙ ØØÙØ ØØØØØØÙ ÙØÙØ ÙØÙØØØ "
 "ØÙÙØØÙ ØØÙÙØ ÙÙÙØ"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
 msgstr "ØÙØ ÙØØØ ØÙÙ ÙØØØØ ÙÙÙ ØÙØØØÙØ."
 
-#: ../mail/mail.error.xml.h:130
-msgid "Use _Default"
-msgstr "ØØØØØÙ ØÙØÙØØØ_ØÙ"
-
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:138
+#, fuzzy
+msgid "Unable to retrieve message."
+msgstr "ÙÙ ØØØØÙØ ØÙØ ØÙØØØÙØ"
+
+#: ../mail/mail.error.xml.h:139
+msgid "Use _Default"
+msgstr "ØØØØØÙ ØÙØÙØØØ_ØÙ"
+
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
 msgstr "ØØØØØØÙ ÙØÙØ ØÙÙØÙØØØ ØÙØÙØØØØÙØ"
 
-#: ../mail/mail.error.xml.h:132
-msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
-"Do you really want to do this?"
-msgstr ""
-"ØØØÙØ: ØØÙ ØÙØØØØÙ ÙÙ ÙØÙØ ØÙØØØ ØÙØØÙ ØÙØØØÙØ ØÙØÙÙÙÙØ ÙÙ ØØØ ÙØÙØØØÙ "
-"ØÙÙØÙÙØ ØÙ ØÙØØÙØØ. \n"
-"ÙÙ ØØØØ ÙÙ ÙØÙ ÙØØØ"
-
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:141
 #, fuzzy
 msgid "Would you like to close the message window?"
 msgstr "ØØØØØ ØÙØÙÙÙØ"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:142
 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
+#: ../mail/mail.error.xml.h:143
 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
+#: ../mail/mail.error.xml.h:144
 #, fuzzy
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr "ØØØ ØØØÙØ ÙØ ÙØØÙÙØ ÙÙ ØÙØÙÙ ØØÙØ ØÙÙØØÙÙ. ØÙØØÙØ ÙÙ ØØØØÙ ØÙØØØ"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ÙÙØØ ÙØÙÙ ØØØØÙØ ÙØÙÙØ ÙØØÙ ÙØØ ØÙØØÙØ."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "ÙÙ ØÙØØ ØÙÙØ ØÙÙØÙÙÙØØ ØÙÙØÙÙØØ."
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "ØÙØØ ÙØÙÙ ØØØØÙ ØÙØ ÙØØÙØØ ÙÙ ØØØØ ÙÙ ØÙØÙÙØØ ØÙÙØ ÙØÙØ"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
 msgstr "ÙØ ÙÙÙÙÙ ØÙØØØ ØØØØÙÙ ØØÙØØÙ ØØØÙ."
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
 msgstr "ÙØØ ØÙ ØØÙÙ ÙØÙØ ØÙØØØ ÙØØ."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "ÙØØ ØØØÙØ ÙØÙÙØ."
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13078,159 +13150,168 @@ msgstr ""
 "ØÙØ ØØÙØÙØØ ØÙÙØÙØØØ ØØÙØØ ÙØØÙØØ Ù/ØÙ ØØÙØÙØØ ÙÙ ØÙÙØÙØØØ ØÙÙØÙÙØØ ØÙ ÙÙ "
 "ØÙÙØÙØØØ ØÙØØÙØØØ ØÙ ØÙÙÙØÙÙ."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "ÙØÙ ÙÙÙØÙ ÙÙØØØÙ \"{0}\" Ù \"{0}\"."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:154
 #, fuzzy
 msgid "_Always"
 msgstr "ØØØÙÙØ"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "Ø_ÙØØÙ"
 
-#: ../mail/mail.error.xml.h:149
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../mail/mail.error.xml.h:156
+#: ../plugins/publish-calendar/publish-calendar.c:619
 msgid "_Disable"
 msgstr "Ø_ØÙÙ"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "_ØØÙØ ÙÙ ØÙØØÙÙØØØ"
 
-#: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Empty Trash"
 msgstr "Ø_ÙØÙØ ØÙÙÙÙÙØØ"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:159
 #, fuzzy
 msgid "_Exit Evolution"
 msgstr "ØÙÙÙÙÙÙØÙ"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "_ØØØ"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:161
 #, fuzzy
 msgid "_Migrate Now"
 msgstr "ÙØØÙ ØÙØØÙÙØ..."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:162
 #, fuzzy
 msgid "_No"
 msgstr "ÙØ"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "ØÙØ_Ø ØÙØØØØÙ"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:166
 #, fuzzy
 msgid "_Send Receipt"
 msgstr "ØØØÙÙ ØØØØØ ØÙÙØÙÙ"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:167
 #, fuzzy
 msgid "_Synchronize"
 msgstr "ØØÙÙ"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:168
 #, fuzzy
 msgid "_Yes"
 msgstr "ÙØÙ"
 
-#: ../mail/message-list.c:1215
+#: ../mail/mail.error.xml.h:169
+msgid "{0}"
+msgstr ""
+
+#: ../mail/message-list.c:1261
 msgid "Unseen"
 msgstr "ØÙØ ÙØØØØ"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1262
 msgid "Seen"
 msgstr "ØÙØØ"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1263
 msgid "Answered"
 msgstr "ÙØØØ"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1264
 msgid "Forwarded"
 msgstr "ÙÙØØØ"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1265
 msgid "Multiple Unseen Messages"
 msgstr "ØØØØÙ ØÙØ ÙØØØØØ ÙØØØÙØ"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1266
 msgid "Multiple Messages"
 msgstr "ØØØØÙ ÙØØØÙØØ"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1270
 msgid "Lowest"
 msgstr "ØÙØØÙÙ"
 
-#: ../mail/message-list.c:1225
+#: ../mail/message-list.c:1271
 msgid "Lower"
 msgstr "ØØÙÙ"
 
-#: ../mail/message-list.c:1229
+#: ../mail/message-list.c:1275
 msgid "Higher"
 msgstr "ØØÙÙ"
 
-#: ../mail/message-list.c:1230
+#: ../mail/message-list.c:1276
 msgid "Highest"
 msgstr "ØÙØØÙÙ"
 
-#: ../mail/message-list.c:1849 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "Ø"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1856 ../plugins/itip-formatter/itip-view.c:205
+#. * in 12-hour format, without seconds.
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ØÙÙÙÙ %l:%M %p"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1925
 msgid "Yesterday %l:%M %p"
 msgstr "ØÙØÙØ %l:%M %p"
 
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:1937
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1885
+#: ../mail/message-list.c:1945
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1947
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2672
+#: ../mail/message-list.c:2752
 msgid "Select all visible messages"
 msgstr "ØÙØÙØØ ØÙÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ"
 
-#: ../mail/message-list.c:2830 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ØØØØÙ"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4160
+#, fuzzy
+msgid "Follow-up"
+msgstr "ÙØØØØØ"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4506 ../mail/message-list.c:4930
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
 msgid "Generating message list"
 msgstr "ÙØØÙ ØÙØØØ ÙØØÙØ ØÙØØØØÙ"
 
-#: ../mail/message-list.c:4745
+#: ../mail/message-list.c:4912
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 "ÙØ ØØØØÙ ØÙØÙÙ ÙØØÙÙØ ØØØÙ. ØÙØ ØÙØØ ØÙØØØ ÙÙ ØÙØØ ÙØØÙØ ØØØ->ÙØØ ØÙ ØÙÙØÙ."
 
-#: ../mail/message-list.c:4747
+#: ../mail/message-list.c:4914
 msgid "There are no messages in this folder."
 msgstr "ÙØ ØØØØÙ ÙÙ ÙØØ ØÙÙØÙØ."
 
@@ -13259,7 +13340,7 @@ msgid "Sent Messages"
 msgstr "ØØØØÙ ÙØØÙØ"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:568
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Size"
 msgstr "ØÙØØÙ"
 
@@ -13269,27 +13350,27 @@ msgid "Subject - Trimmed"
 msgstr "ØÙÙ ØÙ_ÙÙØÙØ"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
 msgid "Body contains"
 msgstr "ØÙÙØÙ ÙØØÙÙ"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
 msgid "Message contains"
 msgstr "ØÙØÙØØÙØ ØØØÙÙ"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1522
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
 msgid "Recipients contain"
 msgstr "ØÙÙØØÙÙÙÙ ÙØØÙÙÙ"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Sender contains"
 msgstr "ØÙÙØØÙÙ ÙØØÙÙ"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Subject contains"
 msgstr "ØÙÙÙØÙØ ÙØØÙÙ"
 
@@ -13298,7 +13379,7 @@ msgstr "ØÙÙÙØÙØ ÙØØÙÙ"
 msgid "Subject or Addresses contains"
 msgstr "ØÙÙÙØÙØ ØÙ ØÙÙØØÙÙ ÙØØÙÙØÙ ØÙÙ"
 
-#: ../modules/addressbook/addressbook-config.c:205
+#: ../modules/addressbook/addressbook-config.c:207
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13306,7 +13387,7 @@ msgstr ""
 "ØÙØÙØØ ÙØØ ØÙØÙØØ ÙØÙÙ ØÙ ØÙÙÙÙÙÙØÙÙ ÙÙ ÙØØÙ ØØØØÙÙ LDAP ØØØØÙ ØÙÙØ ØØØ ÙØÙ "
 "ØÙØØØÙÙ ÙØØÙ SSL."
 
-#: ../modules/addressbook/addressbook-config.c:207
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13314,7 +13395,7 @@ msgstr ""
 "ØÙØÙØØÙØØ ØÙØÙØØ ÙØÙÙ ØÙ ØÙÙÙÙÙÙØÙ ÙÙ ÙØØÙ ØØØØÙÙ LDAP ØÙØ ØØØ ÙØÙ ØØØÙÙ LDAP "
 "ÙØØÙ ØÙØØØØÙ ØÙØÙÙ TLS."
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -13323,16 +13404,16 @@ msgstr ""
 "ØÙØÙØØ ÙØØ ØÙØÙØØ ÙØÙÙ ØÙ ØØØÙÙÙ ÙØ ÙØØÙ SSL ÙÙØ TLS. ÙØØ ÙØÙÙ ØÙ ØØÙØØÙÙ ÙÙ "
 "ÙÙÙÙ ØÙÙÙØØ ÙØÙÙÙ ØØÙÙÙ ÙØØÙØÙØ ÙÙØØØØ ØÙÙÙÙÙØ."
 
-#: ../modules/addressbook/addressbook-config.c:608
+#: ../modules/addressbook/addressbook-config.c:641
 #, fuzzy
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "ØØÙØØ ØÙÙÙÙØØ ÙØÙØÙÙÙÙØØ"
 
-#: ../modules/addressbook/addressbook-config.c:644
+#: ../modules/addressbook/addressbook-config.c:683
 msgid "Copy _book content locally for offline operation"
 msgstr "ØÙØØ ÙØØÙÙØØ ØÙØÙØØ ÙØÙÙØ ÙÙØØØÙÙ ØÙÙ ØØØØÙ"
 
-#: ../modules/addressbook/addressbook-config.c:751
+#: ../modules/addressbook/addressbook-config.c:798
 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 "
@@ -13341,7 +13422,7 @@ msgstr ""
 "ÙØØ ÙÙ ØÙÙÙÙØ ØÙÙ ØØØÙÙ LDAP ØÙØÙ ØÙØØÙÙ ØÙÙÙÙÙÙØÙÙ ØÙØØÙØØÙ ØÙ. ØÙ ØØÙÙØ ÙØØÙØ "
 "ØØÙÙÙØÙØ ØÙÙÙØØÙØ. ØØØÙ ÙØÙØ ÙØØÙÙ ØÙ ØÙÙÙÙØ ØÙØÙ ÙØØ ØÙ ØØØÙØÙ."
 
-#: ../modules/addressbook/addressbook-config.c:825
+#: ../modules/addressbook/addressbook-config.c:879
 #, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
@@ -13351,7 +13432,7 @@ msgstr ""
 "ÙØÙ ÙÙ ØÙØÙØÙÙØ ØÙØÙ ØÙØØØØÙÙØ ØÙÙÙÙÙÙØÙÙ ÙØÙØÙÙÙ.  ÙØØØ ØÙÙ ØØØ ÙØØ ÙÙ\"ØÙÙØÙ "
 "ØØÙØ ØÙÙØØÙÙÙ\" ÙØØÙØ ÙÙØØØ ÙØØØ ÙØÙÙÙ ÙØØØÙÙ ldap."
 
-#: ../modules/addressbook/addressbook-config.c:900
+#: ../modules/addressbook/addressbook-config.c:962
 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 "
@@ -13362,29 +13443,29 @@ msgstr ""
 "ØÙÙØØÙØØ ØØØ ÙØØØØ ØØØÙ. ÙÙ ÙØÙÙ ÙØØÙ ØÙØØØ \"ÙØØØ\" ØÙØ ØÙÙØØÙØØ ØÙÙØÙØØ "
 "ØØØ ÙØØØØÙ ØÙØØÙÙÙ ÙØØØ."
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1086
 msgid "Server Information"
 msgstr "ÙØÙÙÙØØ ØÙØØØÙÙ"
 
-#: ../modules/addressbook/addressbook-config.c:1021
+#: ../modules/addressbook/addressbook-config.c:1091
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "ØÙØØÙÙ"
 
-#: ../modules/addressbook/addressbook-config.c:1022
-#: ../modules/mail/e-mail-shell-view.c:54
+#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "ÙØØÙ ØÙØØØ"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1094
 msgid "Downloading"
 msgstr "ÙØØÙ ØÙØÙØÙÙ"
 
-#: ../modules/addressbook/addressbook-config.c:1230
+#: ../modules/addressbook/addressbook-config.c:1309
 msgid "Address Book Properties"
 msgstr "ØØØØØ ØÙØØ ØÙØÙØÙÙÙ"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1311
 msgid "New Address Book"
 msgstr "ØÙØØ ØÙØÙÙÙ ØØÙØ"
 
@@ -13432,16 +13513,21 @@ msgid "Show autocompleted name with an address"
 msgstr ""
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#, fuzzy
+msgid "Show maps"
+msgstr "ØØÙØ ØÙØÙØÙÙ ØÙÙØØØÙÙØ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show preview pane"
 msgstr "ØØÙØ ÙÙØ ØÙÙØØÙÙØ"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -13449,382 +13535,412 @@ msgid ""
 "contact list."
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
 "ØØØ ØÙÙØØØÙ ØÙØÙ ÙØØ ÙØØØÙØ ÙØÙ ØÙ ÙØØÙÙ ØÙÙÙÙÙÙØÙ ØØØØØØÙ ØÙØÙÙÙÙØ ØÙØÙÙÙØ."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog"
 msgstr "ØÙÙØÙ ØØØ ØÙÙÙ ØØØÙØØÙ ÙÙ ØÙØØ ØÙØÙØØ ØÙØØÙØØ"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
 msgstr "ØÙÙØÙ ØØØ ØÙÙÙ ØØØÙØØÙ ÙÙ ØÙØØ ØÙØÙØØ ØÙØØÙØØ."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#, fuzzy
+msgid "Whether to show maps in preview pane."
+msgstr "ÙÙÙØ ØØØ ØÙØØØ ÙÙØ ÙØØÙÙØ ØÙ ÙØ."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
 msgstr "ÙÙÙØ ØØØ ØÙØØØ ÙÙØ ÙØØÙÙØ ØÙ ÙØ."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:161
-#: ../modules/mail/em-mailer-prefs.c:1140
+#: ../modules/addressbook/autocompletion-config.c:194
+#: ../modules/mail/em-mailer-prefs.c:1049
 #, fuzzy
 msgid "_Table column:"
 msgstr "ØÙÙØ ØÙØØÙÙ:"
 
-#: ../modules/addressbook/autocompletion-config.c:164
+#: ../modules/addressbook/autocompletion-config.c:197
 msgid "Autocompletion"
 msgstr "ØÙØÙÙÙÙØ ØÙØÙÙØØÙØ"
 
-#: ../modules/addressbook/autocompletion-config.c:167
+#: ../modules/addressbook/autocompletion-config.c:200
 msgid "Always _show address of the autocompleted contact"
 msgstr ""
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:94
-#: ../modules/addressbook/e-book-shell-migrate.c:153
+#: ../modules/addressbook/e-book-shell-backend.c:102
+#: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "ØÙÙ ØÙØØÙÙ LDAP"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "_ÙØØØØÙ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "ØÙØØ ÙØØØØÙ ØØÙØ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:283
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ÙØØÙØ ØÙÙ_ØØØØÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
-#: ../modules/addressbook/e-book-shell-view-actions.c:780
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "ØÙØØ ÙØØÙØ ÙØØØØÙÙÙ ØØÙØØ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "ØÙØØ ØÙØ_ÙØÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:295
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "ØÙØØ ØÙØØ ØÙØÙÙÙ ØØÙØ"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:312
-#: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:105
-#: ../modules/calendar/e-cal-shell-migrate.c:59
+#: ../modules/addressbook/e-book-shell-backend.c:338
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "ØÙÙØØØØÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:322
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgid "Certificates"
 msgstr "ØÙØÙÙØØØØ"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:549
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
-msgstr "ØØÙØ ÙÙ vCard..."
+msgstr "ØØÙØ Ùâ vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
 msgstr "ØÙ_ØØ ÙÙ ØÙÙØØØØÙÙÙ ØÙÙ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 #, fuzzy
 msgid "Copy the contacts of the selected address book to another"
 msgstr "ØÙØØ ÙØØØØÙÙ ØÙÙØÙØ ØÙÙÙØÙÙ ØÙÙ ØØØÙ ÙØÙØ ØØØ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 #, fuzzy
 msgid "D_elete Address Book"
 msgstr "ØØ_ØÙ ØÙØØ ØÙØÙØÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 #, fuzzy
 msgid "Delete the selected address book"
 msgstr "ØØØÙ ØÙÙØÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
 msgstr "ØÙ_ÙÙ ÙÙ ØÙÙØØØØÙÙÙ ØÙÙ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 #, fuzzy
 msgid "Move the contacts of the selected address book to another"
 msgstr "ÙÙÙ ÙØØØØÙÙ ØÙÙØÙØ ØÙÙÙØÙÙ ØÙÙ ÙØÙØ ØØØ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
 msgstr "ØÙØØ ØÙØÙÙÙ _ØØÙØ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address _Book Properties"
 msgstr "ØØØØØ _ØÙØØ ØÙØÙØÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 #, fuzzy
 msgid "Show properties of the selected address book"
 msgstr "ØÙØ ØØØØØ ØÙÙØÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
-#: ../modules/calendar/e-task-shell-view-actions.c:750
-#: ../modules/mail/e-mail-shell-view-actions.c:1155
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#, fuzzy
+msgid "Address Book _Map"
+msgstr "ØÙØØ ØÙØÙØÙÙÙ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#, fuzzy
+msgid "Show map with all contacts from selected address book"
+msgstr "ØÙØØ ÙØØØØÙÙ ØÙÙØÙØ ØÙÙÙØÙÙ ØÙÙ ØØØÙ ÙØÙØ ØØØ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "_Rename..."
 msgstr "Ø_ØÙØ ØÙØØÙÙØ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 #, fuzzy
 msgid "Rename the selected address book"
 msgstr "ØØÙØ ØØÙÙØ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-#, fuzzy
-msgid "S_ave Address Book as vCard"
-msgstr "ØØÙØ ØÙØØ ØÙØÙØÙÙÙ ØÙÙØØ VCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
-#, fuzzy
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "ØØÙ_Ø ÙØØØØÙÙ ØÙÙØÙØ ØÙÙÙØÙÙ ÙÙÙÙØØØ"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 #, fuzzy
 msgid "Stop loading"
 msgstr "ØÙÙØÙ ØÙØÙØÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 #, fuzzy
 msgid "_Copy Contact To..."
 msgstr "ÙØ_Ø ØÙÙØØØØÙ ØÙÙ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 #, fuzzy
 msgid "Copy selected contacts to another address book"
 msgstr "ØÙØØ ØÙÙØØØØÙÙÙ ØÙÙÙØÙÙÙ ØÙÙ ÙØÙØ ØØØ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
 msgstr "ØØ_ØÙ ØÙÙØØØØÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 #, fuzzy
 msgid "_Find in Contact..."
 msgstr "_ÙØØ ØÙÙØØØØÙ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 #, fuzzy
 msgid "Search for text in the displayed contact"
 msgstr "ØØØ ØÙ ØÙÙÙØ ÙÙ ØÙØØØÙØ ØÙÙØØÙØØ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
 msgstr "_ÙØØ ØÙÙØØØØÙ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 #, fuzzy
 msgid "Send selected contacts to another person"
 msgstr "ØØØÙÙ ØÙÙØØØØÙÙÙ ØÙÙØØØØÙÙ ÙØØØ ØØØ."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 #, fuzzy
 msgid "_Move Contact To..."
 msgstr "Ù_ÙÙ ØÙÙØØØØÙ ØÙÙ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:766
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 #, fuzzy
 msgid "Move selected contacts to another address book"
 msgstr "ÙÙÙ ØÙÙØØØØÙÙÙ ØÙÙÙØÙÙÙ ØÙÙ ÙØÙØ ØØØ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
 msgstr "ÙÙØÙØØÙÙ _ØØÙØ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
 msgstr "_ÙØØÙØ ÙØØØØÙÙÙ ØØÙØØ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 #, fuzzy
 msgid "_Open Contact"
 msgstr "_ÙØØØØÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:787
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
 msgstr "ØØØ ØÙÙØØØØÙ ØÙØØÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
 msgstr "ØØØÙÙ _ØØØÙØ ÙÙÙØØØØÙ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 #, fuzzy
 msgid "Send a message to the selected contacts"
 msgstr "ØØØÙÙ ØØØÙØ ÙÙÙØØØØÙÙÙ ØÙÙÙØÙÙÙ."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1502
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Actions"
 msgstr "Ø_ØØØØØØ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
-#: ../modules/calendar/e-task-shell-view-actions.c:815
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "_Preview"
 msgstr "_ÙØØÙÙØ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
-#: ../modules/calendar/e-memo-shell-view-actions.c:676
-#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-memo-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-view-actions.c:843
 msgid "_Delete"
 msgstr "Ø_ØØÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "_Properties"
 msgstr "ØÙ_ØØØØØ"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-msgid "_Save as vCard..."
-msgstr "Ø_ØÙØ ÙÙ vCard..."
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#, fuzzy
+msgid "Address Book Map"
+msgstr "ØÙØØ ØÙØÙØÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
 msgstr "Ù_ØØÙÙØ ØÙÙØØØØÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
 msgstr "ØØÙØ ÙØÙØØ ÙØØÙÙØ ØÙÙØØØØÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#, fuzzy
+msgid "Show _Maps"
+msgstr "ØØØ ÙÙØØÙØ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#, fuzzy
+msgid "Show maps in contact preview window"
+msgstr "ØØÙØ ÙØÙØØ ÙØØÙÙØ ØÙÙØØØØÙÙÙ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/calendar/e-memo-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/mail/e-mail-shell-view-actions.c:1472
 msgid "_Classic View"
 msgstr "ØØØ ØÙÙÙØÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 #, fuzzy
 msgid "Show contact preview below the contact list"
 msgstr "ØØÙØ ÙØØÙÙØ ØÙØØØÙØ ØØØ ÙØØÙØ ØÙØØØØÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:904
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "_Vertical View"
 msgstr "ØØØ ØØ_ØÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
 #, fuzzy
 msgid "Show contact preview alongside the contact list"
 msgstr "ØØÙØ ÙØÙØØ ÙØØÙÙØ ØÙÙØØØØÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1662
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Any Category"
 msgstr "ØÙÙ ÙØØ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1676
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Unmatched"
 msgstr "ØÙØ ÙØØØÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:966
-#: ../modules/mail/e-mail-shell-view-actions.c:1501
-#: ../shell/e-shell-content.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "ØØØ ÙØÙØÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 #, fuzzy
 msgid "Print all shown contacts"
 msgstr "ØØØØØ ØÙÙØØØØÙÙÙ ØÙÙÙØÙÙÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 #, fuzzy
 msgid "Preview the contacts to be printed"
 msgstr "ÙØØÙÙØ ØÙÙØØØØÙÙÙ ØÙØÙÙ ØÙÙØØØÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "Print selected contacts"
 msgstr "ØØØØØ ØÙÙØØØØÙÙÙ ØÙÙÙØÙÙÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+#, fuzzy
+msgid "S_ave Address Book as vCard"
+msgstr "ØØÙØ ØÙØØ ØÙØÙØÙÙÙ ØÙÙØØ VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#, fuzzy
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "ØØÙ_Ø ÙØØØØÙÙ ØÙÙØÙØ ØÙÙÙØÙÙ ÙÙÙÙØØØ"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "Ø_ØÙØ ÙÙ vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
 #, fuzzy
 msgid "Save selected contacts as a vCard"
 msgstr "ØØÙØ ØÙÙØØØØÙÙÙ ØÙÙÙØÙÙÙ ÙÙÙÙØØØ."
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Forward Contacts"
 msgstr "_ÙØÙØ ØÙÙØØØØÙÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contact"
 msgstr "_ÙØÙØ ØÙÙØØØØÙ"
 
-#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/addressbook/e-book-shell-view.c:382
 #, fuzzy
 msgid "_Send Message to Contacts"
 msgstr "ØØØÙÙ _ØØØÙØ ÙÙÙØØØØÙÙÙÙ"
 
-#: ../modules/addressbook/e-book-shell-view.c:380
+#: ../modules/addressbook/e-book-shell-view.c:384
 #, fuzzy
 msgid "_Send Message to List"
 msgstr "ØØØÙÙ _ØØØÙØ ÙÙÙØØÙØ"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:386
 #, fuzzy
 msgid "_Send Message to Contact"
 msgstr "ØØØÙÙ _ØØØÙØ ÙÙÙØØØØÙ"
 
-#: ../modules/addressbook/eab-composer-util.c:143
+#: ../modules/addressbook/eab-composer-util.c:149
 msgid "Multiple vCards"
 msgstr "vCards ØØÙØØ"
 
-#: ../modules/addressbook/eab-composer-util.c:151
+#: ../modules/addressbook/eab-composer-util.c:157
 #, c-format
 msgid "vCard for %s"
 msgstr "ØØØÙØ vCard ÙÙ%s"
 
-#: ../modules/addressbook/eab-composer-util.c:163
-#: ../modules/addressbook/eab-composer-util.c:190
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information"
 msgstr "ÙØÙÙÙØØ ØÙÙØØØØÙ"
 
-#: ../modules/addressbook/eab-composer-util.c:192
+#: ../modules/addressbook/eab-composer-util.c:198
 #, c-format
 msgid "Contact information for %s"
 msgstr "ÙØÙÙÙØØ ØÙÙØØØØÙ ÙÙ %s"
@@ -13917,18 +14033,52 @@ msgstr "ÙØØÙ ØÙ_ØØØ:"
 msgid "_Timeout:"
 msgstr "_ÙÙÙØ ØÙØØØØÙ:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "Ø_ØØØØÙ ØØØØÙ ØÙÙ:"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "ØØØÙØØ"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, fuzzy, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "ÙØÙ ØØØÙÙ ÙØØØØØ ØÙØØÙØ ØÙØØØØ: %s"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "ØÙØØØØ ÙØØØ Bogo"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "ØÙÙÙ ÙØ ØÙØØØÙØ ØÙÙ _ÙÙÙÙÙÙØ"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+#, fuzzy
+msgid "Bogofilter"
+msgstr "ØÙØØØØ ÙØØØ Bogo"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "ØÙÙÙ ØØØØÙ ØÙØØÙØ ØÙÙ ÙÙÙÙÙÙØ"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"ØÙÙÙ ÙØ ØÙØØØÙØ ØÙÙ ÙÙÙÙÙÙØ UTF-8 ÙØÙØÙØ ÙÙØØØØ ØÙØØÙØ ØÙÙØØØ ØÙÙØØÙ ÙÙ "
+"ÙØÙÙØØØ ØØÙÙØ ÙØØÙÙØ."
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, fuzzy, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "<i>%Iu Ù %d ØØØØØØÙ ØØÙÙØØØØÙ ÙØÙÙØØÙ ÙÙ ØÙÙØÙ ØÙØØÙØ ØÙØÙÙØØÙÙÙ.</i>"
+msgstr "%Iu Ù %d ØØØØØØÙ ØØÙÙØØØØÙ ÙØÙÙØØÙ ÙÙ ØÙÙØÙ ØÙØØÙØ ØÙØÙÙØØÙÙÙ."
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "(Shown in a Day View)"
@@ -13959,88 +14109,91 @@ msgstr "ØÙØØÙ"
 msgid "60 minutes"
 msgstr "ØÙØØÙ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 #, fuzzy
 msgid "Alerts"
 msgstr "ØÙÙÙØÙÙØØ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Day _ends:"
 msgstr "ØÙÙÙÙ _ÙÙØÙÙ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 #, fuzzy
 msgid "Days"
 msgstr "ØÙÙÙÙ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 #, fuzzy
 msgid "Default Free/Busy Server"
 msgstr "<span weight=\"bold\">ØØØÙÙ ÙØÙØÙØ/ÙØØÙÙ ØÙØÙØØØØÙ</span>"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Display"
 msgstr "ØÙØØØ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-#, fuzzy
-msgid "Display alarms in _notification area only"
-msgstr "ØØÙØ ØÙÙÙØÙØØ ØÙÙØØÙØ ÙÙ ÙØØØØ ØÙØØÙÙØ"
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display reminders in _notification area only"
+msgstr "ØØÙØ ØÙÙÙØÙØØ ÙÙ ÙØØØØ ØÙØ_ØÙÙØ ÙÙØ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 #, fuzzy
 msgid "Hours"
 msgstr "ØØØØ ÙØØØØ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
 #, fuzzy
 msgid "Minutes"
 msgstr "ØÙØØÙ"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#, fuzzy
+msgid "Publishing Information"
+msgstr "ÙÙÙØ ØÙÙØØ"
+
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "S_un"
 msgstr "ØÙØ_ØØ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 #, fuzzy
 msgid "Se_cond zone:"
 msgstr "ØØØÙ ØÙÙ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:30
-msgid "Select the calendars for alarm notification"
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "Select the calendars for reminder notification"
 msgstr "ØØØØ ØÙÙÙÙ ÙØØÙÙØØØ ØÙÙÙØÙÙ"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:32
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Sh_ow a reminder"
-msgstr "Ø_ØÙØ ØÙØÙØ ØØÙÙØ"
+msgstr "Ø_ØÙØ ØÙØÙÙÙØ"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
-#, fuzzy
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "Show a _reminder"
-msgstr "Ø_ØÙØ ØÙØÙØ ØØÙÙØ"
+msgstr "ØØÙØ Ø_ÙØÙÙÙØ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
 #, fuzzy
 msgid "Show week _numbers"
 msgstr "ØØÙØ ØØ_ÙØÙ ØÙØØØØÙØ ÙÙ ÙØØÙÙØ ØÙØÙÙØØÙØ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:38
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "T_asks due today:"
 msgstr "ØÙ_ÙÙØÙ ØÙÙØØØÙÙØ ØÙÙÙÙ:"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "T_hu"
 msgstr "_ØÙÙØ"
 
@@ -14068,7 +14221,7 @@ msgid "Wee_k starts on:"
 msgstr "ÙØØØ ØÙØØ_ØÙØ ÙÙ:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:52
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Work Week"
 msgstr "ØØØÙØ ØÙÙ"
 
@@ -14147,204 +14300,203 @@ msgstr ""
 msgid "before every appointment"
 msgstr "ÙØÙ ÙÙ ÙÙØØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "ØØØÙØ ØÙÙÙØÙÙ"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "ØØÙØ ØÙØÙØÙÙØ ØÙØ ØØÙ ØÙØÙØØØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "ÙÙÙ ØÙÙÙØÙ ØÙÙØØØÙÙØ ØÙÙÙÙØ ØØÙØÙÙ \"#rrggbb\"."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "ÙÙÙ ØÙÙÙØÙ ØÙØÙ ÙØØ ÙÙØØÙØØ ØØÙØÙÙ \"#rrggbb\"."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 #, fuzzy
 msgid "Birthday and anniversary reminder"
 msgstr "ØØÙØØ ØÙÙÙÙØØ ÙØÙØÙÙÙÙØØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 #, fuzzy
 msgid "Birthday and anniversary reminder units"
 msgstr "ØØÙØØ ØÙÙÙÙØØ ÙØÙØÙÙÙÙØØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 #, fuzzy
 msgid "Birthday and anniversary reminder value"
 msgstr "ØØÙØØ ØÙÙÙÙØØ ÙØÙØÙÙÙÙØØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#, fuzzy
+msgid "Calendars to run reminders for"
 msgstr "ØÙØÙÙÙÙØØ ØÙØÙ ØØØØÙ ØÙÙÙØÙÙØØ ÙÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 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
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "ÙÙÙÙ ØÙÙØÙ ØÙØØÙ ØÙ ØØ Marcus Bains ÙÙ ÙØÙØ ØÙÙÙÙ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "ØØØØ ÙÙØÙØØ ØÙØØØØÙØ ÙÙ ÙØÙØ ØÙØÙÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "ØÙÙØ ØÙØØØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "ØÙØÙØÙ ØÙØÙ ÙØØ ØÙ ØÙØÙØ ÙÙÙØ ØØØØØ ØØØ ÙÙÙØÙØ ØÙØÙÙ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "ÙØÙÙØ ØÙÙÙØÙØ ØÙØÙØØØØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "ÙØØØØ ØÙÙØÙÙÙØ ØÙØÙØØØØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "ÙÙÙØ ØÙÙØÙÙÙØ ØÙØÙØØØØÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#, fuzzy
+msgid "Directory for saving reminder audio files"
 msgstr "ØÙØÙÙÙ ØÙØÙ ØÙØÙÙØ ÙÙÙ ÙÙÙØØ ØØÙØØ ØÙÙÙØÙØØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "ØÙØÙÙÙ ØØØÙÙ ÙØÙØÙØØ/ÙØØÙÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "ØÙØÙÙÙ ÙØÙØ ÙØÙØÙØØ/ÙØØÙÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "ØØÙÙ ØÙÙÙØÙ ØÙÙÙØÙÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "ØØÙÙ ÙØØØØ ØÙÙÙØÙ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "ØØÙÙ ÙÙÙØ ØÙÙÙÙÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "ÙÙÙØ ØÙÙÙØ ØÙØÙÙÙ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "ØÙØØØØ ØÙØÙ ÙÙØÙÙ ØÙØÙØ ÙÙÙ ØÙØÙÙØ ØØÙØÙÙ ØØØØ ÙØØØÙÙ ØØØØØ 0 ØÙÙ 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "ØÙØØØØ ØÙØÙ ÙØØØ ØÙØÙØ ÙÙÙ ØÙØÙÙØ ØØÙØÙÙ ØØØØ ÙØØØÙÙ ØØØØØ 0 ØÙÙ 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "ØÙÙØØ ØÙØÙÙÙØ ØÙÙØØÙØØ ÙÙ ÙØØÙØ ÙÙÙ ÙØØØÙØ ØÙØÙÙØ ØØÙØÙØØÙ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#, fuzzy
+msgid "Last reminder time"
 msgstr "ÙÙØ ØØØ ÙÙØÙÙ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "ÙØØÙØ ØØÙØÙÙÙ ØÙØÙØØÙÙ ÙÙÙØØ ØÙÙØÙØÙØ/ØÙÙØØÙÙ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "ØØ Marcus Bains"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "ÙÙÙ ØØ Marcus Bains - ÙØÙØ ØÙÙÙÙ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "ÙÙÙ ØØ Marcus Bains - ØØÙØ ØÙÙÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 #, fuzzy
 msgid "Memo layout style"
 msgstr "ØØÙÙØ ØÙ_ØØ:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 #, fuzzy
 msgid "Memo preview pane position (vertical)"
 msgstr "ÙÙØØ ØÙÙÙØ ØÙØØØÙ ÙÙ ÙØÙØ ØÙØÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "ØÙØÙÙÙØ ØÙØÙ ÙÙØÙÙ ØÙØÙØ ÙÙÙ ØÙØÙÙØ 0 ØÙÙ 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "ØÙØÙÙÙØ ØÙØÙ ÙØØØ ØÙØÙØ ÙÙÙ ØÙØÙÙØ 0 ØÙÙ 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "ÙÙØØ ØÙÙÙØ ØÙØÙÙÙ ÙÙ ÙØÙØ ØÙØÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "ÙÙØØ ØÙÙÙØ ØÙØØØÙ ÙÙ ÙØÙØ ØÙØÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 #, fuzzy
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr "ØØØ ØÙÙØØØØ ÙØØØÙØ ØÙØÙØ ØÙØÙØÙÙØ ØÙØÙØØØØÙÙØ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "ØØØ ØÙÙØØØØ ÙØØØÙØ ØÙØÙØ ØÙØÙØÙÙØ ØÙØÙØØØØÙÙØ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "ØØØ ØÙÙØØØØ ØÙØÙ ØØØÙØ ÙØÙ ØÙØÙÙ ØÙÙÙØÙ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "ÙÙÙ ØÙÙÙØÙ ÙØØØØ ØÙÙÙØÙØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -14352,7 +14504,7 @@ msgstr ""
 "ÙÙØÙØ ØÙÙÙØ ØÙØÙÙÙØ ØÙÙ ÙØØØØØ ØÙØÙÙÙÙ Ù ÙØØÙØ ØÙÙÙØÙ ØÙØÙØ ÙØ ÙÙÙÙ ÙÙ ÙØÙØ "
 "ØÙØÙØØ ØØÙØÙØÙ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14360,25 +14512,25 @@ msgstr ""
 "ÙÙØÙØ ØÙÙÙØ ØÙØÙÙÙØ ØÙÙ ØÙÙÙÙ ÙØØÙÙØ ØÙØØØÙØ ÙØÙÙØÙØ Ù ÙØØÙØ ØÙÙÙØÙ ÙÙ ÙØÙØ "
 "ØÙØÙØØ ØØÙØÙØÙ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 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
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14386,7 +14538,7 @@ msgstr ""
 "ÙÙØÙØ ØÙÙÙØ ØÙØØØÙØ ØÙÙ  ØÙÙØÙØ ÙØÙÙÙÙ ÙØØÙØ ØÙØØØÙØ Ù ÙØØÙØ ØÙÙÙØÙ ÙÙ ÙØÙØ "
 "ØÙØÙØØ ØØÙØÙØÙÙ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../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 when not in the month view, in pixels."
@@ -14394,36 +14546,43 @@ msgstr ""
 "ÙÙÙØ ØÙÙÙØ ØÙØØØÙØ ØÙÙ ØÙØØØ ÙÙÙØØ ØÙØØÙØ ØÙØÙÙÙÙ ÙÙØØÙØ ØÙÙÙØÙ ØÙØÙØ ÙØ "
 "ØÙÙÙ ÙÙ ØØÙÙØ ØØØ ØÙØÙØØ ØØÙØÙÙØÙ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 #, fuzzy
 msgid "Primary calendar"
 msgstr "ØØØØØ ÙØÙ ØÙØÙÙÙÙ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 #, fuzzy
 msgid "Primary memo list"
 msgstr "ÙØØÙØ ØØÙÙØØØ ØØÙØØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 #, fuzzy
 msgid "Primary task list"
 msgstr "ÙØØÙØ ÙÙØÙ ØØÙØØ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#, fuzzy
+msgid "Programs that are allowed to be run by reminders."
 msgstr "ØÙØØØÙØ ØÙØÙ ÙØÙØ ÙÙÙÙØÙØØ ØØØØÙÙÙØ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 #, fuzzy
 msgid "Recurrent Events in Italic"
 msgstr "ØØØÙØ ØÙØÙÙØØØ ØÙØ ØØÙØ"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#, fuzzy
+msgid "Reminder programs"
+msgstr "ÙÙØØØØØ ØØÙÙØÙØ"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
+#, fuzzy
+msgid "Save directory for reminder audio"
 msgstr "ØÙÙÙ ØÙØÙØ ÙØØÙØØ ØÙÙÙØÙØØ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
@@ -14451,7 +14610,7 @@ msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
+msgid "Show display reminders in notification tray"
 msgstr "ØØÙØ ØÙÙÙØÙØØ ØÙÙØØÙØ ÙÙ ÙØØØØ ØÙØØÙÙØ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
@@ -14571,7 +14730,8 @@ msgid "Time divisions"
 msgstr "ØØØØØ ØÙÙÙØ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
+#, fuzzy
+msgid "Time the last reminder ran, in time_t."
 msgstr "ÙÙØ ØØÙØÙ ØØØ ÙÙØÙÙØ ØÙÙØ _t."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
@@ -14621,7 +14781,8 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "ØÙÙÙÙ ØÙØÙ ÙØØØ ÙÙÙ ØÙØØØÙØØ ÙÙ ØÙØØØ (0) ØØÙ ØÙØØØ (6)."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
+#, fuzzy
+msgid "Whether or not to use the notification tray for display reminders."
 msgstr "ÙØ ØÙ ÙÙØ ØØÙØ ØØØØØØÙ ÙØØØØ ØÙØØÙÙØ ÙØØÙØØ ØÙÙÙØÙØØ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
@@ -14721,122 +14882,136 @@ msgstr "ØØØØ ØØØ ÙÙÙ ØÙØÙÙ"
 msgid "Workday start minute"
 msgstr "ØÙÙÙØ ØØØ ÙÙÙ ØÙØÙÙ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:267
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
 #, fuzzy
 msgid "I_mport"
 msgstr "ØØØÙØØØ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:348
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 #, fuzzy
 msgid "Select a Calendar"
 msgstr "ØÙØÙØØ ØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:375
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 #, fuzzy
 msgid "Select a Task List"
 msgstr "ØÙØÙØØ ÙØØÙØ ÙÙØÙ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 #, fuzzy
 msgid "I_mport to Calendar"
 msgstr "ØØØÙØØØ ØÙÙ ØÙØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:392
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 #, fuzzy
 msgid "I_mport to Tasks"
 msgstr "Ø_ØØÙØØØ ØÙÙ ØÙÙÙØÙ"
 
+#: ../modules/calendar/e-calendar-preferences.c:461
+#, fuzzy
+msgid "Selected Calendars for Reminders"
+msgstr "ØÙØÙÙÙÙØØ ØÙÙØØØØØ ÙÙÙÙØÙÙØØ"
+
+#: ../modules/calendar/e-calendar-preferences.c:863
+#, fuzzy
+msgid "Ti_me and date:"
+msgstr "ØÙÙÙØ Ù ØÙØÙØØÙØ:"
+
+#: ../modules/calendar/e-calendar-preferences.c:864
+#, fuzzy
+msgid "_Date only:"
+msgstr "ØÙØÙØØÙØ ÙÙØ:"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:107
-#: ../modules/calendar/e-cal-shell-migrate.c:194
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:160
+#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "ØÙÙ ØÙÙÙØ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:109
-#: ../plugins/calendar-weather/calendar-weather.c:121
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:127
 msgid "Weather"
 msgstr "ØÙØÙØ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:196
-#: ../modules/calendar/e-cal-shell-migrate.c:62
+#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "ØØÙØØ ØÙÙÙÙØØ ÙØÙØÙÙÙÙØØ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:421
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_ÙÙØØ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "ØÙØØ ÙÙØØ ØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:428
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ÙÙØØ ÙØØØØÙ ØÙÙ ØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "ØÙØØ ÙÙØØ ØØÙØ ÙØØØØÙ ÙÙÙÙØ ØÙØÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:435
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ØØ_ØÙØØ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "ØÙØØ ØÙØ ØØØÙØØ ØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Ø_ÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "ØÙØØ ØÙÙÙÙÙØ ØØÙØÙØ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:750
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "ØÙØÙÙÙÙ Ù ØÙÙÙØÙ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:221
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 #, fuzzy
 msgid "Loading calendars"
 msgstr "ÙØØÙ ØØÙÙÙ ØÙØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:636
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 #, fuzzy
 msgid "_New Calendar..."
 msgstr "Ø_ÙÙÙÙ ØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:653
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 #, fuzzy
 msgid "Calendar Selector"
 msgstr "ÙÙØÙÙ ÙØØØ ØÙØÙÙÙÙ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:998
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "ÙØØ ØÙØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
 msgid "Print"
 msgstr "ØØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:306
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 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 "
@@ -14847,334 +15022,334 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "ÙØÙÙ ØÙØØØØØ ØÙØÙØÙ ÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 #, fuzzy
 msgid "Copying Items"
 msgstr "ÙØØ ØÙØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 #, fuzzy
 msgid "Moving Items"
 msgstr "ÙÙÙ ØÙØÙØØØ"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1131
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 #, fuzzy
 msgid "event"
 msgstr "ØØØÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1133
-#: ../modules/calendar/e-cal-shell-view-memopad.c:216
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:510
-#: ../modules/calendar/e-task-shell-view-actions.c:627
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../modules/calendar/e-cal-shell-view-memopad.c:220
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "Save as iCalendar"
-msgstr "_ÙØÙØ ÙÙiCalendar..."
+msgstr "ØØÙØ Ùâ iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1290
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Copy..."
 msgstr "Ø_ÙØØ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 #, fuzzy
 msgid "D_elete Calendar"
 msgstr "ØÙØÙØØ ØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 #, fuzzy
 msgid "Delete the selected calendar"
 msgstr "ØØÙØ ØØÙÙØ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
 #, fuzzy
 msgid "Go Back"
 msgstr "ØØØØÙØ ØÙÙ ØÙØÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Go Forward"
-msgstr "ØÙØÙÙÙ ØÙÙ ØÙØÙØÙ"
+msgstr "ØÙØÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Select today"
 msgstr "ØÙØÙØØ ÙØØ ØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Select _Date"
 msgstr "ØÙØÙØØ _ØØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Select a specific date"
 msgstr "ØÙØÙØØ ØØØÙØ ÙØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "_New Calendar"
 msgstr "Ø_ÙÙÙÙ ØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:814
 msgid "Purg_e"
 msgstr "ØÙØ_ÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Purge old appointments and meetings"
 msgstr "ØÙØÙÙ ØÙÙÙØØÙØ Ù ØÙØØØÙØØØØ ØÙÙØÙÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1353
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Re_fresh"
 msgstr "ØØÙØ ØÙØ_ØÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 #, fuzzy
 msgid "Refresh the selected calendar"
 msgstr "ØØÙØ ØØÙÙØ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 #, fuzzy
 msgid "Rename the selected calendar"
 msgstr "ØØÙØ ØØÙÙØ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 #, fuzzy
 msgid "Show _Only This Calendar"
 msgstr "ÙØ ØØØØ _ØÙÙ ÙØØ ØÙØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Cop_y to Calendar..."
 msgstr "Ø_ÙØØ ØÙÙ ØÙØÙÙÙÙ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "_Delegate Meeting..."
 msgstr "_ÙÙÙØ ØØØÙØØ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 #, fuzzy
 msgid "_Delete Appointment"
 msgstr "ØØÙ ÙØØ ØÙÙÙØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 #, fuzzy
 msgid "Delete selected appointments"
 msgstr "ØØÙ ÙØØ ØÙÙÙØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
 #, fuzzy
 msgid "Delete This _Occurrence"
 msgstr "ØØØÙ ÙØØ ØÙ_ØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Delete this occurrence"
 msgstr "ØØÙ ÙØØ ØÙØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 #, fuzzy
 msgid "Delete All Occ_urrences"
 msgstr "ØØØÙ _ÙÙ ØÙØØÙØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Delete all occurrences"
 msgstr "ØØØÙ ÙÙ ØÙØØÙØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 #, fuzzy
 msgid "New All Day _Event..."
 msgstr "_ØØØ ØØÙØ ÙØØØØÙ ÙÙÙÙØ ØØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 #, fuzzy
 msgid "Create a new all day event"
 msgstr "ØÙØØ ÙÙØØ ØØÙØ ÙØØØØÙ ÙÙÙÙØ ØÙØÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_Forward as iCalendar..."
 msgstr "_ÙØÙØ ÙÙiCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 #, fuzzy
 msgid "New _Meeting..."
 msgstr "Ø_ØØÙØØ ØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 #, fuzzy
 msgid "Create a new meeting"
 msgstr "ØÙØØ ØÙØ ØØØÙØØ ØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Mo_ve to Calendar..."
 msgstr "Ø_ÙÙÙ ØÙÙ ØÙØÙÙÙÙ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "New _Appointment..."
 msgstr "_ÙÙØØ ØØÙØ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "Make this Occurrence _Movable"
 msgstr "ØØØÙ ÙØØ ØÙØØÙØ _ÙØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Open Appointment"
 msgstr "ØÙØ_Ø ÙÙØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "View the current appointment"
 msgstr "ØØØØ ØÙÙÙØØ ØÙØØÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1458
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "_Reply"
 msgstr "_ØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#, fuzzy
-msgid "Save as iCalendar..."
-msgstr "_ÙØÙØ ÙÙiCalendar..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "_Schedule Meeting..."
 msgstr "_ØØÙÙÙ ØÙØØØÙØØ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 #, fuzzy
 msgid "Converts an appointment to a meeting"
 msgstr "ØÙØÙÙ ØÙÙÙØØÙØ Ù ØÙØØØÙØØØØ ØÙÙØÙÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 #, fuzzy
 msgid "Conv_ert to Appointment..."
 msgstr "_ÙÙØØ ØØÙØ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 #, fuzzy
 msgid "Converts a meeting to an appointment"
 msgstr "%s ØÙØ ØÙØÙØØ ØÙÙÙØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 #, fuzzy
 msgid "Quit"
 msgstr "Ø_ÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Day"
 msgstr "ØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one day"
 msgstr "ØØÙØ ÙÙÙ ÙØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "List"
 msgstr "ÙØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show as list"
 msgstr "ØØØ ÙÙØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
 msgid "Month"
 msgstr "ØÙØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Show one month"
 msgstr "ØØÙØ ØÙØ ÙØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
 msgid "Week"
 msgstr "ØÙØØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
 msgid "Show one week"
 msgstr "ØØÙØ ØØØÙØ ÙØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
 #, fuzzy
 msgid "Show one work week"
 msgstr "ØØÙØ ØØØÙØ ÙØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Active Appointments"
 msgstr "ØÙÙÙØØÙØ ØÙÙØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Next 7 Days' Appointments"
 msgstr "ÙÙØØÙØ ØÙØÙØÙ ØÙØØØØ ØÙÙØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1700
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:995
 msgid "Description contains"
 msgstr "ØÙÙØÙ ÙØØÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1707
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-memo-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:1002
 msgid "Summary contains"
 msgstr "ØÙÙÙØÙØ ÙØØÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
 msgid "Print this calendar"
 msgstr "ØØØØØ ÙØÙ ØÙØÙÙÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 #, fuzzy
 msgid "Preview the calendar to be printed"
 msgstr "ÙØØÙÙØ ØÙØÙÙÙÙ ØÙØÙ ØØØØØ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
+msgid "_Save as iCalendar..."
+msgstr "Ø_ØÙØ Ùâ iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1859
 msgid "Go To"
 msgstr "ØØÙØ ØÙÙ"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:214
-#: ../modules/calendar/e-memo-shell-view-actions.c:508
+#: ../modules/calendar/e-cal-shell-view-memopad.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:523
 #, fuzzy
 msgid "memo"
 msgstr "ØØÙÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-memopad.c:261
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
 #, fuzzy
 msgid "New _Memo"
 msgstr "ØØÙÙØ ØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "Create a new memo"
 msgstr "ØÙØØ ØØÙÙØ ØØÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-memopad.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:662
 msgid "_Open Memo"
 msgstr "Ø_ÙØØ ØØÙÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:266
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:270
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "View the selected memo"
 msgstr "ØØØØ ØÙØØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:807
 msgid "Open _Web Page"
 msgstr "ØÙØØ _ØÙØØ ØÙÙÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:290
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-cal-shell-view-memopad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
 #, fuzzy
 msgid "Print the selected memo"
 msgstr "ØØØØ ØÙØØÙÙØ ØÙÙÙØÙÙ"
@@ -15183,207 +15358,196 @@ msgstr "ØØØØ ØÙØØÙÙØ ØÙÙÙØÙÙ"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
-#: ../modules/calendar/e-task-shell-view-actions.c:625
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:285
+#: ../modules/calendar/e-task-shell-view-actions.c:640
 #, fuzzy
 msgid "task"
 msgstr "ÙÙÙÙÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:320
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Assign Task"
 msgstr "_ÙÙÙÙ ØØÙÙÙÙÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Mark as Complete"
 msgstr "_ØÙÙÙ ÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:336
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Mark selected tasks as complete"
 msgstr "ØÙÙÙ ØÙÙÙØÙ ØÙÙÙØÙØØ ÙÙÙØÙÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:341
 msgid "_Mark as Incomplete"
 msgstr "_ØÙÙÙ ÙØÙØ ÙÙØÙÙ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:343
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 #, fuzzy
 msgid "Mark selected tasks as incomplete"
 msgstr "ØÙÙÙ ØÙÙÙØÙ ØÙÙÙØÙØØ ÙÙÙØÙÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "New _Task"
 msgstr "_ÙÙÙÙØ ØØÙØØ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:282
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:350
+#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Create a new task"
 msgstr "ØÙØØ ÙÙÙÙØÙ ØØÙØØ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
+#: ../modules/calendar/e-task-shell-view-actions.c:800
 msgid "_Open Task"
 msgstr "ØÙØ_Ø ÙÙÙÙÙØ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:357
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "View the selected task"
 msgstr "ØØØØ ØÙÙÙÙØ ØÙÙÙÙØÙØÙ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
 #: ../modules/calendar/e-task-shell-view-actions.c:1028
 #, fuzzy
-msgid "_Save as iCalendar..."
-msgstr "_ÙØÙØ ÙÙiCalendar..."
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
-#, fuzzy
 msgid "Print the selected task"
 msgstr "ØØØØ ØÙÙÙÙØ ØÙÙÙÙØÙØÙ"
 
-#: ../modules/calendar/e-calendar-preferences.c:437
-msgid "Selected Calendars for Alarms"
-msgstr "ØÙØÙÙÙÙØØ ØÙÙØØØØØ ÙÙÙÙØÙÙØØ"
-
-#: ../modules/calendar/e-calendar-preferences.c:836
-#, fuzzy
-msgid "Ti_me and date:"
-msgstr "ØÙÙÙØ Ù ØÙØÙØØÙØ:"
-
-#: ../modules/calendar/e-calendar-preferences.c:837
-#, fuzzy
-msgid "_Date only:"
-msgstr "ØÙØÙØØÙØ ÙÙØ:"
-
-#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-backend.c:298
 #, fuzzy
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ØØÙÙØ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:288
+#: ../modules/calendar/e-memo-shell-backend.c:305
 #, fuzzy
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "ØØÙÙØ ØØÙØ ÙÙØØØÙÙ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:290
+#: ../modules/calendar/e-memo-shell-backend.c:307
 #, fuzzy
 msgid "Create a new shared memo"
 msgstr "ØÙØØ ØØÙÙØ ÙÙØØØÙÙ ØØÙØ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-backend.c:315
 #, fuzzy
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ÙØØÙØ ØÙØØÙÙØØØ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Create a new memo list"
 msgstr "ØÙØØ ÙØØÙØ ØØÙÙØØØ ØØÙØØ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:216
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
 msgstr "ØØÙÙÙ ØÙØØÙÙØØØ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:578
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 #, fuzzy
 msgid "Memo List Selector"
 msgstr "ÙÙØÙÙ ÙØØØ ØÙØØÙÙØØØ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:885
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
 msgstr "ÙØØ ØÙØØÙÙØØØ ØÙØ %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "ØØØØ ØÙØØÙÙØØØ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 #, fuzzy
 msgid "_Delete Memo"
 msgstr "ØØ_ØÙ ØÙØØØÙØ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 #, fuzzy
 msgid "_Find in Memo..."
 msgstr "ØÙ_ØØ ÙÙ ØÙØØØÙØ..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 #, fuzzy
 msgid "Search for text in the displayed memo"
 msgstr "ØØØ ØÙ ØÙÙÙØ ÙÙ ØÙØØØÙØ ØÙÙØØÙØØ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
 #, fuzzy
 msgid "D_elete Memo List"
 msgstr "ØØ_ØÙ ØÙØØØÙØ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 #, fuzzy
 msgid "Delete the selected memo list"
 msgstr "ØØÙØ ØØÙÙØ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
 msgid "_New Memo List"
 msgstr "ÙØØÙØ ØØÙÙØØØ _ØØÙØØ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 #, fuzzy
 msgid "Refresh the selected memo list"
 msgstr "ØØÙØ ØØÙÙØ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 #, fuzzy
 msgid "Rename the selected memo list"
 msgstr "ØØÙØ ØØÙÙØ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
 #, fuzzy
 msgid "Show _Only This Memo List"
 msgstr "ØØÙØ ÙØØÙØ ØÙØØÙÙØ ÙØÙ ÙÙØ ÙØ ØÙØ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:712
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
 #, fuzzy
 msgid "Memo _Preview"
 msgstr "_ÙØØÙÙØ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 #, fuzzy
 msgid "Show memo preview pane"
 msgstr "ØØÙØ ÙÙØ ØÙÙØØÙÙØ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 #, fuzzy
 msgid "Show memo preview below the memo list"
 msgstr "ØØÙØ ÙØØÙÙØ ØÙØØØÙØ ØØØ ÙØØÙØ ØÙØØØØÙ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
 #, fuzzy
 msgid "Show memo preview alongside the memo list"
 msgstr "ØØÙØ ÙØØÙÙØ ØÙØØØÙØ ØØØ ÙØØÙØ ØÙØØØØÙ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the list of memos"
 msgstr "ØØØØ ÙØØÙØ ØÙØØÙÙØØØ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:807
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
 #, fuzzy
 msgid "Preview the list of memos to be printed"
 msgstr "ÙØØÙÙØ ÙØØÙØ ØÙØØÙÙØØØ ØÙØÙ ØØØÙ ØØØØØÙØ"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-memo-shell-view.c:227
+#, fuzzy
+msgid "Delete Memos"
+msgstr "ØØ_ØÙ ØÙØØØÙØ"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+#, fuzzy
+msgid "Delete Memo"
+msgstr "ÙÙØÙØ ØÙ"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
 #, fuzzy, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -15391,71 +15555,63 @@ msgstr[0] "ØØÙÙØØ ÙØØØØ"
 msgstr[1] "ØØÙÙØØÙÙ"
 msgstr[2] "%d ØØÙÙØØØ"
 msgstr[3] "%d ØØÙÙØØ"
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
-#: ../modules/calendar/e-task-shell-view-private.c:575
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Ø ÙØØØ ÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-memo-shell-view.c:223
-#, fuzzy
-msgid "Delete Memos"
-msgstr "ØØ_ØÙ ØÙØØØÙØ"
-
-#: ../modules/calendar/e-memo-shell-view.c:225
-#, fuzzy
-msgid "Delete Memo"
-msgstr "ÙÙØÙØ ØÙ"
-
-#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-backend.c:297
 #, fuzzy
 msgctxt "New"
 msgid "_Task"
 msgstr "_ÙÙÙÙØ"
 
-#: ../modules/calendar/e-task-shell-backend.c:287
+#: ../modules/calendar/e-task-shell-backend.c:304
 #, fuzzy
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "_ÙÙÙÙ ØØÙÙÙÙÙØ"
 
-#: ../modules/calendar/e-task-shell-backend.c:289
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
 msgstr "ØÙØØ ÙÙÙÙØ ÙÙØÙØØ ØØÙØØ"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-backend.c:314
 #, fuzzy
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "ÙØØÙØ ÙÙØÙ"
 
-#: ../modules/calendar/e-task-shell-backend.c:299
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Create a new task list"
 msgstr "ØÙØØ ÙØØÙØ ÙÙØÙ ØØÙØØ"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:216
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
 msgstr "ØØÙÙÙ ØÙÙÙØÙ"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:578
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 #, fuzzy
 msgid "Task List Selector"
 msgstr "ÙÙØÙÙ ÙØØØ ØÙÙÙØÙ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:885
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "ÙØØ ØÙÙÙØÙ ØÙØ %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "ØØØØ ØÙÙÙØÙ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:569
+#: ../modules/calendar/e-task-shell-view-actions.c:584
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15467,117 +15623,131 @@ msgstr ""
 "\n"
 "ØØØØØ ÙØÙÙØ ÙÙ ØØÙ ÙØÙ ØÙÙÙØÙØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:591
+msgid "Do not ask me again"
+msgstr "ÙØ ØØØÙÙÙ ÙØØ ØØØÙ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 #, fuzzy
 msgid "_Delete Task"
 msgstr "Ø_ØØÙ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 #, fuzzy
 msgid "_Find in Task..."
 msgstr "ØÙ_ØØ ÙÙ ØÙØØØÙØ..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 #, fuzzy
 msgid "Search for text in the displayed task"
 msgstr "ØØØ ØÙ ØÙÙÙØ ÙÙ ØÙØØØÙØ ØÙÙØØÙØØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 #, fuzzy
 msgid "Copy..."
 msgstr "Ø_ÙØØ..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 #, fuzzy
 msgid "D_elete Task List"
 msgstr "ØÙÙÙÙØØ ØÙÙÙØÙØØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 #, fuzzy
 msgid "Delete the selected task list"
 msgstr "ØØÙØ ØØÙÙØ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:744
 msgid "_New Task List"
 msgstr "ÙØØÙØ ÙÙØÙ _ØØÙØØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 #, fuzzy
 msgid "Refresh the selected task list"
 msgstr "ØØÙØ ØØÙÙØ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 #, fuzzy
 msgid "Rename the selected task list"
 msgstr "ØØÙØ ØØÙÙØ ØÙÙØÙÙØ ØÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 #, fuzzy
 msgid "Show _Only This Task List"
 msgstr "ÙØ ØØØØ _ØÙÙ ÙØØÙØ ØÙÙÙØÙ ÙØÙ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 #, fuzzy
 msgid "Mar_k as Incomplete"
 msgstr "_ØÙÙÙ ÙØÙØ ÙÙØÙÙ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Delete completed tasks"
 msgstr "ØØØÙ ØÙÙÙØÙ ØÙÙÙØÙÙØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:876
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Task _Preview"
 msgstr "ÙØØÙÙ_Ø ØÙÙÙÙÙÙØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:878
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 #, fuzzy
 msgid "Show task preview pane"
 msgstr "ØØÙØ ÙÙØ ØÙÙØØÙÙØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 #, fuzzy
 msgid "Show task preview below the task list"
 msgstr "ØØÙØ ÙØØÙÙØ ØÙØØØÙØ ØØØ ÙØØÙØ ØÙØØØØÙ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:906
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 #, fuzzy
 msgid "Show task preview alongside the task list"
 msgstr "ØØÙØ ÙØØÙÙØ ØÙØØØÙØ ØØØ ÙØØÙØ ØÙØØØØÙ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Active Tasks"
 msgstr "ØÙÙÙÙØØ ØÙÙØØØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Completed Tasks"
 msgstr "ØÙÙÙÙØØ ØÙÙÙØÙØØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Next 7 Days' Tasks"
 msgstr "ÙÙÙØØ ØÙØÙØÙ ØÙØØØØ ØÙÙØØÙØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Overdue Tasks"
 msgstr "ØÙÙÙÙØØ ØÙÙØØØØØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Tasks with Attachments"
 msgstr "ØÙÙÙÙØØ ØØØ ØÙÙØÙÙØØ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Print the list of tasks"
 msgstr "ØØØØ ÙØØÙØ ØØÙÙÙØÙ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/calendar/e-task-shell-view-actions.c:1021
 #, fuzzy
 msgid "Preview the list of tasks to be printed"
 msgstr "ØØÙÙÙ ÙØØÙØ ØÙÙÙØÙ ØÙØÙ ØØØØØ"
 
-#: ../modules/calendar/e-task-shell-view-private.c:468
+#: ../modules/calendar/e-task-shell-view.c:362
+#, fuzzy
+msgid "Delete Tasks"
+msgstr "ØÙÙÙÙØØ ØÙÙÙØÙØØ"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+#, fuzzy
+msgid "Delete Task"
+msgstr "ÙÙØÙØ ØÙ"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "ÙØØÙ ØÙØØØ"
 
-#: ../modules/calendar/e-task-shell-view-private.c:571
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15585,387 +15755,389 @@ msgstr[0] "ÙÙÙÙØ ÙØØØØ"
 msgstr[1] "ÙÙÙÙØÙÙ"
 msgstr[2] "%d ÙÙÙÙØØ"
 msgstr[3] "%d ÙÙÙÙØ"
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../modules/calendar/e-task-shell-view.c:358
-#, fuzzy
-msgid "Delete Tasks"
-msgstr "ØÙÙÙÙØØ ØÙÙÙØÙØØ"
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "ÙØØØØ ØØØØØØ ØÙÙÙÙÙÙØÙÙ"
 
-#: ../modules/calendar/e-task-shell-view.c:360
-#, fuzzy
-msgid "Delete Task"
-msgstr "ÙÙØÙØ ØÙ"
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "ÙØØÙØ ØÙØØØØØØ"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:382
+#: ../modules/mail/e-mail-attachment-handler.c:384
 #, fuzzy, c-format
 msgid "%d attached messages"
 msgstr "ØØØÙØ ÙØØØØ ÙØÙÙØ"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
-#, fuzzy
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "ÙØ ØÙØ"
-
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:195
 #, fuzzy
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ØØØÙØ ØØÙØÙÙØ ØØÙØØ"
 
-#: ../modules/mail/e-mail-shell-backend.c:185
+#: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
 msgstr "ØØÙÙÙ ØØØÙØ ØØÙØÙÙØ ØØÙØØ"
 
-#: ../modules/mail/e-mail-shell-backend.c:193
+#: ../modules/mail/e-mail-shell-backend.c:205
 #, fuzzy
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ÙØÙØ ØØÙØ ØØÙØ"
 
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
 msgstr "ØÙØØ ÙØÙØ ØØÙØ ØØÙØ"
 
-#: ../modules/mail/e-mail-shell-backend.c:494
+#: ../modules/mail/e-mail-shell-backend.c:412
 msgid "Mail Accounts"
 msgstr "ØØØØØØ ØÙØØÙØ"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:420
 msgid "Mail Preferences"
 msgstr "ØÙØÙÙØØ ØÙØØÙØ"
 
-#: ../modules/mail/e-mail-shell-backend.c:510
+#: ../modules/mail/e-mail-shell-backend.c:428
 msgid "Composer Preferences"
 msgstr "ØÙØÙÙØØ ØÙÙØÙÙÙ"
 
-#: ../modules/mail/e-mail-shell-backend.c:518
+#: ../modules/mail/e-mail-shell-backend.c:436
 msgid "Network Preferences"
 msgstr "ØÙØÙÙØØ ØÙØØÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
-#: ../modules/mail/e-mail-shell-view.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view.c:960
 #, fuzzy
 msgid "_Disable Account"
 msgstr "ØØÙÙ ØÙØØØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 #, fuzzy
 msgid "Disable this account"
 msgstr "ØØÙÙ ØÙØØØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Permanently remove all the deleted messages from all folders"
-msgstr "ØØØÙØ ØÙÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ ÙÙ ÙÙ ØÙÙØÙÙØØØ ÙÙØØÙÙÙØ"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1078
-msgid "C_reate Search Folder From Search..."
-msgstr "ØÙ_ØØ ÙØÙÙØ ØØØ ÙÙ ØÙØØØ..."
+msgstr "ØØÙ ØÙÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ ÙÙ ÙÙ ØÙÙØÙÙØØØ ÙÙØØÙÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1085
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Download Messages for Offline Usage"
 msgstr "_ØÙØÙÙ ØÙØØØØÙ ÙÙØØØØÙØ ØØÙÙ ØØØØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 #, fuzzy
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ÙØÙÙ ØØØØÙ ØÙØØØØØØ/ØÙÙØÙØØØ ØÙÙØÙÙÙ ØÙÙÙØ ØÙÙØ ØØÙÙ ØØØØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1092
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Fl_ush Outbox"
 msgstr "ØÙ_ØØ ØÙØÙÙ ØÙØØØÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "_Copy Folder To..."
 msgstr "ÙØØ ÙØÙÙØ ØÙÙ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Copy the selected folder into another folder"
 msgstr "ÙØØ ØÙÙØÙØ ØÙÙÙÙØÙÙ ØÙÙ ØØØÙ ÙØÙØ ØØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1108
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Permanently remove this folder"
 msgstr "ØØÙ ÙØØ ØÙÙØÙØ ÙÙØØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1113
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "E_xpunge"
 msgstr "_ØØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ØØØÙØ ØÙÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ ÙÙ ÙØØ ØÙÙØÙÙØ ÙÙØØÙÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1120
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Mar_k All Messages as Read"
 msgstr "Ø_ÙÙ ÙÙ ØÙØØØØÙ ÙÙÙØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Mark all messages in the folder as read"
 msgstr "ØÙÙÙÙ ÙÙ ØÙØØØØÙ ÙÙ ÙØØ ØÙÙØÙØ ÙÙÙØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "_Move Folder To..."
 msgstr "ÙÙÙ ÙØÙÙØ ØÙÙ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Move the selected folder into another folder"
 msgstr "ÙÙÙ ØÙÙØÙØ ØÙÙÙÙØÙÙ ØÙÙ ÙØÙØ ØØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1134
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "_New..."
 msgstr "_ØØÙØ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "Create a new folder for storing mail"
 msgstr "ØÙØØ ÙØÙØÙØ ØØÙØÙØ ÙØØØÙÙ ØÙØØÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Change the properties of this folder"
 msgstr "ØØÙÙØ ØÙØØ ÙØØ ØÙÙØÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1150
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Refresh the folder"
 msgstr "ØØÙØ ØÙÙØÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Change the name of this folder"
 msgstr "ØØÙÙØ ØØÙ ÙØØ ØÙÙØÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Select Message _Thread"
 msgstr "ØÙØÙ ØÙ_Ø ØÙØØØÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Select all messages in the same thread as the selected message"
 msgstr "ØÙØÙØØ ØÙÙØ ØÙØÙØØØÙ ÙÙ ÙÙØ ØØØØ ØÙØÙØØÙØ ØÙÙÙØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select Message S_ubthread"
 msgstr "ØÙØÙ ØÙ_Ø ØÙØØØÙØ ØÙÙØØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Select all replies to the currently selected message"
 msgstr "ØÙØÙ ØÙÙØ ØÙØØÙØ ØÙÙ ØÙØÙØØÙØ ØÙÙÙØÙØØ ØØÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1183
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Empty _Trash"
 msgstr "ØÙØØØ _ØÙÙØ ØÙÙÙÙÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "Permanently remove all the deleted messages from all accounts"
-msgstr "ØØØÙØ ØÙÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ ÙÙ ÙÙ ØÙÙØÙÙØØØ ÙÙØØÙÙÙØ"
+msgstr "ØØÙ ØÙÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ ÙÙ ÙÙ ØÙØØØØØØ ÙÙØØÙÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "_New Label"
 msgstr "ÙØÙÙØ Ø_ØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 #, fuzzy
 msgid "N_one"
 msgstr "ÙØ ØÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 #, fuzzy
 msgid "_Manage Subscriptions"
 msgstr "ØØØØØ_ÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ØÙØØØØØÙ ØÙ ØÙØØØ ØÙØØØØØÙ ÙÙ ØÙÙØÙÙØØØ ØÙÙ ØÙÙÙÙØØÙ ØÙØØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Send / _Receive"
 msgstr "ØØØÙ / _ØÙÙÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Send queued items and retrieve new items"
 msgstr "ØØØÙÙ ØÙØÙØØØ ØÙÙØØÙØ Ù ØØÙØ ØÙØÙØØØ ØÙØØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 #, fuzzy
 msgid "R_eceive All"
 msgstr "ØØØÙØ ØÙØÙÙÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Receive new items from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 #, fuzzy
 msgid "_Send All"
 msgstr "ØØ_ØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 #, fuzzy
 msgid "Send queued items in all accounts"
 msgstr "ØØØÙÙ ØÙØÙØØØ ØÙÙØØÙØ Ù ØØÙØ ØÙØÙØØØ ØÙØØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
-#: ../widgets/misc/e-activity-proxy.c:306
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "ØÙØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Cancel the current mail operation"
 msgstr "ØÙØØØ ØÙÙÙÙØ ØÙØØÙØ ØÙØØÙÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Collapse All _Threads"
 msgstr "ØØÙÙ ÙÙ ØÙØÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Collapse all message threads"
 msgstr "ØØÙ ÙÙ ØÙÙØ ØÙÙÙØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1276
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "E_xpand All Threads"
 msgstr "ÙØ_Ø ÙÙ ØÙØÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Expand all message threads"
 msgstr "ÙØØ ÙÙ ØÙÙØ ØÙØØØØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1283
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "_Message Filters"
 msgstr "_ÙØØØØØ ØÙØØØØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Create or edit rules for filtering new mail"
 msgstr "ØÙØØ ØÙ ØØØ ÙÙØØØ ØØØÙØ ØÙØØÙØ ØÙØØÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1290
-msgid "Search F_olders"
-msgstr "Ù_ØÙÙØØØ ØÙØØØ"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
-#, fuzzy
-msgid "Create or edit search folder definitions"
-msgstr "ØÙØØ ØÙ ØØØ ØØØÙÙØØ ÙØÙÙØ ØÙØØØ"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1297
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 #, fuzzy
 msgid "_Subscriptions..."
 msgstr "ØØØØØ_ÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "F_older"
 msgstr "ØÙ_ÙØÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Label"
 msgstr "Ø_ØÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1353
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
+msgid "C_reate Search Folder From Search..."
+msgstr "ØÙ_ØØ ÙØÙÙØ ØØØ ÙÙ ØÙØØØ..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
+msgid "Search F_olders"
+msgstr "Ù_ØÙÙØØØ ØÙØØØ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#, fuzzy
+msgid "Create or edit search folder definitions"
+msgstr "ØÙØØ ØÙ ØØØ ØØØÙÙØØ ÙØÙÙØ ØÙØØØ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
 msgid "_New Folder..."
 msgstr "ÙØÙÙØ _ØØÙØ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1381
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Show Message _Preview"
 msgstr "ØØÙØ ÙØØÙÙØ ØÙØÙØØÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1383
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
 #, fuzzy
 msgid "Show message preview pane"
 msgstr "ØØÙØ ÙØÙØØ ÙØØÙÙØ ØÙØÙØØØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Show _Deleted Messages"
-msgstr "ØÙØØØØÙ ØÙÙÙØÙØØ"
+msgstr "ØØÙØ ØÙØÙØØØÙ ØÙÙ_ØØÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "Show deleted messages with a line through them"
-msgstr "ØØÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ (ØØØÙÙ ÙØØØÙØ) ÙÙ ÙØØÙØ ØÙØÙØØØÙ."
+msgstr "ØØÙØ ØÙØÙØØØÙ ØÙÙØØÙÙØ ØØØÙÙ ÙØØØÙØ."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1397
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
 msgid "_Group By Threads"
 msgstr "ØÙ_Ø ØØØ ØÙØÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 #, fuzzy
 msgid "Threaded message list"
 msgstr "ÙØØÙØ ØØØØÙ ÙØØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1420
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Show message preview below the message list"
 msgstr "ØØÙØ ÙØØÙÙØ ØÙØØØÙØ ØØØ ÙØØÙØ ØÙØØØØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
 #, fuzzy
 msgid "Show message preview alongside the message list"
 msgstr "ØØÙØ ÙØØÙÙØ ØÙØØØÙØ ØØØ ÙØØÙØ ØÙØØØØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1489
 msgid "All Messages"
 msgstr "ÙÙ ØÙØØØØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
+#: ../modules/mail/e-mail-shell-view-actions.c:1496
 msgid "Important Messages"
 msgstr "ØÙØØØØÙ ØÙÙÙÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1503
 msgid "Last 5 Days' Messages"
 msgstr "ØØØØÙ ØØØ 5 ØÙØÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
 msgid "Messages Not Junk"
 msgstr "ØØØØÙ ÙÙØØ ÙÙØÙØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "Messages with Attachments"
 msgstr "ØØØØÙ ØØØ ÙØÙÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
 msgid "No Label"
 msgstr "ØÙØ ÙØÙÙÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
 msgid "Read Messages"
 msgstr "ØÙØØØØÙ ØÙÙÙØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
 msgid "Recent Messages"
 msgstr "ØÙØØØØÙ ØÙØØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "Unread Messages"
 msgstr "ØÙØØØØÙ ØÙØ ØÙÙÙØÙØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 #, fuzzy
 msgid "Subject or Addresses contain"
 msgstr "ØÙÙÙØÙØ ØÙ ØÙÙØØÙÙ ÙØØÙÙØÙ ØÙÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "All Accounts"
 msgstr "ÙÙ ØÙØØØØØØ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1560
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Current Account"
 msgstr "ØÙØØØØ ØÙØØÙÙ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Current Folder"
 msgstr "ØÙÙØÙÙØ ØÙØØÙÙ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1049
-#, fuzzy, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "ØØØ ÙÙ ÙÙ ØÙØØØØØØ"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "ØØØ ØÙØØØØØØ"
+
+#: ../modules/mail/e-mail-shell-view.c:958
+msgid "Proxy _Logout"
+msgstr "ØØØÙÙ _ØØÙØ ØÙÙÙÙÙ"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
+#, fuzzy, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
 msgstr[0] "ÙØØØ ÙÙÙØÙÙØ "
 msgstr[1] "ØØÙØÙ ÙÙÙØÙÙØÙØ "
 msgstr[2] "%d ÙÙØÙØØØ "
 msgstr[3] "%d ÙÙØÙØØØ "
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, fuzzy, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -15973,9 +16145,11 @@ msgstr[0] "%d ØÙØÙ"
 msgstr[1] "%d ØÙØÙ"
 msgstr[2] "%d ØÙØÙ"
 msgstr[3] "%d ØÙØÙ"
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, fuzzy, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -15983,8 +16157,10 @@ msgstr[0] "%d ÙÙØÙØ"
 msgstr[1] "%d ÙÙØÙØ"
 msgstr[2] "%d ÙÙØÙØ"
 msgstr[3] "%d ÙÙØÙØ"
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, fuzzy, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -15992,8 +16168,10 @@ msgstr[0] "%d ÙØÙÙØØ"
 msgstr[1] "%d ÙØÙÙØØ"
 msgstr[2] "%d ÙØÙÙØØ"
 msgstr[3] "%d ÙØÙÙØØ"
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1085
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, fuzzy, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -16001,8 +16179,10 @@ msgstr[0] "%d ØÙØ ÙÙØØÙÙ"
 msgstr[1] "%d ØÙØ ÙÙØØÙÙ"
 msgstr[2] "%d ØÙØ ÙÙØØÙÙ"
 msgstr[3] "%d ØÙØ ÙÙØØÙÙ"
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1091
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, fuzzy, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -16010,8 +16190,10 @@ msgstr[0] "%d ØÙØØÙÙ"
 msgstr[1] "%d ØÙØØÙÙ"
 msgstr[2] "%d ØÙØØÙÙ"
 msgstr[3] "%d ØÙØØÙÙ"
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, fuzzy, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16019,8 +16201,10 @@ msgstr[0] "%d ØÙØ ÙÙØÙØ"
 msgstr[1] "%d ØÙØ ÙÙØÙØ"
 msgstr[2] "%d ØÙØ ÙÙØÙØ"
 msgstr[3] "%d ØÙØ ÙÙØÙØ"
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, fuzzy, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16028,108 +16212,60 @@ msgstr[0] "%d ØØÙØÙÙÙØ"
 msgstr[1] "%d ØØÙØÙÙÙØ"
 msgstr[2] "%d ØØÙØÙÙÙØ"
 msgstr[3] "%d ØØÙØÙÙÙØ"
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1126
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 #, fuzzy
 msgid "Trash"
 msgstr "ÙÙÙÙÙØ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1600
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "ØØØÙ / ØÙÙÙ"
 
-#: ../modules/mail/e-mail-shell-view.c:563
-msgid "All Account Search"
-msgstr "ØØØ ÙÙ ÙÙ ØÙØØØØØØ"
-
-#: ../modules/mail/e-mail-shell-view.c:746
-msgid "Account Search"
-msgstr "ØØØ ØÙØØØØØØ"
-
-#: ../modules/mail/e-mail-shell-view.c:951
-msgid "Proxy _Logout"
-msgstr "ØØØÙÙ _ØØÙØ ØÙÙÙÙÙ"
-
-#: ../modules/mail/em-account-prefs.c:215
-msgid "Evolution Account Assistant"
-msgstr "ÙØØØØ ØØØØØØ ØÙÙÙÙÙÙØÙÙ"
-
-#: ../modules/mail/em-account-prefs.c:264
-msgid "Account Editor"
-msgstr "ÙØØÙØ ØÙØØØØØØ"
-
-#: ../modules/mail/em-composer-prefs.c:502
-#: ../modules/plugin-manager/evolution-plugin-manager.c:356
-#: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:220
+#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/plugin-manager/evolution-plugin-manager.c:361
+#: ../plugins/publish-calendar/publish-calendar.c:857
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "ÙÙØÙÙ"
 
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "ØÙÙÙØØ (ØÙÙÙØØØ)"
 
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "ÙÙ ÙØÙØ"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "ÙØØ ÙÙ ØÙÙÙÙ"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "ÙØÙØ ÙÙ ØÙØØØÙØ"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "ÙØÙØ ÙÙ ØÙØÙØ"
 
-#: ../modules/mail/em-mailer-prefs.c:174
-msgid "Add Custom Junk Header"
-msgstr "ØØÙ ØØÙÙØØ ØØÙØ ÙÙØÙØ ÙÙØØØØ"
-
-#: ../modules/mail/em-mailer-prefs.c:182
-msgid "Header Name:"
-msgstr "Ø_ØÙ ØÙØØÙÙØØ:"
-
-#: ../modules/mail/em-mailer-prefs.c:183
-msgid "Header Value Contains:"
-msgstr "ØÙØØÙÙØØ ØØØÙÙ ØÙÙ:"
-
-#: ../modules/mail/em-mailer-prefs.c:283
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Header"
 msgstr "ØÙØÙØÙÙØØ"
 
-#: ../modules/mail/em-mailer-prefs.c:287
+#: ../modules/mail/em-mailer-prefs.c:297
 msgid "Contains Value"
 msgstr "ØØØÙÙ ØÙÙ ØÙÙÙÙØ"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:766
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "ØÙÙÙØÙ %s ÙØØØ ÙØÙÙÙÙ ØÙØÙØØÙ ÙØØØ."
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:775
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr "ØÙÙÙØÙ %s ØÙØ ÙØØØ. ØØÙÙ ØØØØÙ ØÙ ÙØÙØ ØÙØØÙØ ÙØØØØ."
-
-#: ../modules/mail/em-mailer-prefs.c:739
-#, fuzzy
-msgid "No junk plugin available"
-msgstr "ÙØ ÙÙØØ ÙÙØÙ ØØÙØ ÙÙÙÙ ÙØØØ."
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1051
 #, fuzzy
 msgid "_Date header:"
 msgstr "ØØÙÙØØ ØÙØØÙÙ"
 
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/mail/em-mailer-prefs.c:1052
 #, fuzzy
 msgid "Show _original header value"
 msgstr "ØØÙØ ØÙ_ØØÙ ØÙØØÙÙ"
@@ -16143,7 +16279,7 @@ msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "ØØÙØ ØØØÙÙØ ÙÙ ØÙ ØÙÙÙÙÙÙØÙ ÙÙ ØÙÙÙ ØÙØØÙØ ØÙØÙØØØØÙ ØÙØ ÙØØÙ."
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:143
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 #, fuzzy
 msgid "Do you want to make Evolution your default email client?"
 msgstr "ÙÙ ØØÙØ ØØÙ ØÙÙÙÙÙÙØÙ ØÙÙÙÙØ ØÙØØØØÙÙØ ÙØØÙØÙØ"
@@ -16173,35 +16309,59 @@ msgstr ""
 "ØÙÙÙÙÙÙØÙ ØÙÙ ØØØØÙ ØØÙÙØ.\n"
 "ØÙÙØ ÙØØ ØÙØØ ÙÙØÙÙ ÙØ ØØØØÙ."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr ""
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
 msgstr "ØÙÙØÙÙ(ÙÙ)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
 msgid "Plugin Manager"
 msgstr "ÙØÙØ ØÙÙÙØÙØØ"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:266
+#: ../modules/plugin-manager/evolution-plugin-manager.c:271
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ÙÙØÙØØ: ØØØ ØÙØØÙÙØØØ ÙÙ ØØØØ ÙØØØÙØ ØÙØ ØØØ ØØØØØ ØÙØØØÙÙ"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:295
+#: ../modules/plugin-manager/evolution-plugin-manager.c:300
 msgid "Overview"
 msgstr "ÙØØØ ØØÙØ "
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:364
-#: ../modules/plugin-manager/evolution-plugin-manager.c:447
+#: ../modules/plugin-manager/evolution-plugin-manager.c:369
+#: ../modules/plugin-manager/evolution-plugin-manager.c:452
 msgid "Plugin"
 msgstr "ÙÙØÙ"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:485
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
 msgid "_Plugins"
 msgstr "ÙÙØ_ÙØØ"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../modules/plugin-manager/evolution-plugin-manager.c:491
 msgid "Enable and disable plugins"
 msgstr "ÙØÙÙ Ù ØØÙ ÙÙØÙØØ"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "ÙÙØÙ ØØØØØØ ØØÙØÙÙ"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "ÙÙØÙ ØÙØØØØØØ ÙÙØÙÙ ÙÙØÙ.ØÙ ÙØØÙØÙÙ."
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "ÙØØØØ ØØÙØÙÙ"
@@ -16210,48 +16370,98 @@ msgstr "ÙØØØØ ØØÙØÙÙ"
 msgid "Python Plugin Loader tests"
 msgstr "ØØØØØØØØ ÙØÙÙ ÙÙØÙØØ ØØÙØÙÙ"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "ÙÙØÙ ØØØØØØ ØØÙØÙÙ"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr ""
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "ÙÙØÙ ØÙØØØØØØ ÙÙØÙÙ ÙÙØÙ.ØÙ ÙØØÙØÙÙ."
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+#, fuzzy
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "ØØØÙØ ØØØØÙ ØÙØØÙØ ØÙÙÙÙÙ ØØØØØØØÙ Bogofilter."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, fuzzy, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "ÙØÙ ØØØØÙ %d ØØØÙØ ÙÙ ØØÙØÙÙ %d"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "ØÙØØØØ ÙØØÙ ØÙØØÙØ ØÙÙØØØ"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "Ø_ØÙÙÙ ØÙØØØØØØØØ ØÙØØÙØØ"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+#, fuzzy
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "ÙØØ ØÙØØÙ ØØØÙ-ØØÙØØÙ ØÙØØ ÙÙØØØØ ÙÙÙÙ ØØØØ"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+#, fuzzy
+msgid "SpamAssassin"
+msgstr "ØÙØØØØ ÙØØÙ ØÙØØÙØ ØÙÙØØØ"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "ØØØØØÙ ØÙØÙØ ÙØÙÙÙ ÙØØÙ ØÙØØÙØ ØÙÙØØØ"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "ØØØØØÙ ÙØØÙØ ÙØÙÙÙ SpamAssassin. (spamc/spamd)"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "ØØØØØØÙ ØØØØØØØØ ØÙØØØÙ ØÙÙØÙÙØ ÙÙØ."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "ØØØØØØÙ ØØØØØØØØ ØÙØØØÙ ØÙÙØÙÙØ ÙÙØ (ÙØ DNS)."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:277
-#: ../widgets/misc/e-import-assistant.c:392
+#: ../modules/startup-wizard/evolution-startup-wizard.c:280
+#: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "ØØØØÙ ØÙØÙ ØÙÙØÙÙÙØØ ØÙØÙ ØØØØ ÙÙ ØØØÙØØØÙØ:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:309
-#: ../widgets/misc/e-import-assistant.c:548
+#: ../modules/startup-wizard/evolution-startup-wizard.c:312
+#: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "ÙÙ %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:320
-#: ../modules/startup-wizard/evolution-startup-wizard.c:417
+#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:421
 #, fuzzy
 msgid "Importing Files"
 msgstr "ØØØÙØØØ ØÙÙÙÙØØ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:395
+#: ../modules/startup-wizard/evolution-startup-wizard.c:399
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:413
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:487
+#: ../modules/startup-wizard/evolution-startup-wizard.c:497
 msgid "Evolution Setup Assistant"
 msgstr "ÙØØØØ ØØØ ØÙÙÙÙÙØÙÙ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:493
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
 msgid "Welcome"
 msgstr "ÙØØØØ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:508
 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"
@@ -16263,6 +16473,11 @@ msgstr ""
 "\n"
 "ØØØØÙ ØØØØ ØØ \"ØÙØÙ\" ÙÙÙØØØØØ. "
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#, fuzzy
+msgid "Loading accounts..."
+msgstr "ÙØØÙ ØÙØÙØÙÙÙ..."
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 #, fuzzy
 msgid "Add local address books to Evolution."
@@ -16278,12 +16493,12 @@ msgid ""
 "body"
 msgstr "ÙØØÙØ ØÙØÙØÙØØ ØÙØÙ ØÙØØØ ØÙÙØ ÙÙØÙ ÙÙØÙÙ ØÙÙØÙÙØØ ÙÙ ØØÙ ØÙØØØÙØ"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "ÙØ ØØÙØ ÙØÙ ØÙØØØÙØ ÙØØ ØØØÙ."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:453
-#: ../plugins/templates/templates.c:411
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:462
 msgid "Keywords"
 msgstr "ØÙÙÙÙØØ ØÙØØØØÙØ"
 
@@ -16325,24 +16540,23 @@ msgstr "ØÙÙ ØÙØÙÙØÙ"
 msgid "Play audio attachments directly in mail messages."
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:186
+#: ../plugins/backup-restore/backup-restore.c:192
 msgid "Select name of the Evolution backup file"
 msgstr "ØÙØÙ ØØÙÙØ ÙÙÙÙ ØØØÙÙ ØÙÙÙÙÙÙØÙ"
 
-#: ../plugins/backup-restore/backup-restore.c:219
+#: ../plugins/backup-restore/backup-restore.c:225
 msgid "_Restart Evolution after backup"
 msgstr "Ø_ØØ ØØØÙÙ ØÙÙÙÙÙÙØÙ ØØØ ØÙÙØØ ØÙØØØÙØØÙ"
 
-#: ../plugins/backup-restore/backup-restore.c:245
+#: ../plugins/backup-restore/backup-restore.c:251
 msgid "Select name of the Evolution backup file to restore"
 msgstr "ØÙØÙ ØØÙÙØ ÙÙÙÙ ØØØÙÙ ØÙÙÙÙÙÙØÙ ÙØØØØØØØÙ"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restart Evolution after restore"
 msgstr "Ø_ØØ ØØØÙÙ ØÙÙÙÙÙÙØÙ ØØØ ØÙØØØØØØØ"
 
-#: ../plugins/backup-restore/backup-restore.c:326
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:337
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16352,149 +16566,141 @@ msgstr ""
 "ÙØÙØÙÙÙÙØØ ÙØÙÙÙÙØØ ÙØÙÙØÙØØØ ÙØÙÙØØØØÙÙÙ. \n"
 "ØÙÙ ÙØØØØØ ØÙØÙØ ØØØØØØØÙ ØÙØØØÙØ ÙÙØØØØØ ØÙØØÙØØ ØÙØ."
 
-#: ../plugins/backup-restore/backup-restore.c:333
+#: ../plugins/backup-restore/backup-restore.c:344
 msgid "_Restore Evolution from the backup file"
 msgstr "ØØØØ_ØØ ØÙÙÙÙÙÙØÙ ÙÙ ÙÙÙ ØÙÙØØØ ØÙØØØÙØØÙØ"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Please select an Evolution Archive to restore:"
 msgstr "ØÙØÙ ØØØÙÙ ØÙÙÙÙÙÙØÙ ÙØØØØØØØÙ:"
 
-#: ../plugins/backup-restore/backup-restore.c:343
+#: ../plugins/backup-restore/backup-restore.c:354
 msgid "Choose a file to restore"
 msgstr "ØØØØ ÙÙÙÙØ ÙØØØØØØØÙ"
 
-#: ../plugins/backup-restore/backup-restore.c:351
+#: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore from backup"
 msgstr "ØØØØØØ ÙÙ ØÙÙØØØ ØÙØØØÙØØÙØ"
 
-#: ../plugins/backup-restore/backup-restore.c:389
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:402
 msgid "_Back up Evolution Data..."
-msgstr "ÙÙØØ ØÙØÙØØ ØÙÙÙÙÙÙØÙÙ ØØØÙØØÙØ"
+msgstr "Ø_ÙØØ ØÙØÙØØ ØÙÙÙÙÙÙØÙÙ ØØØÙØØÙØ..."
 
-#: ../plugins/backup-restore/backup-restore.c:391
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:404
 msgid "Back up Evolution data and settings to an archive file"
-msgstr "ØÙÙØØ ØÙØØØÙØØÙ ÙØÙØØØØØØØ ÙØÙØÙØØ ÙØØØØØØØ ØÙÙÙÙÙÙØÙ"
+msgstr "ØÙØØ ØÙØÙØØ ÙØØØØØØØ ØÙÙÙÙÙÙØÙ ØØØÙØØÙØ ØÙÙ ÙÙÙ ØØØÙÙ"
 
-#: ../plugins/backup-restore/backup-restore.c:396
+#: ../plugins/backup-restore/backup-restore.c:409
 #, fuzzy
 msgid "R_estore Evolution Data..."
 msgstr "ØØØØØØØ ØÙØÙØØ ØÙÙÙÙÙÙØÙ"
 
-#: ../plugins/backup-restore/backup-restore.c:398
+#: ../plugins/backup-restore/backup-restore.c:411
 #, fuzzy
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "ØÙÙØØ ØÙØØØÙØØÙ ÙØÙØØØØØØØ ÙØÙØÙØØ ÙØØØØØØØ ØÙÙÙÙÙÙØÙ"
 
-#: ../plugins/backup-restore/backup.c:79
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:77
 msgid "Back up Evolution directory"
 msgstr "ØÙØØ ØÙÙÙ ØÙÙÙÙÙÙØÙ ØØØÙØØÙÙØ"
 
-#: ../plugins/backup-restore/backup.c:81
+#: ../plugins/backup-restore/backup.c:79
 msgid "Restore Evolution directory"
 msgstr "ØØØØØ ØÙÙÙ ØÙÙÙÙÙÙØÙ"
 
-#: ../plugins/backup-restore/backup.c:83
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:81
 msgid "Check Evolution Back up"
 msgstr "ØØÙÙ ÙÙ ÙØØ ØÙÙÙÙÙÙØÙÙ ØÙØØØÙØØÙ"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../plugins/backup-restore/backup.c:83
 msgid "Restart Evolution"
 msgstr "ØØØ ØØØÙÙ ØÙÙÙÙÙÙØÙ"
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
 msgstr "ÙØ ÙØØÙØ ØÙÙØØØØÙ ØÙØØÙÙÙØ"
 
-#: ../plugins/backup-restore/backup.c:289
-#: ../plugins/backup-restore/backup.c:399
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:418
 msgid "Shutting down Evolution"
 msgstr "ÙØØÙ ØØÙØØ ØÙÙÙÙÙÙØÙ"
 
-#: ../plugins/backup-restore/backup.c:296
+#: ../plugins/backup-restore/backup.c:308
 msgid "Backing Evolution accounts and settings"
 msgstr "ÙØØÙ ØÙÙØØ ØÙØØØÙØØÙ ÙØØØØØØ ÙØØØØØØØ ØÙÙÙÙÙÙØÙ"
 
-#: ../plugins/backup-restore/backup.c:304
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "ØØØÙ ØÙÙØØ ØÙØØØÙØØÙ ÙØÙØÙØØ ØÙÙÙÙÙÙØÙ (ØÙØØÙØØ ØÙÙØØØØÙÙÙØ ØÙØÙÙÙÙØ ØÙÙÙÙØØØ "
 "ØÙÙØÙØØØ)"
 
-#: ../plugins/backup-restore/backup.c:317
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:331
 msgid "Back up complete"
 msgstr "ØÙØÙÙ ØÙÙØØ ØÙØØØÙØØÙ"
 
-#: ../plugins/backup-restore/backup.c:322
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:527
 msgid "Restarting Evolution"
 msgstr "ØØØÙ ØØØØØ ØØØÙÙ ØÙÙÙÙÙÙØÙ"
 
-#: ../plugins/backup-restore/backup.c:403
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:424
 msgid "Back up current Evolution data"
 msgstr "ØÙØØ ØÙØÙØØ ØÙÙÙÙÙÙØÙ ØÙØØÙÙØ ØØØÙØØÙÙØ"
 
-#: ../plugins/backup-restore/backup.c:409
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:432
 msgid "Extracting files from back up"
-msgstr "ØØØÙ ØØØØØØØ ØÙÙÙÙØØ ÙÙ ØÙÙØØØ ØÙØØØÙØØÙØ"
+msgstr "ÙØØØØØ ØÙÙÙÙØØ ÙÙ ØÙÙØØØ ØÙØØØÙØØÙØ"
 
-#: ../plugins/backup-restore/backup.c:466
+#: ../plugins/backup-restore/backup.c:491
 msgid "Loading Evolution settings"
 msgstr "ØØØÙ ØØÙÙÙ ØØØØØØØ ØÙÙÙÙÙÙØÙÙ"
 
-#: ../plugins/backup-restore/backup.c:481
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:508
 msgid "Removing temporary back up files"
-msgstr "ØØØÙ ØØØÙØ ÙÙÙØØ ØÙÙØØ ØÙØØØÙØØÙ ØÙÙØÙØØ"
+msgstr "ÙØÙÙ ÙÙÙØØ ØÙÙØØ ØÙØØØÙØØÙ ØÙÙØÙØØ"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:520
 msgid "Ensuring local sources"
 msgstr "ØÙØÙ ØÙÙØØØØ ØÙÙØÙÙØ"
 
-#: ../plugins/backup-restore/backup.c:678
+#: ../plugins/backup-restore/backup.c:707
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ØØØÙ ØÙÙØØ ØÙØØØÙØØÙ ØÙÙ ØÙÙØÙØ %s"
 
-#: ../plugins/backup-restore/backup.c:683
+#: ../plugins/backup-restore/backup.c:712
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "ÙØØÙ ØÙØØØØØØØ ÙÙ ØÙÙØÙØ %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:705
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:736
 msgid "Evolution Back up"
 msgstr "ÙØØ ØÙÙÙÙÙÙØÙÙ ØÙØØØÙØØÙ"
 
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:736
 msgid "Evolution Restore"
 msgstr "ØØØØØØØ ØÙÙÙÙÙÙØÙÙ"
 
-#: ../plugins/backup-restore/backup.c:743
+#: ../plugins/backup-restore/backup.c:774
 msgid "Backing up Evolution Data"
 msgstr "ÙÙØØ ØÙØÙØØ ØÙÙÙÙÙÙØÙÙ ØØØÙØØÙØ"
 
-#: ../plugins/backup-restore/backup.c:744
+#: ../plugins/backup-restore/backup.c:775
 msgid "Please wait while Evolution is backing up your data."
 msgstr "ØÙØØØ ØÙØÙØ ÙÙØØ ØÙÙÙÙÙÙØÙ ØÙØÙØØÙ ØØØÙØØÙØ."
 
-#: ../plugins/backup-restore/backup.c:746
+#: ../plugins/backup-restore/backup.c:777
 msgid "Restoring Evolution Data"
 msgstr "ØØØØØØØ ØÙØÙØØ ØÙÙÙÙÙÙØÙ"
 
-#: ../plugins/backup-restore/backup.c:747
+#: ../plugins/backup-restore/backup.c:778
 msgid "Please wait while Evolution is restoring your data."
 msgstr "ØÙØØØ ØÙØÙØ ÙØØØÙØ ØÙÙÙÙÙÙØÙ ØÙØÙØØÙ."
 
-#: ../plugins/backup-restore/backup.c:765
+#: ../plugins/backup-restore/backup.c:796
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "ÙØ ÙØÙÙ ÙØØ ØØØÙØØØ ØÙÙ ÙØØ ØÙÙØÙÙÙØØ ÙÙ ØØØØÙ."
 
@@ -16514,7 +16720,6 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "ÙÙ ØÙØ ÙØØÙØ ÙÙ ØÙÙ ØØÙØ ØØÙØÙ ØÙÙÙÙÙÙØÙØ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#, fuzzy
 msgid ""
 "Are you sure you want to restore Evolution from the selected back up file?"
 msgstr "ØÙØØÙØ ØÙÙ ØØØØ ÙÙ ØØØØØØØ ØÙÙÙÙÙÙØÙ ÙÙ ÙÙÙ ØÙÙØØ ØÙØØØÙØØÙ ØÙÙØØØØ"
@@ -16561,37 +16766,37 @@ msgid ""
 "up."
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ØÙÙØØØØÙÙÙ ØÙØÙÙØØÙÙÙ"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:709
+#: ../plugins/bbdb/bbdb.c:710
 #, fuzzy
 msgid "Create _address book entries when sending mails"
 msgstr "Ø_ÙÙØ ØÙØØ ÙØØÙØØ ÙÙ ØÙØØ ØÙØÙØÙÙÙ ØÙØ ØÙØØ ØÙÙ ØÙØØØØÙ"
 
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "ØÙØÙ ØÙØØ ØÙØÙÙÙ ÙÙÙØØØØÙÙÙ ØÙØÙÙØØÙÙÙ"
 
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "ÙØØØØÙÙ ØÙÙØØØØÙØ ØÙÙÙØÙØ"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:745
+#: ../plugins/bbdb/bbdb.c:746
 #, fuzzy
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "ØØÙÙÙ ÙØÙÙÙØØ ØÙÙØØØØÙÙÙ ÙØÙØÙÙ ÙÙØ ÙØØÙØ ØØØÙØ ØØÙØÙn"
 
-#: ../plugins/bbdb/bbdb.c:751
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "ØÙØÙ ØÙØØ ØÙØÙÙÙ ÙÙØØÙØ ØØØÙØØ Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:762
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "_ØØÙÙ ÙØ ÙØØÙØ ØÙØØØÙØØ ØÙØÙ"
 
@@ -16612,102 +16817,46 @@ msgstr ""
 "ØÙÙØØÙØ. ÙÙÙÙØÙ ØÙØÙØ ØÙØÙÙÙØØ ØÙØØØØÙ ØÙ ØØÙÙ ØÙÙØØØØÙØ ØÙÙÙØÙØ ØÙÙ ÙÙ ÙÙ "
 "ÙØØÙØ ØØØÙØØÙ."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr ""
-
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr "ØØØ ØØØ ØØÙØØ ØÙØÙØÙØØ %s: %s."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr "ØØÙØÙÙÙØ ØÙØØÙ ÙÙØØØ Bogo ÙØ ØØØØÙØ, ØÙÙÙ...."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "ØÙØ ÙÙØØØØ ØÙØØØØ ØÙØÙÙÙØ ØÙØØÙ ÙÙØØØ Bogo, ØÙØÙÙØØ..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "ÙØÙ ØÙØÙØÙØ ØÙÙ ÙØØØ Bogo, ØÙØ ØÙØØØ: %d."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
-msgid "Convert message text to _Unicode"
-msgstr "ØÙÙÙ ÙØ ØÙØØØÙØ ØÙÙ _ÙÙÙÙÙÙØ"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "ØÙÙÙ ØØØØÙ ØÙØØÙØ ØÙÙ ÙÙÙÙÙÙØ"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"ØÙÙÙ ÙØ ØÙØØØÙØ ØÙÙ ÙÙÙÙÙÙØ UTF-8 ÙØÙØÙØ ÙÙØØØØ ØÙØØÙØ ØÙÙØØØ ØÙÙØØÙ ÙÙ "
-"ÙØÙÙØØØ ØØÙÙØ ÙØØÙÙØ."
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-#, fuzzy
-msgid "Bogofilter Junk Filter"
-msgstr "ÙÙØÙ ÙØØØ Bogo ÙÙØØØØ"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "ØÙØØØØ ÙØØØ Bogo"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-#, fuzzy
-msgid "Filter junk messages using Bogofilter."
-msgstr "ØØØÙØ ØØØØÙ ØÙØØÙØ ØÙÙÙÙÙ ØØØØØØØÙ Bogofilter."
-
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:214
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:206
+#: ../plugins/caldav/caldav-browse-server.c:216
 msgid "Given URL cannot be found."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:210
+#: ../plugins/caldav/caldav-browse-server.c:220
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
 "%d - %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:340
-#: ../plugins/caldav/caldav-browse-server.c:664
+#: ../plugins/caldav/caldav-browse-server.c:360
+#: ../plugins/caldav/caldav-browse-server.c:694
 #, fuzzy
 msgid "Failed to parse server response."
 msgstr "ÙØÙ ØØØÙØ ØÙÙÙÙÙÙÙÙØÙÙÙ:"
 
-#: ../plugins/caldav/caldav-browse-server.c:434
+#: ../plugins/caldav/caldav-browse-server.c:454
 #, fuzzy
 msgid "Events"
 msgstr "ÙÙØÙÙ"
 
-#: ../plugins/caldav/caldav-browse-server.c:456
+#: ../plugins/caldav/caldav-browse-server.c:476
 #, fuzzy
 msgid "User's calendars"
 msgstr "ØÙÙÙÙ ØØÙØ"
 
-#: ../plugins/caldav/caldav-browse-server.c:565
-#: ../plugins/caldav/caldav-browse-server.c:733
+#: ../plugins/caldav/caldav-browse-server.c:588
+#: ../plugins/caldav/caldav-browse-server.c:763
 #, fuzzy
 msgid "Failed to get server URL."
 msgstr "ÙØÙ ØÙØÙÙØÙÙ ÙØ ØØØÙÙ LDAP."
 
-#: ../plugins/caldav/caldav-browse-server.c:731
-#: ../plugins/caldav/caldav-browse-server.c:772
-#: ../plugins/caldav/caldav-browse-server.c:1431
+#: ../plugins/caldav/caldav-browse-server.c:761
+#: ../plugins/caldav/caldav-browse-server.c:802
+#: ../plugins/caldav/caldav-browse-server.c:1493
 #, fuzzy
 msgid "Searching for user's calendars..."
 msgstr ""
@@ -16715,27 +16864,27 @@ msgstr ""
 "\n"
 "ØÙØØØ ØÙ ØÙÙØØØØÙÙÙ..."
 
-#: ../plugins/caldav/caldav-browse-server.c:770
+#: ../plugins/caldav/caldav-browse-server.c:800
 #, fuzzy
 msgid "Could not find any user calendar."
 msgstr "ØÙØ ÙØØØ ØÙÙ ØÙØØØ ØÙ ØÙÙÙÙØØ"
 
-#: ../plugins/caldav/caldav-browse-server.c:902
+#: ../plugins/caldav/caldav-browse-server.c:938
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:904
+#: ../plugins/caldav/caldav-browse-server.c:940
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:909
+#: ../plugins/caldav/caldav-browse-server.c:945
 #, fuzzy, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "ØØØÙ ÙÙÙØ ØÙØÙØ ÙÙ %s (ØÙÙØØØØÙ %s)"
 
-#: ../plugins/caldav/caldav-browse-server.c:968
+#: ../plugins/caldav/caldav-browse-server.c:1008
 #, fuzzy, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr ""
@@ -16743,7 +16892,7 @@ msgstr ""
 " %s"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1214
+#: ../plugins/caldav/caldav-browse-server.c:1266
 #, fuzzy
 msgid "Searching folder content..."
 msgstr ""
@@ -16751,68 +16900,70 @@ msgstr ""
 "\n"
 "ØÙØØØ ØÙ ØÙÙØØØØÙÙÙ..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1263
-#: ../plugins/caldav/caldav-source.c:256
+#: ../plugins/caldav/caldav-browse-server.c:1325
+#: ../plugins/caldav/caldav-source.c:261
 msgid "Server _handles meeting invitations"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:1270
+#: ../plugins/caldav/caldav-browse-server.c:1332
 #, fuzzy
 msgid "List of available calendars:"
 msgstr "ÙØØÙ ØØÙÙÙ ØÙØÙÙÙÙ"
 
-#: ../plugins/caldav/caldav-browse-server.c:1308
+#: ../plugins/caldav/caldav-browse-server.c:1370
 #, fuzzy
 msgid "Supports"
 msgstr "ØÙÙÙØÙØÙÙ"
 
-#: ../plugins/caldav/caldav-browse-server.c:1335
-#: ../plugins/caldav/caldav-source.c:254
+#: ../plugins/caldav/caldav-browse-server.c:1397
+#: ../plugins/caldav/caldav-source.c:259
 #, fuzzy
-msgid "User e-_mail:"
+msgid "User e_mail:"
 msgstr "ØØÙØ ØØÙØ"
 
-#: ../plugins/caldav/caldav-browse-server.c:1407
+#: ../plugins/caldav/caldav-browse-server.c:1469
 #, fuzzy, c-format
 msgid "Failed to create thread: %s"
 msgstr "ÙØÙ ØÙØØØ ØÙØÙØ: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1516
+#: ../plugins/caldav/caldav-browse-server.c:1585
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:1522
+#: ../plugins/caldav/caldav-browse-server.c:1591
 msgid "Browse for a CalDAV calendar"
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:235
-#: ../plugins/calendar-http/calendar-http.c:100
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
 msgid "_URL:"
 msgstr "Ø_ÙÙØÙ:"
 
-#: ../plugins/caldav/caldav-source.c:242
-#: ../plugins/google-account-setup/google-contacts-source.c:349
-msgid "Use _SSL"
-msgstr "ØØØØØÙ _SSL"
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:145
+#: ../plugins/google-account-setup/google-contacts-source.c:359
+#, fuzzy
+msgid "Use _secure connection"
+msgstr "Ø_ØØØØÙ ØØØØÙ ØÙÙ:"
 
-#: ../plugins/caldav/caldav-source.c:244
-#: ../plugins/google-account-setup/google-contacts-source.c:327
-#: ../plugins/google-account-setup/google-source.c:638
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:268
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
 msgid "User_name:"
 msgstr "Ø_ØÙ ØÙÙØØØØÙ:"
 
-#: ../plugins/caldav/caldav-source.c:259
+#: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:277
-#: ../plugins/calendar-file/calendar-file.c:191
-#: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:399
-#: ../plugins/google-account-setup/google-contacts-source.c:367
-#: ../plugins/google-account-setup/google-source.c:645
+#: ../plugins/caldav/caldav-source.c:282
+#: ../plugins/calendar-file/calendar-file.c:204
+#: ../plugins/calendar-http/calendar-http.c:129
+#: ../plugins/calendar-weather/calendar-weather.c:421
+#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../plugins/google-account-setup/google-source.c:675
 msgid "Re_fresh:"
 msgstr "Ø_ÙØØØ:"
 
@@ -16825,36 +16976,36 @@ msgstr ""
 msgid "CalDAV Support"
 msgstr "ÙØØØØ CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:134
 #, fuzzy
 msgid "_Customize options"
 msgstr "ØØÙØ"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:153
 #, fuzzy
 msgid "File _name:"
 msgstr "ØØÙ ØÙÙÙÙ:"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:157
 #, fuzzy
 msgid "Choose calendar file"
 msgstr "ØØØØ ÙÙÙ"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:209
 #, fuzzy
 msgid "On open"
 msgstr "ØÙØØ"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:210
 msgid "On file change"
 msgstr ""
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:211
 #, fuzzy
 msgid "Periodically"
 msgstr "ØØØÙ"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:228
 msgid "Force read _only"
 msgstr ""
 
@@ -16866,11 +17017,7 @@ msgstr ""
 msgid "Local Calendars"
 msgstr "ØÙØÙÙÙÙØØ ØÙÙØÙÙÙØ"
 
-#: ../plugins/calendar-http/calendar-http.c:134
-msgid "_Secure connection"
-msgstr "ØØ_ØØÙ ØÙÙ"
-
-#: ../plugins/calendar-http/calendar-http.c:194
+#: ../plugins/calendar-http/calendar-http.c:207
 msgid "Userna_me:"
 msgstr "Ø_ØÙ ØÙÙØØØØÙ:"
 
@@ -16883,67 +17030,67 @@ msgstr ""
 msgid "Web Calendars"
 msgstr "ØÙØÙÙÙÙØØ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "ØØÙØ ØÙØÙØ: ØØØØ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy"
 msgstr "ØØÙØ ØÙØÙØ: ØØØÙ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:67
 #, fuzzy
 msgid "Weather: Cloudy Night"
 msgstr "ØØÙØ ØÙØÙØ: ØØØÙ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:68
 #, fuzzy
 msgid "Weather: Overcast"
 msgstr "ØØÙØ ØÙØÙØ: ÙØØ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:69
 #, fuzzy
 msgid "Weather: Showers"
 msgstr "ØØÙØ ØÙØÙØ :ØÙÙØ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Snow"
 msgstr "ØØÙØ ØÙØÙØ :ØÙÙØ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Sunny"
 msgstr "ØØÙØ ØÙØÙØ: ÙØÙØ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:72
 #, fuzzy
 msgid "Weather: Clear Night"
 msgstr "ØÙÙÙÙØØ ØÙØÙØ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:73
 msgid "Weather: Thunderstorms"
 msgstr "ØØÙØ ØÙØÙØ: ØÙØØÙ ØØØÙØ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:226
+#: ../plugins/calendar-weather/calendar-weather.c:239
 msgid "Select a location"
 msgstr "ØÙØÙ ÙÙÙØÙØ"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:332
-#: ../plugins/calendar-weather/calendar-weather.c:377
+#: ../plugins/calendar-weather/calendar-weather.c:350
+#: ../plugins/calendar-weather/calendar-weather.c:398
 #, fuzzy
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "ÙØ ØÙØ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:452
+#: ../plugins/calendar-weather/calendar-weather.c:477
 msgid "_Units:"
 msgstr "ØÙÙ_ØØØØ:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:461
+#: ../plugins/calendar-weather/calendar-weather.c:486
 msgid "Metric (Celsius, cm, etc)"
 msgstr "ÙØØÙ (ØÙÙØÙÙØØ ØÙØ ØÙØ..)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:464
+#: ../plugins/calendar-weather/calendar-weather.c:489
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "ØÙØØØØÙØÙ (ÙÙØÙÙØÙØØ ØÙØØØØ ØÙØ..)"
 
@@ -16955,27 +17102,7 @@ msgstr ""
 msgid "Weather Calendars"
 msgstr "ØÙÙÙÙØØ ØÙØÙØ"
 
-#: ../plugins/contacts-map/contacts-map.c:55
-#: ../plugins/contacts-map/contacts-map.c:201
-#, fuzzy
-msgid "Contacts map"
-msgstr "ØÙÙØØØØÙÙÙ: "
-
-#: ../plugins/contacts-map/contacts-map.c:56
-#, fuzzy
-msgid "Show a map of all the contacts"
-msgstr "ØØÙØ ÙØØÙÙØ ØÙØØØÙØ ØØØ ÙØØÙØ ØÙØØØØÙ"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
-msgid "Add a map showing the location of contacts when possible."
-msgstr ""
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-#, fuzzy
-msgid "Map for contacts"
-msgstr "ÙØ ÙØØØØÙÙÙ"
-
-#: ../plugins/dbx-import/dbx-importer.c:273
+#: ../plugins/dbx-import/dbx-importer.c:284
 #, fuzzy
 msgid "Importing Outlook Express data"
 msgstr "ÙØØÙ ØØØÙØØØ ØÙØÙØØ ØÙÙ"
@@ -16994,24 +17121,24 @@ msgstr "ÙØØÙØØ ØÙØÙÙÙ CSV Ù Tab"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr ""
 
-#: ../plugins/default-source/default-source.c:83
+#: ../plugins/default-source/default-source.c:168
 msgid "Mark as _default address book"
 msgstr "ØÙÙÙ ÙØÙØØ ØÙØÙØÙÙÙ ØÙØ_ÙØØØØÙ"
 
-#: ../plugins/default-source/default-source.c:96
+#: ../plugins/default-source/default-source.c:182
 #, fuzzy
 msgid "A_utocomplete with this address book"
 msgstr "ØØØÙ ØÙÙØÙØ ØÙÙÙØÙÙ"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:191
 msgid "Mark as _default calendar"
 msgstr "ØÙÙÙ ÙØÙØÙÙÙÙ ØÙØ_ÙØØØØÙ"
 
-#: ../plugins/default-source/default-source.c:106
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default task list"
 msgstr "ØÙÙÙ ÙÙØØÙØ ØÙÙÙØÙ ØÙØ_ÙØØØØÙØ"
 
-#: ../plugins/default-source/default-source.c:107
+#: ../plugins/default-source/default-source.c:193
 msgid "Mark as _default memo list"
 msgstr "ØÙÙ ÙÙØØÙØ ØÙÙØÙØØØ ØÙØ_ÙØØØØÙØ"
 
@@ -17037,60 +17164,60 @@ msgstr ""
 "ØÙØØØØØ. ÙÙØØ ØØØÙØ ØØÙÙØØ ÙÙÙÙØ ØÙØØÙÙØØ ÙÙ: ØØÙ ØÙØØÙÙØØ ØÙÙØØØØ ÙØØÙØØ Ø "
 "\"=\" ØÙ ØÙÙÙÙ ÙÙØÙÙØ Ø \";\""
 
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:322
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "ØÙÙ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:320
+#: ../plugins/email-custom-header/email-custom-header.c:326
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "ØØØÙ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:327
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "ØÙØ ÙÙÙÙØØ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:328
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "ØØØÙØ ØÙØÙØØØ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:329
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "ØØÙØÙ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../plugins/email-custom-header/email-custom-header.c:330
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "ØÙÙÙØÙØØ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:331
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "ØÙÙÙØÙØØ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:382
+#: ../plugins/email-custom-header/email-custom-header.c:388
 #, fuzzy
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "ÙØ ØÙØ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:574
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "ØØÙÙØØ _ÙØØØØ"
 
 #. 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:833
+#: ../plugins/email-custom-header/email-custom-header.c:847
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17098,12 +17225,12 @@ msgstr ""
 "ÙÙØØ ØØØÙØ ÙÙÙØ ØÙÙÙØØØ ÙÙØØÙÙØØ ØÙÙØØØØ ÙÙ:\n"
 "ØØÙØØ ÙÙÙ ØÙÙÙØØØ ÙÙØØÙÙØØ ØÙÙØØØØ ÙÙØÙÙØÙ Ø \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:887
+#: ../plugins/email-custom-header/email-custom-header.c:901
 msgid "Key"
 msgstr "ØÙÙÙØØØ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:417
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:468
 msgid "Values"
 msgstr "ØÙÙÙÙ"
 
@@ -17126,7 +17253,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:125
+#: ../plugins/external-editor/external-editor.c:132
 msgid "Automatically launch when a new mail is edited"
 msgstr ""
 
@@ -17138,11 +17265,11 @@ msgstr "ØÙÙØØØ ØÙØØØØÙ ØÙØÙØØØØÙ"
 msgid "The default command that must be used as the editor."
 msgstr "ØÙØÙØ ØÙØÙØØØØÙ ØÙÙØØØ ØØØØØØÙÙ ÙÙØØØ."
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:121
 msgid "Command to be executed to launch the editor: "
 msgstr "ØÙØÙØ ÙÙÙÙÙØ ÙØØÙØÙ ØÙÙØØØ:"
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:122
 #, fuzzy
 msgid ""
 "For Emacs use \"xemacs\"\n"
@@ -17151,8 +17278,8 @@ msgstr ""
 "Ù Emacs ØØØØØÙ \"xemacs\"\n"
 "Ù VI ØØØØØÙ \"gvim\""
 
-#: ../plugins/external-editor/external-editor.c:381
-#: ../plugins/external-editor/external-editor.c:383
+#: ../plugins/external-editor/external-editor.c:402
+#: ../plugins/external-editor/external-editor.c:404
 #, fuzzy
 msgid "Compose in External Editor"
 msgstr "ØÙØØÙ ÙÙ ÙØØØ_ ØØØØÙ "
@@ -17209,25 +17336,25 @@ msgid ""
 "should be set before checking this, otherwise nothing happens."
 msgstr ""
 
-#: ../plugins/face/face.c:286
+#: ../plugins/face/face.c:292
 #, fuzzy
 msgid "Select a Face Picture"
 msgstr "ØÙØÙÙ ÙÙÙÙÙØ"
 
-#: ../plugins/face/face.c:296
+#: ../plugins/face/face.c:302
 #, fuzzy
 msgid "Image files"
 msgstr "ØØØÙØØØ ØÙÙÙÙØØ"
 
-#: ../plugins/face/face.c:352
+#: ../plugins/face/face.c:359
 msgid "_Insert Face picture by default"
 msgstr ""
 
-#: ../plugins/face/face.c:363
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr ""
 
-#: ../plugins/face/face.c:420
+#: ../plugins/face/face.c:429
 #, fuzzy
 msgid "Include _Face"
 msgstr "ØØÙÙÙ:"
@@ -17265,18 +17392,18 @@ msgstr "ÙÙ ÙÙÙÙ ØØØØÙ ØÙØÙØØ!\n"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
+#: ../plugins/google-account-setup/google-contacts-source.c:325
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 #, fuzzy
 msgid "Server"
 msgstr "ØÙ_ØØØÙÙ:"
 
-#: ../plugins/google-account-setup/google-source.c:438
+#: ../plugins/google-account-setup/google-source.c:459
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "ØØØÙ ÙÙÙØ ØØ ØÙÙØØØØÙ %s ÙÙÙÙØØ ÙÙØØÙØ ÙÙ ØÙØÙØÙÙÙ ØÙÙØØØÙÙ ØÙØ."
 
-#: ../plugins/google-account-setup/google-source.c:549
+#: ../plugins/google-account-setup/google-source.c:576
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17285,17 +17412,17 @@ msgstr ""
 "ÙØ ÙÙÙÙ ÙØØØØ ØÙØÙØÙØØ ÙÙ ØØØÙ ØÙØÙ.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:737
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/mail-to-task/mail-to-task.c:813
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Unknown error."
 msgstr "ØØØ ÙØÙÙÙ."
 
-#: ../plugins/google-account-setup/google-source.c:649
+#: ../plugins/google-account-setup/google-source.c:679
 msgid "Cal_endar:"
 msgstr "ØÙ_ØÙÙÙÙ:"
 
-#: ../plugins/google-account-setup/google-source.c:684
+#: ../plugins/google-account-setup/google-source.c:714
 #, fuzzy
 msgid "Retrieve _List"
 msgstr "_ÙØØÙØ ØÙØÙØ"
@@ -17309,501 +17436,51 @@ msgstr ""
 msgid "Google Calendars"
 msgstr "ØÙÙÙÙ ØÙÙÙ"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:453
-msgid "Checklist"
-msgstr "ÙØØÙØ ØØØ"
-
-#. Translators: First %s is the server name, second %s is user name
-#: ../plugins/groupwise-features/camel-gw-listener.c:513
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "ØØØÙ ÙÙÙØ ØÙØÙØ ÙÙ %s (ØÙÙØØØØÙ %s)"
-
-#: ../plugins/groupwise-features/camel-gw-listener.c:533
-msgid "Failed to authenticate.\n"
-msgstr "ÙØÙ ØÙØÙÙØÙÙ.\n"
-
-#: ../plugins/groupwise-features/gw-ui.c:112
-msgid "New _Shared Folder..."
-msgstr "ÙØÙØ Ù_ØØØÙ ØØÙØ..."
-
-#: ../plugins/groupwise-features/gw-ui.c:119
-msgid "_Proxy Login..."
-msgstr "ÙÙÙØ ØØÙÙ_ÙØÙØ..."
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline Image"
+msgstr "vCards ØØÙØØ"
 
-#: ../plugins/groupwise-features/gw-ui.c:170
-msgid "Junk Mail Settings..."
-msgstr "ØØØØØØØ ØØÙØ ØÙÙÙØÙØ..."
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr ""
 
-#: ../plugins/groupwise-features/gw-ui.c:177
-msgid "Track Message Status..."
-msgstr "ØØÙØ ØØÙØ ØÙØØØÙØ..."
+#: ../plugins/imap-features/imap-headers.c:337
+#: ../plugins/imap-features/imap-headers.ui.h:2
+msgid "Custom Headers"
+msgstr "ØØÙÙØØØ ÙØØØØ"
 
-#: ../plugins/groupwise-features/gw-ui.c:183
-msgid "Retract Mail"
-msgstr "ØØØ ØØÙØ"
+#: ../plugins/imap-features/imap-headers.c:349
+#: ../plugins/imap-features/imap-headers.ui.h:5
+msgid "IMAP Headers"
+msgstr "ØØÙÙØØØ IMAP"
 
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "ØÙØÙÙ"
+#: ../plugins/imap-features/imap-headers.ui.h:1
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr "ØÙØØÙÙØØØ ØÙØØØØÙØ ÙØØÙÙØØØ ØÙ_ÙÙØØÙ ØÙØØÙØÙØ (ØÙØÙØØØØÙ)"
 
-#: ../plugins/groupwise-features/gw-ui.c:338
-msgid "Accept Tentatively"
-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"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+"ØØØÙ ØÙØØÙÙØØØ ØÙØØØÙÙØ ØÙØÙ ØØÙØ ØÙØÙØ ØØÙØØØÙØ ÙÙØØÙÙØØØ ØÙÙØÙØØÙØ "
+"ØÙØØØÙØ. \n"
+"ÙÙÙÙÙ ØØØÙÙ ÙØØ ØÙ ØØØØØ \"ÙÙ ØÙØØÙÙØØØ\"."
 
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "ØØÙØ"
+#: ../plugins/imap-features/imap-headers.ui.h:6
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"The more headers you have the more time it will take to download."
+msgstr ""
+"ØÙØÙ ØÙØÙÙØØ ØØÙÙØØØ IMAP. \n"
+"ÙÙÙØ ØØØ ØØØ ØÙØØÙÙØØØ ØÙØÙ ØÙØÙÙÙØ ÙÙÙØ ØØØ ØÙÙÙØ ØÙØÙ ØÙØØØØÙÙ ØÙØÙÙÙØ."
 
-#: ../plugins/groupwise-features/gw-ui.c:352
+#: ../plugins/imap-features/imap-headers.ui.h:8
 #, fuzzy
-msgid "Rese_nd Meeting..."
-msgstr "_ÙÙÙØ ØØØÙØØ..."
-
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
-msgid "Create folder"
-msgstr "ØÙØØ ÙØÙÙØ"
-
-#: ../plugins/groupwise-features/install-shared.c:230
-#, fuzzy, c-format
 msgid ""
-"The user '%s' has shared a folder with you\n"
-"\n"
-"Message from '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Click 'Apply' to install the shared folder\n"
-"\n"
-msgstr ""
-"ØÙÙØØØØÙ '%s' ÙØ ØØØÙÙ ÙÙ ÙØÙØ\n"
-"\n"
-"ØØØÙØ ÙÙ '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"ØÙÙØ 'ØÙØÙ' ÙØØÙÙØ ØÙÙØÙØ ØÙÙØØØÙ\n"
-"\n"
-
-#: ../plugins/groupwise-features/install-shared.c:242
-msgid "Install the shared folder"
-msgstr "ØÙÙÙØ ØÙÙØÙØ ØÙÙØØØÙ"
-
-#: ../plugins/groupwise-features/install-shared.c:246
-msgid "Shared Folder Installation"
-msgstr "ØØÙÙØ ÙØÙØ ÙØØØÙ"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:82
-msgid "Junk Settings"
-msgstr "ØØØØØØ ØÙÙÙØÙØ"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:96
-#: ../plugins/groupwise-features/junk-settings.ui.h:3
-msgid "Junk Mail Settings"
-msgstr "ØØØØØØØ ØØÙØ ØÙÙÙØÙØ"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:1
-msgid "Email:"
-msgstr "ØÙØØÙØ ØÙØÙÙØØÙÙÙ:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:2
-#, fuzzy
-msgid "Junk List:"
-msgstr "ÙØØÙØ ØÙ_ÙÙØÙØØ"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:6
-msgid "_Enable"
-msgstr "_ØÙØÙÙ"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:7
-msgid "_Junk List"
-msgstr "ÙØØÙØ ØÙ_ÙÙØÙØØ"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:12
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "Ø_ØÙ"
-
-#: ../plugins/groupwise-features/mail-retract.c:81
-msgid "Message Retract"
-msgstr "ØØØ ØÙØØØÙØ"
-
-#: ../plugins/groupwise-features/mail-retract.c:90
-#, fuzzy
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
-msgstr "ØØØ ØØØÙØ ÙØ ÙØØÙÙØ ÙÙ ØÙØÙÙ ØØÙØ ØÙÙØØÙÙ. ØÙØØÙØ ÙÙ ØØØØÙ ØÙØØØ"
-
-#: ../plugins/groupwise-features/mail-retract.c:111
-msgid "Message retracted successfully"
-msgstr "ØÙ ØØØ ØÙØØØÙØ ØÙØØØ"
-
-#: ../plugins/groupwise-features/mail-send-options.c:202
-msgid "Insert Send options"
-msgstr "ØØØØ ØÙØØØØ ØÙØØØØÙ"
-
-#: ../plugins/groupwise-features/notification.ui.h:3
-#: ../plugins/groupwise-features/properties.ui.h:6
-msgid "The participants will receive the following notification.\n"
-msgstr "ØÙØØÙØÙ ØÙÙØØØÙÙÙ ØÙØÙØÙÙ ØÙØØÙ.\n"
-
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-#, fuzzy
-msgid "Add Send Options to GroupWise messages"
-msgstr "ØØÙÙ ØÙØØØØ ØÙØØØØÙ ÙØØØØÙ ØØÙØÙØÙØ"
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-#, fuzzy
-msgid "Fine-tune your GroupWise accounts."
-msgstr "ÙÙØÙ ÙÙØØÙØ ØØØØØØ ØØÙØÙØÙØ."
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-#, fuzzy
-msgid "GroupWise Features"
-msgstr "ÙÙØØØ ØØÙØÙØÙØ"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
-msgid "Message retract failed"
-msgstr "ÙØÙ ØØØ ØÙØØØÙØ"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
-msgid "The server did not allow the selected message to be retracted."
-msgstr "ÙÙ ÙØÙØ ØÙØØØÙ ØØØØ ØÙØØØÙØ ØÙÙØØØØ."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "ØÙØØØØ &quot;{0}&quot; ÙÙØÙØ ÙØØÙØ. ØØÙÙ ÙÙ ØØØØ ÙØÙØØØÙ."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "ØÙØØØØ ÙÙØÙØ ÙØØÙØ"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
-msgid "Invalid user"
-msgstr "ÙØØØØÙ ØÙØ ØØÙØ"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"ØÙÙÙÙØ ÙÙÙØÙØ Ù &quot;{0}&quot; ÙØÙ ÙØØÙØ. ØØÙÙ ÙÙ ØÙÙØÙ ØØÙØÙ Ù ØØÙÙ ÙØØØØ."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
-msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "ÙØ ÙÙÙÙ ØØØØØ ØÙÙÙØØ ØÙÙ ØÙÙØÙØ ÙÙÙØØØØÙ &quot;{0}&quot;"
-
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
-msgid "Specify User"
-msgstr "ØØØ ÙØØØØÙØ"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
-msgid "You have already given proxy permissions to this user."
-msgstr "ØØÙ ØÙ ØØØÙØ ØØÙÙ ØÙÙØÙØ ÙÙØØ ØÙÙØØØØÙ."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
-msgid "You have to specify a valid user name to give proxy rights."
-msgstr "ØÙÙÙ ØØØÙØ ØØÙ ÙØØØØÙ ØØÙØ ÙØØØØØÙ ØÙØÙÙÙ ÙÙÙØÙØ."
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
-#, fuzzy
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "ÙØ ÙÙÙÙÙ ÙØØØÙØ ØÙÙØÙØ ÙØ ØÙÙØØØØÙ ØÙÙØØØ &quot;{0}&quot;"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
-#, fuzzy
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "ØÙÙÙ ØØØÙØ ØØÙ ØÙÙØØØØÙ ØÙØÙ ØØØØ ØØØØÙØÙ ÙÙÙØØÙØ"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-#, fuzzy
-msgid "Do you want to resend the meeting?"
-msgstr "ØÙØØÙØ ØÙÙ ØØØØ ÙÙ ØØÙ ÙØØ ØÙØØØÙØØØ"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-#, fuzzy
-msgid "Do you want to resend the recurring meeting?"
-msgstr "ØÙØØÙØ ØÙÙ ØØØØ ÙÙ ØØÙ ÙØØ ØÙØØØÙØØØ"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-#, fuzzy
-msgid "Do you want to retract the original item?"
-msgstr "ØØØØØ ÙÙ ØØØØØØØ ØÙØØØØÙ ØÙØ ØÙÙÙØÙÙØØ"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
-#, fuzzy
-msgid "The original will be removed from the recipient's mailbox."
-msgstr "_ØØÙ ÙØØ ØÙØÙØØ ÙÙ ÙÙ ØÙØØÙÙ ØØÙØ ØÙÙØØÙÙÙÙØ"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
-msgid "This is a recurring meeting"
-msgstr "ÙØØ ÙÙØØ ÙØÙØØ"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
-msgid "This will create a new meeting using the existing meeting details."
-msgstr ""
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid ""
-"This will create a new meeting with the existing meeting details. The "
-"recurrence rule needs to be re-entered."
-msgstr ""
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
-msgid "Would you like to accept it?"
-msgstr "ØØØØØ ØÙØÙÙÙØ"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
-msgid "Would you like to decline it?"
-msgstr "ØØØØØ ØØÙØÙØ"
-
-#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "C_ustomize notification message"
-msgstr "Ø_ØÙØ ØØØÙØ ØÙØØØØØ"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
-msgid "Con_tacts..."
-msgstr "ØÙÙØØØØÙÙÙ..."
-
-#: ../plugins/groupwise-features/properties.ui.h:4
-msgid "Shared Folder Notification"
-msgstr "ØØØØØ ÙØÙÙØ ÙØØØÙ"
-
-#: ../plugins/groupwise-features/properties.ui.h:8
-#, fuzzy
-msgid "Users:"
-msgstr "ÙØØØØÙÙÙ"
-
-#: ../plugins/groupwise-features/properties.ui.h:11
-msgid "_Not Shared"
-msgstr "_ØÙØ ÙØØØÙ"
-
-#: ../plugins/groupwise-features/properties.ui.h:13
-msgid "_Shared With..."
-msgstr "_ÙØØØÙ ÙØ ..."
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
-msgid "Access Rights"
-msgstr "ØÙÙÙ ØÙÙÙØØ"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
-msgid "Add/Edit"
-msgstr "ØØÙÙ/ØØØ"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
-msgid "Con_tacts"
-msgstr "ØÙÙ_ØØØÙÙÙÙ"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
-msgid "Modify _folders/options/rules/"
-msgstr "ØØØÙÙ ØÙÙ_ØÙØØØ/ØÙØÙØØØØ/ØÙÙÙØØØ/"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
-msgid "Read items marked _private"
-msgstr "ØÙØØ ØÙØÙØØØ ØØØ ØÙØÙØ \"ØØØ\""
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
-msgid "Reminder Notes"
-msgstr "ÙÙØØØØØ ØØÙÙØÙØ"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
-msgid "Subscribe to my _alarms"
-msgstr "ØØØØÙ ÙÙ _ÙÙØÙØØÙ"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
-msgid "Subscribe to my _notifications"
-msgstr "ØØØØÙ ÙÙ Ø_ØØØØØØÙ"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
-msgid "_Write"
-msgstr "_ÙØØØØ"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
-msgid "permission to read|_Read"
-msgstr "ØÙØÙØØ ØØÙÙØØØØ|_ØÙØØ"
-
-#: ../plugins/groupwise-features/proxy-listing.ui.h:1
-msgid "Proxy"
-msgstr "ØØØÙÙ ÙÙÙÙ"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:239
-#, fuzzy
-msgid "Account Name"
-msgstr "ØØÙ ØÙØØØØ"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
-msgid "Proxy Login"
-msgstr "ØÙÙÙÙØ ØØØ ÙÙÙÙ"
-
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:494
-#: ../plugins/groupwise-features/send-options.c:84
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s ØØØÙ ÙÙÙØ ØÙØÙØ ÙÙ %s (ØÙÙØØØØÙ %s)"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
-msgid "The Proxy tab will be available only when the account is online."
-msgstr "ÙØ ÙØÙÙØ ØØÙÙØ ØÙÙÙÙÙ ØÙØ ØÙØÙØ ÙÙÙÙ ØÙØØØØ ÙØØÙÙØ."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:704
-msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "ÙØ ÙØÙÙØ ØØÙÙØ ØÙÙÙÙÙ ØÙØ ØÙØÙØ ÙÙÙÙ ØÙØØØØ ÙÙØÙÙØ."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:709
-#, fuzzy
-msgctxt "GW"
-msgid "Proxy"
-msgstr "ØØØÙÙ ÙÙÙÙ"
-
-#: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:694
-msgid "Add User"
-msgstr "ØØÙÙ ÙØØØØÙ"
-
-#: ../plugins/groupwise-features/send-options.c:214
-#, fuzzy
-msgid "Advanced send options"
-msgstr "ØØØØ ØÙØØØØ ØØØØÙ ÙØÙØÙØ"
-
-#: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:729
-msgid "Users"
-msgstr "ÙØØØØÙÙÙ"
-
-#: ../plugins/groupwise-features/share-folder-common.c:317
-msgid "Enter the users and set permissions"
-msgstr "ØØØÙ ØÙÙØØØØÙÙÙ ÙØÙÙ ØÙØØØØÙØ"
-
-#: ../plugins/groupwise-features/share-folder-common.c:418
-msgid "Sharing"
-msgstr "ÙØØØÙØ"
-
-#: ../plugins/groupwise-features/share-folder.c:532
-msgid "Custom Notification"
-msgstr "ØØØØØ ÙØØØ"
-
-#: ../plugins/groupwise-features/share-folder.c:734
-msgid "Add   "
-msgstr "Ø_ØÙ"
-
-#: ../plugins/groupwise-features/share-folder.c:740
-msgid "Modify"
-msgstr "ØÙÙÙØ"
-
-#: ../plugins/groupwise-features/status-track.c:125
-msgid "Message Status"
-msgstr "ØØÙØ ØÙØØØÙØ"
-
-#. Subject
-#: ../plugins/groupwise-features/status-track.c:139
-msgid "Subject:"
-msgstr "ØÙÙÙØÙØ:"
-
-#: ../plugins/groupwise-features/status-track.c:153
-msgid "From:"
-msgstr "ÙÙ:"
-
-#: ../plugins/groupwise-features/status-track.c:168
-msgid "Creation date:"
-msgstr "ØØØÙØ ØÙØÙØØØ:"
-
-#: ../plugins/groupwise-features/status-track.c:208
-msgid "Recipient: "
-msgstr "ØÙÙØØÙÙÙ: "
-
-#: ../plugins/groupwise-features/status-track.c:215
-msgid "Delivered: "
-msgstr "ØÙÙÙÙÙÙØ: "
-
-#: ../plugins/groupwise-features/status-track.c:221
-msgid "Opened: "
-msgstr "ÙÙÙØØØ: "
-
-#: ../plugins/groupwise-features/status-track.c:226
-msgid "Accepted: "
-msgstr "ÙÙÙØÙØ: "
-
-#: ../plugins/groupwise-features/status-track.c:231
-msgid "Deleted: "
-msgstr "ØÙØÙØ: "
-
-#: ../plugins/groupwise-features/status-track.c:236
-msgid "Declined: "
-msgstr "ØÙÙØØ: "
-
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Completed: "
-msgstr "ØÙÙÙÙØ: "
-
-#: ../plugins/groupwise-features/status-track.c:246
-msgid "Undelivered: "
-msgstr "ÙÙ ØÙÙØÙÙÙ: "
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-#, fuzzy
-msgid "Inline Image"
-msgstr "vCards ØØÙØØ"
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.c:329
-#: ../plugins/imap-features/imap-headers.ui.h:2
-msgid "Custom Headers"
-msgstr "ØØÙÙØØØ ÙØØØØ"
-
-#: ../plugins/imap-features/imap-headers.c:342
-#: ../plugins/imap-features/imap-headers.ui.h:5
-msgid "IMAP Headers"
-msgstr "ØØÙÙØØØ IMAP"
-
-#: ../plugins/imap-features/imap-headers.ui.h:1
-msgid "Basic and _Mailing List Headers (Default)"
-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"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-"ØØØÙ ØÙØØÙÙØØØ ØÙØØØÙÙØ ØÙØÙ ØØÙØ ØÙØÙØ ØØÙØØØÙØ ÙÙØØÙÙØØØ ØÙÙØÙØØÙØ "
-"ØÙØØØÙØ. \n"
-"ÙÙÙÙÙ ØØØÙÙ ÙØØ ØÙ ØØØØØ \"ÙÙ ØÙØØÙÙØØØ\"."
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
-msgid ""
-"Select your IMAP Header Preferences. \n"
-"The more headers you have the more time it will take to download."
-msgstr ""
-"ØÙØÙ ØÙØÙÙØØ ØØÙÙØØØ IMAP. \n"
-"ÙÙÙØ ØØØ ØØØ ØÙØØÙÙØØØ ØÙØÙ ØÙØÙÙÙØ ÙÙÙØ ØØØ ØÙÙÙØ ØÙØÙ ØÙØØØØÙÙ ØÙØÙÙÙØ."
-
-#: ../plugins/imap-features/imap-headers.ui.h:8
-msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "ØØÙÙØØØ Ø_ØØØÙØ - (ØÙØØØØ) \n"
@@ -17823,18 +17500,18 @@ msgid "IMAP Features"
 msgstr "ÙÙØØØ IMAP"
 
 #. Translators: The first '%s' is replaced with a calendar name,
-#. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#. * the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:499
 #, fuzzy, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "ÙØÙ ØØÙÙÙ ØÙØÙÙÙÙ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:654
+#: ../plugins/itip-formatter/itip-formatter.c:659
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "ÙÙØØ ÙÙ ØÙØÙÙÙÙ '%s' ÙØØØØØ ÙØ ÙØØ ØÙØØØÙØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:683
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "ØÙ ØÙØØØ ØÙÙÙØØ ÙÙ ØÙØÙÙÙÙ '%s'"
@@ -17855,130 +17532,130 @@ msgstr "ØÙØ ÙØØØ ØÙÙ ØÙØØØ ÙØÙ ØÙÙÙÙØ ÙÙ ØÙ ÙØØÙ
 msgid "Unable to find this memo in any memo list"
 msgstr "ØÙØ ÙØØØ ØÙÙ ØÙØØØ ÙØÙ ØÙÙØÙØØ ÙÙ ØÙ ÙØØÙØ ÙØÙØØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
+#: ../plugins/itip-formatter/itip-formatter.c:1082
 #, fuzzy
-msgid "Opening the calendar. Please wait.."
+msgid "Opening the calendar. Please wait..."
 msgstr "ÙØØ ØÙØÙÙÙÙ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:883
+#: ../plugins/itip-formatter/itip-formatter.c:1085
 msgid "Searching for an existing version of this appointment"
 msgstr "ÙØØÙ ØÙØØØ ØÙ ØØØØØ ÙÙØÙØ ÙÙ ÙØØ ØÙÙÙØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1166
+#: ../plugins/itip-formatter/itip-formatter.c:1362
 msgid "Unable to parse item"
 msgstr "ØÙØ ÙØØØ ØÙÙ ØØÙÙÙ ØÙØÙØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ØÙØ ÙØØØ ØÙÙ ØØØØÙ ØÙØÙØØ ØÙÙ ØÙØÙÙÙÙ '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ØÙØØÙÙÙ ÙÙØÙÙÙÙ '%s' ÙÙÙØÙÙ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1467
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ØÙØØÙÙÙ ÙÙØÙÙÙÙ '%s' ÙØÙØ ÙÙØØÙ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1472
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ØÙØØÙÙÙ ÙÙØÙÙÙÙ '%s' ÙÙØÙÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1477
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ØÙØØÙÙÙ ÙÙØÙÙÙÙ '%s' ÙÙÙØÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1579
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ØÙÙÙØÙÙ ÙØ ØØØÙ ØÙÙÙÙÙÙÙÙØÙ %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ØÙØØÙÙÙØ ÙØÙØØ ØØÙØÙØØØ ÙÙÙÙÙÙÙÙÙØÙ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ØÙØ ÙØØØ ØÙÙ ØØØØÙ ÙØÙØØ ØØÙØÙØØØ ÙÙÙÙÙÙÙÙÙØÙ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1495
+#: ../plugins/itip-formatter/itip-formatter.c:1700
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ÙØ ÙÙÙÙ ØØØÙØ ØØÙØ ØÙØØØØ ÙØÙ ØÙØØÙØ ØÙØ ØØÙØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1729
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ØÙØ ÙØØØ ØÙÙ ØØØÙØ ØÙØØØØ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1528
+#: ../plugins/itip-formatter/itip-formatter.c:1733
 msgid "Attendee status updated"
 msgstr "ØÙ ØØØÙØ ÙØÙÙÙØØ ØÙØØØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1532
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ÙØ ÙÙÙÙ ØØØÙØ ØØÙØ ØÙØØØØ ÙØÙÙ ØÙØÙØØ ÙÙ ÙØØ ÙÙØÙØÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1554
+#: ../plugins/itip-formatter/itip-formatter.c:1759
 msgid "Meeting information sent"
 msgstr "ØÙØØÙÙØ ÙØÙÙÙØØ ØÙØØØÙØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "Task information sent"
 msgstr "ØÙØØÙÙØ ÙØÙÙÙØØ ØÙÙÙÙÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1560
+#: ../plugins/itip-formatter/itip-formatter.c:1765
 msgid "Memo information sent"
 msgstr "ØÙØØÙÙØ ÙØÙÙÙØØ ØÙÙØÙØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1569
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ØØØØ ØØØØÙ ÙØÙÙÙØØ ØÙØØØÙØØØ ØÙØØØÙØØ ØÙØ ÙÙØÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "Unable to send task information, the task does not exist"
 msgstr "ØØØØ ØØØØÙ ÙØÙÙÙØØ ØÙÙÙÙØØ ØÙÙÙÙØ ØÙØ ÙÙØÙØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1780
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ØØØØ ØØØØÙ ÙØÙÙÙØØ ØÙÙØÙØØØ ØÙÙØÙØØ ØÙØ ÙÙØÙØØ"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1846
 #, fuzzy
 msgid "calendar.ics"
 msgstr "ØÙØÙÙÙÙØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1645
+#: ../plugins/itip-formatter/itip-formatter.c:1851
 #, fuzzy
 msgid "Save Calendar"
 msgstr "ØÙÙÙÙ ØØÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1703
-#: ../plugins/itip-formatter/itip-formatter.c:1714
+#: ../plugins/itip-formatter/itip-formatter.c:1914
+#: ../plugins/itip-formatter/itip-formatter.c:1925
 msgid "The calendar attached is not valid"
 msgstr "ØÙØÙÙÙÙ ØÙÙØÙÙ ØÙØ ØØÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1704
-#: ../plugins/itip-formatter/itip-formatter.c:1715
+#: ../plugins/itip-formatter/itip-formatter.c:1915
+#: ../plugins/itip-formatter/itip-formatter.c:1926
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ØØØÙ ØÙØØØÙØ ØÙÙØ ØØØÙÙ ØÙÙÙÙÙØØ ÙÙÙ ØÙØÙÙÙÙ ÙÙØ ØÙÙØØ iCalendar ØØÙØØ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1755
-#: ../plugins/itip-formatter/itip-formatter.c:1783
-#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1966
+#: ../plugins/itip-formatter/itip-formatter.c:1994
+#: ../plugins/itip-formatter/itip-formatter.c:2103
 msgid "The item in the calendar is not valid"
 msgstr "ØÙØÙØØ ÙÙ ØÙØÙÙÙÙ ØÙØ ØØÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1756
-#: ../plugins/itip-formatter/itip-formatter.c:1784
-#: ../plugins/itip-formatter/itip-formatter.c:1893
+#: ../plugins/itip-formatter/itip-formatter.c:1967
+#: ../plugins/itip-formatter/itip-formatter.c:1995
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17986,92 +17663,97 @@ msgstr ""
 "ØÙØØØÙØ ØØØÙÙ ØÙÙ ØÙÙÙÙØ ÙÙÙ ÙØØ ØÙØÙÙÙÙ ÙØ ÙØØÙÙ ØÙÙ ØÙ ØØØØØ ØÙ ÙÙØÙ ØÙ "
 "ÙØÙÙÙØØ ÙØÙÙØ/ÙØØÙÙ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../plugins/itip-formatter/itip-formatter.c:2008
 msgid "The calendar attached contains multiple items"
 msgstr "ØÙØÙÙÙÙ ØÙÙØÙÙ ÙØØÙÙ ØÙÙ ØØØ ØÙØØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1798
+#: ../plugins/itip-formatter/itip-formatter.c:2009
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "ÙÙØØÙØØ ÙÙ ÙØÙ ØÙØÙØØØØ ÙØØ ØÙØ ØÙÙÙÙ ÙØØØÙØØØ ØÙØÙÙÙÙ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2672
 #, fuzzy
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ÙØ ØÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2476
+#: ../plugins/itip-formatter/itip-formatter.c:2688
 msgid "Tentatively Accepted"
 msgstr "ÙÙØÙÙ ÙØØØÙÙÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2594
+#: ../plugins/itip-formatter/itip-formatter.c:2806
 msgid "This meeting recurs"
 msgstr "ÙØØ ØÙÙÙØØ ÙØÙØÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2597
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "This task recurs"
 msgstr "ÙØÙ ØÙÙÙÙØ ÙØÙØÙØØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2600
+#: ../plugins/itip-formatter/itip-formatter.c:2812
 msgid "This memo recurs"
 msgstr "ÙØÙ ØÙÙØÙØØ ÙØÙØÙØØ"
 
+#: ../plugins/itip-formatter/itip-formatter.c:3036
+#, fuzzy
+msgid "Meeting Invitations"
+msgstr "ØÙØØÙÙØ ÙØÙÙÙØØ ØÙØØØÙØØ"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2834
+#: ../plugins/itip-formatter/itip-formatter.c:3061
 msgid "_Delete message after acting"
 msgstr "ØØØÙ ØÙØØØÙØ ØØØ ØÙØ_ØØÙÙ ÙØÙØ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2844
-#: ../plugins/itip-formatter/itip-formatter.c:2877
+#: ../plugins/itip-formatter/itip-formatter.c:3071
+#: ../plugins/itip-formatter/itip-formatter.c:3104
 msgid "Conflict Search"
 msgstr "ØØØ ØÙ ØØØØØ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2859
+#: ../plugins/itip-formatter/itip-formatter.c:3086
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ØÙØÙ ØÙÙÙÙØØ ÙÙØØØ ÙÙ ØÙ ØØØØØØØ ØÙÙÙØØÙØ"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "ØÙÙÙÙ %H:%M"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "ØÙÙÙÙ %H:%M:%S"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "ØÙÙÙÙ %l:%M:%S %p"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "ØØØ %H:%M"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "ØØØ %H:%M:%S"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
+#. * in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "ØØØ %l:%M %p"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "ØØØ %l:%M:%S %p"
@@ -18083,56 +17765,56 @@ msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
-#. without a year.
+#. * without a year.
 #: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
-#. without a year and a time,
-#. in 24-hour format, without seconds.
+#. * 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 "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 24-hour format.
+#. * and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format, without seconds.
+#. * and a time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format.
+#. * and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
@@ -18143,374 +17825,371 @@ msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:362
-#: ../plugins/itip-formatter/itip-view.c:363
-#: ../plugins/itip-formatter/itip-view.c:450
-#: ../plugins/itip-formatter/itip-view.c:451
-#: ../plugins/itip-formatter/itip-view.c:538
+#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:540
 msgid "An unknown person"
 msgstr "ØØØ ÙØÙÙÙ"
 
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:542
-#, fuzzy, c-format
-msgid "Please respond on behalf of %s"
-msgstr "ØØØØÙ ØÙØÙ ØØØÙ <b>%s</b>"
-
 #: ../plugins/itip-formatter/itip-view.c:369
 #: ../plugins/itip-formatter/itip-view.c:457
 #: ../plugins/itip-formatter/itip-view.c:544
-#, fuzzy, c-format
+#, c-format
+msgid "Please respond on behalf of %s"
+msgstr "ØØØØÙ ØÙØÙ ØØØÙ %s"
+
+#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:546
+#, c-format
 msgid "Received on behalf of %s"
-msgstr "ÙØØÙÙØ ØØØÙ <b>%s</b>"
+msgstr "ÙØØÙÙØ ØØØÙ %s"
 
-#: ../plugins/itip-formatter/itip-view.c:374
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:376
+#, c-format
 msgid "%s through %s has published the following meeting information:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØ ÙØØ ÙØÙÙÙØØ ØÙØØØÙØØ ØÙØØÙØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØ ÙØØ ÙØÙÙÙØØ ØÙØØØÙØØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:378
+#, c-format
 msgid "%s has published the following meeting information:"
-msgstr "<b>%s</b> ÙØ ÙØØ ÙØÙÙÙØØ ØÙØØØÙØØ ØÙØØÙØ:"
+msgstr "%s ÙØ ÙØØ ÙØÙÙÙØØ ØÙØØØÙØØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
 msgid "%s has delegated the following meeting to you:"
-msgstr "<b>%s</b> ÙØ ÙÙÙÙÙØÙÙ ÙØØÙØ ØÙØØØÙØØ ØÙØØÙ:"
+msgstr "%s ÙØ ÙÙÙÙÙØÙÙ ÙØØÙØ ØÙØØØÙØØ ØÙØØÙ:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:386
+#, c-format
 msgid "%s through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> ÙØÙØ ØØÙØÙ ØÙØØØÙØØ ØÙØØÙ ØÙ ØØÙÙ %s:"
+msgstr "%s ÙØÙØ ØØÙØÙ ØÙØØØÙØØ ØÙØØÙ ØÙ ØØÙÙ %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:388
+#, c-format
 msgid "%s requests your presence at the following meeting:"
-msgstr "<b>%s</b> ÙØÙØ ØØÙØÙ ØÙØØØÙØØ ØÙØØÙ:"
+msgstr "%s ÙØÙØ ØØÙØÙ ØÙØØØÙØØ ØÙØØÙ:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:394
+#, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> %s ÙØØØ ÙÙ ØÙØØØÙØ ÙØØØÙØØ ÙÙØÙØ ØÙ ØØÙÙ:"
+msgstr "ÙØÙØ %s ÙÙ ØÙØØØÙØ ÙØØØÙØØ ÙÙØÙØ ØÙ ØØÙÙ %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:396
+#, c-format
 msgid "%s wishes to add to an existing meeting:"
-msgstr "ÙÙØ <b>%s</b> ØÙØØØÙØ ØÙÙ ØØØÙØØ ÙÙØÙØ."
+msgstr "ÙØÙØ %s ØÙØØØÙØ ØÙÙ ØØØÙØØ ÙÙØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:400
+#, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØØØ ÙÙ ØØØÙØØÙ ØØØ ØÙÙØÙÙÙØØ ØÙ ØÙØØØÙØØ ØÙØØÙ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØØØ ÙÙ ØØØÙØØÙ ØØØ ØÙÙØÙÙÙØØ ØÙ ØÙØØØÙØØ ØÙØØÙ:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:402
+#, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> ÙØØØ ÙÙ ØØØÙØØÙ ØØØ ØÙÙØÙÙÙØØ ØÙ ØÙØØØÙØØ ØÙØØÙ:"
+msgstr "%s ÙØØØ ÙÙ ØØØÙØØÙ ØØØ ØÙÙØÙÙÙØØ ØÙ ØÙØØØÙØØ ØÙØØÙ:"
 
-#: ../plugins/itip-formatter/itip-view.c:404
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:406
+#, c-format
 msgid "%s through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØ ØØØÙ ØØÙ ØÙØØØÙØØ ØÙØØÙÙ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØ ØØØÙ ØØÙ ØÙØØØÙØØ ØÙØØÙÙ:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:408
+#, c-format
 msgid "%s has sent back the following meeting response:"
-msgstr "<b>%s</b> ÙØ ØØØÙ ØØÙ ØÙØØØÙØØ ØÙØØÙÙ:"
+msgstr "%s ÙØ ØØØÙ ØØÙ ØÙØØØÙØØ ØÙØØÙÙ:"
 
-#: ../plugins/itip-formatter/itip-view.c:410
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:412
+#, c-format
 msgid "%s through %s has canceled the following meeting:"
-msgstr "<b>%s</b> ÙØ ØÙØÙ ØÙØØØÙØØ ØÙØØÙ ØÙ ØØÙÙ %s."
+msgstr "%s ÙØ ØÙØÙ ØÙØØØÙØØ ØÙØØÙ ØÙ ØØÙÙ %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:414
+#, c-format
 msgid "%s has canceled the following meeting."
-msgstr "<b>%s</b> ÙØ ØÙØÙ ØÙØØØÙØØ ØÙØØÙ."
+msgstr "%s ÙØ ØÙØÙ ØÙØØØÙØØ ØÙØØÙ."
 
-#: ../plugins/itip-formatter/itip-view.c:416
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:418
+#, c-format
 msgid "%s through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØ ØÙØØØ ØØÙÙØØØ ØÙØØØÙØØ ØÙØØÙØ."
+msgstr "%s ØÙ ØØÙÙ %s ÙØ ØÙØØØ ØØÙÙØØØ ØÙØØØÙØØ ØÙØØÙØ."
 
-#: ../plugins/itip-formatter/itip-view.c:418
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:420
+#, c-format
 msgid "%s has proposed the following meeting changes."
-msgstr "<b>%s</b> ÙØ ØÙØØØ ØØÙÙØØØ ØÙØØØÙØØ ØÙØØÙØ."
+msgstr "%s ÙØ ØÙØØØ ØØÙÙØØØ ØÙØØØÙØØ ØÙØØÙØ."
 
-#: ../plugins/itip-formatter/itip-view.c:422
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:424
+#, c-format
 msgid "%s through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> ÙØ ØÙØ ØÙ ØØÙÙ %s ØØÙØØØ ØÙØØØÙØØ ØÙØØÙØ:"
+msgstr "%s ÙØ ØÙØ ØÙ ØØÙÙ %s ØØÙØØØ ØÙØØØÙØØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:426
+#, c-format
 msgid "%s has declined the following meeting changes."
-msgstr "<b>%s</b> ÙØ ØÙØ ØØÙÙØØØ ØÙØØØÙØØ ØÙØØÙØ."
+msgstr "%s ÙØ ØÙØ ØØÙÙØØØ ØÙØØØÙØØ ØÙØØÙØ."
 
-#: ../plugins/itip-formatter/itip-view.c:462
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:464
+#, c-format
 msgid "%s through %s has published the following task:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØ ÙØØ ØÙÙÙÙØ ØÙØØÙØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØ ÙØØ ØÙÙÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:466
+#, c-format
 msgid "%s has published the following task:"
-msgstr "<b>%s</b> ÙØ ÙØØ ØÙÙÙÙØ ØÙØØÙØ:"
+msgstr "%s ÙØ ÙØØ ØÙÙÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:471
+#, c-format
 msgid "%s requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> ÙØÙØ ØØÙÙÙ %s ÙÙÙÙØÙ ØØÙÙÙÙØ ØÙØØÙØ:"
+msgstr "%s ÙØÙØ ØØÙÙÙ %s ÙÙÙÙØÙ ØØÙÙÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:474
+#, c-format
 msgid "%s through %s has assigned you a task:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØ ØÙÙÙ ÙÙÙÙØÙ ØØÙÙÙÙØ ØÙØØÙØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØ ØÙÙÙ ÙÙÙÙØÙ ØØÙÙÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:476
+#, c-format
 msgid "%s has assigned you a task:"
-msgstr "<b>%s</b> ÙØ ØÙÙÙ ÙÙÙÙØÙ ØØÙÙÙÙØ ØÙØØÙØ:"
+msgstr "%s ÙØ ØÙÙÙ ÙÙÙÙØÙ ØØÙÙÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:482
+#, c-format
 msgid "%s through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØØØ ÙÙ ØÙØØØÙØ ØÙÙ ÙÙÙØ ÙÙØÙØØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØØØ ÙÙ ØÙØØØÙØ ØÙÙ ÙÙÙØ ÙÙØÙØØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:484
+#, c-format
 msgid "%s wishes to add to an existing task:"
-msgstr "<b>%s</b> ÙØØØ ÙÙ ØÙØØØÙØ ØÙÙ ÙÙÙØ ÙÙØÙØØ:"
+msgstr "%s ÙØØØ ÙÙ ØÙØØØÙØ ØÙÙ ÙÙÙØ ÙÙØÙØØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:488
+#, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
-msgstr ""
-"<b>%s</b> ØÙ ØØÙÙ %s ÙØØØ ÙÙ ØØØÙØØÙ ØØØ ØÙÙØÙÙÙØØ ØÙ ØÙÙÙÙØ ØÙÙØÙÙØ ØÙØØÙØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØØØ ÙÙ ØØØÙØØÙ ØØØ ØÙÙØÙÙÙØØ ØÙ ØÙÙÙÙØ ØÙÙØÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:490
+#, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
-msgstr "<b>%s</b> ÙØØØ ÙÙ ØØØÙØØÙ ØØØ ØÙÙØÙÙÙØØ ØÙ ØÙÙÙÙØ ØÙÙØÙÙØ ØÙØØÙØ:"
+msgstr "%s ÙØØØ ÙÙ ØØØÙØØÙ ØØØ ØÙÙØÙÙÙØØ ØÙ ØÙÙÙÙØ ØÙÙØÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:494
+#, c-format
 msgid "%s through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØ ØØØÙ ØÙØØ ØÙØØÙ ØÙÙ ØÙÙÙÙØ ØÙÙØÙÙØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØ ØØØÙ ØÙØØ ØÙØØÙ ØÙÙ ØÙÙÙÙØ ØÙÙØÙÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:496
+#, c-format
 msgid "%s has sent back the following assigned task response:"
-msgstr "<b>%s</b> ÙØ ØØØÙ ØÙØØ ØÙØØÙ ØÙÙ ØÙÙÙÙØ ØÙÙØÙÙØ:"
+msgstr "%s ÙØ ØØØÙ ØÙØØ ØÙØØÙ ØÙÙ ØÙÙÙÙØ ØÙÙØÙÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:500
+#, c-format
 msgid "%s through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØ ØÙØÙ ØÙÙÙÙØ ØÙÙØÙÙØ ØÙØØÙØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØ ØÙØÙ ØÙÙÙÙØ ØÙÙØÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:502
+#, c-format
 msgid "%s has canceled the following assigned task:"
-msgstr "<b>%s</b> ÙØ ØÙØÙ ØÙÙÙÙØ ØÙÙØÙÙØ ØÙØØÙØ:"
+msgstr "%s ÙØ ØÙØÙ ØÙÙÙÙØ ØÙÙØÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:504
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:506
+#, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØ ØÙØØØ ØÙØØÙÙØØØ ØÙØØÙØ ÙØØØØØØØ ØÙÙÙÙØØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØ ØÙØØØ ØÙØØÙÙØØØ ØÙØØÙØ ÙØØØØØØØ ØÙÙÙÙØØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:506
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:508
+#, c-format
 msgid "%s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ÙØ ØÙØØØ ØÙØØÙÙØØØ ØÙØØÙØ ÙØØØØØØØ ØÙÙÙÙØØ:"
+msgstr "%s ÙØ ØÙØØØ ØÙØØÙÙØØØ ØÙØØÙØ ÙØØØØØØØ ØÙÙÙÙØØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:510
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
 msgid "%s through %s has declined the following assigned task:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØ ØÙØ ØÙÙÙÙØ ØÙÙØÙÙØ ØÙØØÙØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØ ØÙØ ØÙÙÙÙØ ØÙÙØÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:512
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:514
+#, c-format
 msgid "%s has declined the following assigned task:"
-msgstr "<b>%s</b> ÙØ ØÙØ ØÙÙÙÙØ ØÙØØÙØ ØÙØÙ ØÙ ØØÙÙÙÙØ ØÙÙÙ:"
+msgstr "%s ÙØ ØÙØ ØÙÙÙÙØ ØÙØØÙØ ØÙØÙ ØÙ ØØÙÙÙÙØ ØÙÙÙ:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:551
+#, c-format
 msgid "%s through %s has published the following memo:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØ ÙØØ ØÙØØÙÙØØ ØÙØØÙØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØ ÙØØ ØÙØØÙÙØØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:551
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:553
+#, c-format
 msgid "%s has published the following memo:"
-msgstr "<b>%s</b> ÙØ ÙØØ ØÙØØÙÙØØ ØÙØØÙØ:"
+msgstr "%s ÙØ ÙØØ ØÙØØÙÙØØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:556
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:558
+#, c-format
 msgid "%s through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØØØ ÙÙ ØÙØØØÙØ ØÙÙ ØØÙÙØØ ÙÙØÙØØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØØØ ÙÙ ØÙØØØÙØ ØÙÙ ØØÙÙØØ ÙÙØÙØØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:558
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:560
+#, c-format
 msgid "%s wishes to add to an existing memo:"
-msgstr "<b>%s</b> ÙØØØ ÙÙ ØÙØØØÙØ ØÙÙ ØØÙÙØØ ÙÙØÙØØ:"
+msgstr "%s ÙØØØ ÙÙ ØÙØØØÙØ ØÙÙ ØØÙÙØØ ÙÙØÙØØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:562
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
 msgid "%s through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> ØÙ ØØÙÙ %s ÙØ ØÙØÙ ØÙØØÙÙØØ ØÙÙÙØØØÙÙØ ØÙØØÙØ:"
+msgstr "%s ØÙ ØØÙÙ %s ÙØ ØÙØÙ ØÙØØÙÙØØ ØÙÙÙØØØÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:564
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:566
+#, c-format
 msgid "%s has canceled the following shared memo:"
-msgstr "<b>%s</b> ÙØ ØÙØÙ ØÙØØÙÙØØ ØÙÙÙØØØÙÙØ ØÙØØÙØ:"
+msgstr "%s ÙØ ØÙØÙ ØÙØØÙÙØØ ØÙÙÙØØØÙÙØ ØÙØØÙØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:688
+#: ../plugins/itip-formatter/itip-view.c:690
 msgid "All day:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:698
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:700
 msgid "Start day:"
 msgstr "ØØØÙØ ØÙ_ØØØ:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Start time:"
 msgstr "ØÙÙ ØÙ_ØØØ:"
 
-#: ../plugins/itip-formatter/itip-view.c:710
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:712
 msgid "End day:"
-msgstr "ÙÙÙ ÙØØØ"
+msgstr "ØØØÙØ ØÙØÙØÙØØ:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "End time:"
-msgstr "ØÙÙ ØÙØ_ÙØÙØØ:"
+msgstr "ØÙÙ ØÙØ_ÙØÙØØ:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Open Calendar"
 msgstr "_ÙØØ ØÙØÙÙÙÙ"
 
-#: ../plugins/itip-formatter/itip-view.c:849
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:864
 #: ../plugins/itip-formatter/itip-view.c:881
+#: ../plugins/itip-formatter/itip-view.c:886
 msgid "_Decline"
 msgstr "ØØÙ_Ø"
 
-#: ../plugins/itip-formatter/itip-view.c:850
 #: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:867
 #: ../plugins/itip-formatter/itip-view.c:883
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "A_ccept"
 msgstr "Ø_ÙØÙ"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Decline all"
 msgstr "ØØÙ_Ø ØÙÙÙ"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative all"
 msgstr "ØÙÙÙ _ØÙØ ÙÙØØÙ"
 
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:865
 #: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:887
 msgid "_Tentative"
 msgstr "_ØÙØ ÙÙØØÙ"
 
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "A_ccept all"
 msgstr "ØÙØÙ ØÙ_ÙÙ"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Send Information"
 msgstr "ØØØÙÙ ØÙÙØÙÙÙØØ"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:875
 msgid "_Update Attendee Status"
 msgstr "ØØÙ_Ø ØØÙØ ØÙØØØØ"
 
-#: ../plugins/itip-formatter/itip-view.c:873
+#: ../plugins/itip-formatter/itip-view.c:878
 msgid "_Update"
 msgstr "_ØØØÙØ"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1085
-#: ../plugins/itip-formatter/itip-view.c:1139
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
 msgid "Comment:"
 msgstr "ØØÙÙÙ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1124
+#: ../plugins/itip-formatter/itip-view.c:1132
 msgid "Send _reply to sender"
 msgstr "ØÙ_ØÙ ØÙÙ ØÙÙØØÙÙ"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "Send _updates to attendees"
 msgstr "ØØØÙÙ ØØØÙ_ØØØ ÙÙØØÙØ"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "_Apply to all instances"
 msgstr "_ØØÙ ØÙÙ ÙÙ ØÙØØÙØØ"
 
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "Show time as _free"
 msgstr "ØØÙØ ØÙÙÙØ ÙÙÙØÙØÙÙØ"
 
-#: ../plugins/itip-formatter/itip-view.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1183
 msgid "_Preserve my reminder"
 msgstr ""
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1181
+#: ../plugins/itip-formatter/itip-view.c:1189
 #, fuzzy
 msgid "_Inherit reminder"
 msgstr "ÙØÙÙØ ØÙÙØÙÙØØ"
 
-#: ../plugins/itip-formatter/itip-view.c:1924
+#: ../plugins/itip-formatter/itip-view.c:1965
 msgid "_Tasks:"
 msgstr "_ÙÙØÙ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1926
+#: ../plugins/itip-formatter/itip-view.c:1967
 msgid "_Memos:"
 msgstr "Ø_ØÙÙØØØ:"
 
@@ -18544,70 +18223,54 @@ msgid "Beep or play sound file."
 msgstr "ØÙÙÙÙØ ØÙ ØÙØÙÙÙ ÙÙÙ ØÙØ."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "ÙÙÙÙÙÙÙ ØØØØÙ D-Bus."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "ÙØÙÙÙ ØÙØÙÙÙÙØ ÙÙ ÙÙØÙØ ØÙØØÙÙØ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "ØÙÙÙØ ØØØÙØ D-BUS ØÙØ ÙØÙÙ ØØØØÙ ØØÙØ ØØÙØØ."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr "ØÙ \"ØØÙØ\", ØÙÙØ, Ù ØÙØ ØÙØØÙÙ ÙÙÙ ØÙØÙ ØÙØ ÙØÙÙ ØØØÙØ ØØÙØØ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "ØÙÙÙØ ØØÙØØØØÙ ØÙØØÙØØ ÙÙØØÙØ ØÙÙØÙØ ÙÙØ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "ØØØÙ ØÙÙÙØØ ØÙØ ÙØÙÙ ØØØØÙ ØØÙØØ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 #, fuzzy
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "ÙÙÙ ØÙØÙÙØ ØÙØÙ ØÙÙØØÙ ØÙØ ÙØÙÙ ØØØØÙ ØØÙØØØ ØÙ ÙÙ ÙÙÙ ÙÙ ÙØØ ØÙØÙÙØ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
-msgstr "ØØØÙ ØÙØØØÙØ ØÙØØÙ ÙØ ØÙØÙÙÙÙØ."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "ØØÙØ ØÙÙÙÙØ ØÙØØÙØ ØÙØØÙØ ÙÙ ÙÙØÙØ ØÙØØÙÙØ ØÙØ ÙØÙØ ØØØØÙ ØØÙØØ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
 msgstr "ØØÙ ÙÙÙ ØÙØÙØ ØÙØÙ ØÙÙØØÙ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "ÙÙÙ ØÙØÙÙØ ØÙØÙ ØÙÙØØÙ ØÙØ ÙØÙÙ ØØØØÙ ØØÙØØØ ØÙ ÙÙ ÙÙÙ ÙÙ ÙØØ ØÙØÙÙØ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 #, fuzzy
 msgid "Use sound theme"
 msgstr "ØØØØØÙ ØÙØØØÙØ"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "ÙØ ØØØ ÙØÙ ØÙÙØØÙ ØÙØ ØÙ ØÙÙØ ØÙØ ÙØÙÙ ØØØØÙ ØØÙØØ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "ÙØ ØØØ ÙØÙ ØÙÙØÙØ ØØØØØ ÙÙÙ ØÙØÙÙÙÙØ ØÙØ ÙØÙÙ ØØØØÙ ØØÙØØ."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ÙÙÙØ ÙØØ ØÙØØÙÙØ ØÙ ØÙØØØØÙ ØÙØØÙØØ ÙÙ ÙØÙØ ØÙØØØÙ ÙÙØ."
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:391
 #, fuzzy, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18619,22 +18282,17 @@ msgstr[0] "ÙÙØ ØØØÙÙØ ØØØÙØ ÙØØØØ (%d) ÙÙ %s."
 msgstr[1] "ÙÙØ ØØØÙÙØ ØØØÙØØÙ (%d) ÙÙ %s."
 msgstr[2] "ÙÙØ ØØØÙÙØ (%d) ØØØØÙ ÙÙ %s."
 msgstr[3] "ÙÙØ ØØØÙÙØ (%d) ØØØÙØ  ÙÙ %s."
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:410
-#, fuzzy, c-format
-msgid "From: %s"
-msgstr "ÙÙ %s:"
+msgstr[4] ""
+msgstr[5] ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:423
+#: ../plugins/mail-notification/mail-notification.c:416
 #, fuzzy, c-format
 msgid "Subject: %s"
 msgstr "ØÙÙÙØÙØ:"
 
-#: ../plugins/mail-notification/mail-notification.c:433
+#: ../plugins/mail-notification/mail-notification.c:427
 #, fuzzy, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18642,50 +18300,53 @@ msgstr[0] "ÙÙØ ØØØÙÙØ ØØØÙØ ÙØØØØ ØØÙØØ (%Id)."
 msgstr[1] "ÙÙØ ØØØÙÙØ ØØØÙØØÙ ØØÙØØØÙ (%Id)."
 msgstr[2] "ÙÙØ ØØØÙÙØ %Id ØØØØÙ ØØÙØØ."
 msgstr[3] "ÙÙØ ØØØÙÙØ %Id ØØØÙØ ØØÙØØ."
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../plugins/mail-notification/mail-notification.c:446
-#: ../plugins/mail-notification/mail-notification.c:454
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
 msgid "New email"
 msgstr "ØØÙØ ØØÙØ"
 
-#: ../plugins/mail-notification/mail-notification.c:506
-msgid "Show icon in _notification area"
-msgstr "ØØÙØ ØÙØÙÙÙÙØ ÙÙ Ù_ØØØØ ØÙØØÙÙØ"
-
-#: ../plugins/mail-notification/mail-notification.c:536
-msgid "Popup _message together with the icon"
-msgstr "ØØØÙ ØÙ_ØØØÙØ ØÙØØÙ ÙØ ØÙØÙÙÙÙØ"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, fuzzy, c-format
+msgid "Show %s"
+msgstr "ØØÙØ ØÙØÙÙÙ"
 
-#: ../plugins/mail-notification/mail-notification.c:723
-msgid "_Play sound when new messages arrive"
+#: ../plugins/mail-notification/mail-notification.c:673
+#, fuzzy
+msgid "_Play sound when a new message arrives"
 msgstr "ØØØÙ ØÙØÙØ ØÙØ ÙØÙÙ ØØØØÙ ØØÙØØ"
 
-#: ../plugins/mail-notification/mail-notification.c:753
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "_Beep"
 msgstr "_ØØÙØØ"
 
-#: ../plugins/mail-notification/mail-notification.c:766
+#: ../plugins/mail-notification/mail-notification.c:716
 #, fuzzy
 msgid "Use sound _theme"
 msgstr "ØØØØØÙ ØÙØØØÙØ"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:735
 #, fuzzy
 msgid "Play _file:"
 msgstr "ØÙØÙÙÙ ÙÙÙ ØÙØ"
 
-#: ../plugins/mail-notification/mail-notification.c:796
+#: ../plugins/mail-notification/mail-notification.c:744
 msgid "Select sound file"
 msgstr "ØÙØÙØØ ÙÙÙ ØÙØ"
 
-#: ../plugins/mail-notification/mail-notification.c:854
+#: ../plugins/mail-notification/mail-notification.c:801
 msgid "Notify new messages for _Inbox only"
 msgstr "ØÙÙÙÙØ ØÙ ØÙØØØØÙ ØÙØØÙØØ ÙÙØØÙØ ØÙÙØÙØ ÙÙØ"
 
-#: ../plugins/mail-notification/mail-notification.c:863
-msgid "Generate a _D-Bus message"
-msgstr "ØÙÙÙØ _ØØØÙØ D-BUS"
+#: ../plugins/mail-notification/mail-notification.c:811
+#, fuzzy
+msgid "Show _notification when a new message arrives"
+msgstr "ØØÙØ ØÙÙÙÙØ ØÙØØÙØ ØÙØØÙØ ÙÙ ÙÙØÙØ ØÙØØÙÙØ ØÙØ ÙØÙØ ØØØØÙ ØØÙØØ."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18697,124 +18358,78 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "ØØØÙ ØÙÙÙØØ ØÙØ ÙØÙÙ ØØØØÙ ØØÙØØ."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:157
+#: ../plugins/mail-to-task/mail-to-task.c:238
 #, c-format
 msgid "Created from a mail by %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:490
+#: ../plugins/mail-to-task/mail-to-task.c:603
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:493
+#: ../plugins/mail-to-task/mail-to-task.c:606
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 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:516
-msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
-msgstr ""
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:522
-msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
-msgstr ""
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:528
-msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
-msgstr ""
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:549
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+#: ../plugins/mail-to-task/mail-to-task.c:626
+#, c-format
+msgid ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+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:558
+#: ../plugins/mail-to-task/mail-to-task.c:629
+#, c-format
 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] ""
-msgstr[2] ""
-msgstr[3] ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+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:567
+#: ../plugins/mail-to-task/mail-to-task.c:632
+#, c-format
 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] ""
-msgstr[2] ""
-msgstr[3] ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#: ../plugins/mail-to-task/mail-to-task.c:651
+#, fuzzy
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "ØØØØØ ÙÙ ØÙÙØØØØ ÙÙÙÙØ"
+
+#: ../plugins/mail-to-task/mail-to-task.c:726
 #, fuzzy
 msgid "[No Summary]"
 msgstr "ÙØ ÙÙØÙØ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:637
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid "Invalid object returned from a server"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:708
+#: ../plugins/mail-to-task/mail-to-task.c:788
 #, fuzzy, c-format
 msgid "An error occurred during processing: %s"
 msgstr "ØØØ ØØØ ØØÙØØ ØÙØØØØØ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:813
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ÙØ ÙÙÙÙ ÙØØ ØÙØÙÙÙÙ. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:744
+#: ../plugins/mail-to-task/mail-to-task.c:820
 #, fuzzy
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
@@ -18823,7 +18438,7 @@ msgstr ""
 "ØÙÙØØØ ØÙÙÙØÙÙ ÙÙÙØØØØ ÙÙØØ ÙÙÙØØ ÙØ ÙÙÙÙ ØÙØØØ ÙÙÙØ ÙÙØÙ. ØØØØ ØÙØÙÙÙ ÙØØØØ "
 "ØØØ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:747
+#: ../plugins/mail-to-task/mail-to-task.c:823
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18831,7 +18446,7 @@ msgstr ""
 "ØÙÙØØØ ØÙÙÙØÙÙ ÙÙÙØØØØ ÙÙØØ ÙÙÙØØ ÙØ ÙÙÙÙ ØÙØØØ ÙÙÙØ ÙÙØÙ. ØØØØ ØÙØÙÙÙ ÙØØØØ "
 "ØØØ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:826
 #, fuzzy
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
@@ -18840,47 +18455,52 @@ msgstr ""
 "ØÙÙØØØ ØÙÙÙØÙÙ ÙÙÙØØØØ ÙÙØØ ÙÙÙØØ ÙØ ÙÙÙÙ ØÙØØØ ÙÙÙØ ÙÙØÙ. ØØØØ ØÙØÙÙÙ ÙØØØØ "
 "ØØØ."
 
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 #, fuzzy, c-format
 msgid "Cannot get source list. %s"
 msgstr "ÙØ ÙÙÙÙ ÙØØ ØÙÙØØØ \"{2}\"."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1075
+#: ../plugins/mail-to-task/mail-to-task.c:1138
+#, fuzzy
+msgid "No writable calendar is available."
+msgstr "ÙØ ÙÙØØ ÙØÙ."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1230
 #, fuzzy
 msgid "Create an _Event"
 msgstr "ØÙØØ ÙØ_ÙØ ØØÙØ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1232
 #, fuzzy
 msgid "Create a new event from the selected message"
 msgstr "ØØÙÙÙ ØØ ØÙÙ ÙØØÙÙ ØÙØÙØØÙØ ØÙÙÙØÙØØ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1082
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 #, fuzzy
 msgid "Create a Mem_o"
 msgstr "ØÙØØ ØØÙÙØ ØØÙØ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1239
 #, fuzzy
 msgid "Create a new memo from the selected message"
 msgstr "ØØÙÙÙ ØØ ØÙÙ ÙØØÙÙ ØÙØÙØØÙØ ØÙÙÙØÙØØ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1089
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 #, fuzzy
 msgid "Create a _Task"
 msgstr "ØÙØØ ÙÙÙÙØÙ ØØÙØØ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1246
 #, fuzzy
 msgid "Create a new task from the selected message"
 msgstr "ØØÙÙÙ ØØ ØÙÙ ÙØØÙÙ ØÙØÙØØÙØ ØÙÙÙØÙØØ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1099
+#: ../plugins/mail-to-task/mail-to-task.c:1254
 #, fuzzy
 msgid "Create a _Meeting"
 msgstr "Ø_ØØÙØØ ØØÙØ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1101
+#: ../plugins/mail-to-task/mail-to-task.c:1256
 #, fuzzy
 msgid "Create a new meeting from the selected message"
 msgstr "ØÙØØ ØÙØ ØØØÙØØ ØØÙØ"
@@ -18890,56 +18510,56 @@ msgstr "ØÙØØ ØÙØ ØØØÙØØ ØØÙØ"
 msgid "Convert a mail message to a task."
 msgstr "ØÙÙ ØÙØØØÙØ ØÙÙÙØÙØÙ ØÙÙ ÙÙÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
 msgid "Get List _Archive"
 msgstr "ØØØØ ØØ_ØÙÙ ØÙÙØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
 msgid "Get an archive of the list this message belongs to"
 msgstr "ØÙØ ØØØÙÙ ØÙÙØØÙØ ØÙØØØØØ ÙÙØ ÙØÙ ØÙØØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
 msgid "Get List _Usage Information"
 msgstr "ØØÙØ ÙØÙÙÙØØ Ø_ØØØØØÙ ØÙÙØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "ØÙØ ÙØÙÙÙØØ ØÙÙ ØØØØØØÙ ØÙÙØØÙØ ØÙØØØØØ ÙÙØ ÙØÙ ØÙØØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
 msgid "Contact List _Owner"
 msgstr "ØØØÙ _ÙØÙÙ ØÙÙØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "ÙØØØØÙØ ÙØÙÙ ØÙÙØØÙØ ØÙØØÙØÙØ ØÙØØØØØ ÙÙØ ÙØÙ ØÙØØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "_Post Message to List"
 msgstr "ØÙ_ØØ ØØØÙØ ÙÙÙØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "ÙØØ ØØØÙØ ÙÙÙØØÙØ ØÙØØÙØÙØ ØÙØØØØØ ÙÙØ ÙØÙ ØÙØØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "_Subscribe to List"
 msgstr "Ø_ØØØÙ ÙÙ ØÙÙØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "ØÙØØØØØÙ ÙÙ ØÙÙØØÙØ ØÙØØÙØÙØ ØÙØØØØØ ÙÙØ ÙØÙ ØÙØØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "_Unsubscribe from List"
 msgstr "ØÙ_ØÙ ØÙØØØØØÙ ÙÙ ØÙÙØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
 #, fuzzy
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "ØÙØØØ ØÙØØØØØÙ ÙÙ ØÙÙØØÙØ ØÙØØÙØÙØ ØÙØØØØØ ÙÙØ ÙØÙ ØÙØØØÙØ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
 msgid "Mailing _List"
 msgstr "ÙØØÙØ ØØÙ_ØÙØ"
 
@@ -19043,17 +18663,16 @@ msgstr ""
 "ØØØØØ ØØØÙÙÙ ØÙØØØØÙ ÙÙÙØØØ ÙÙ ØÙÙØÙØ ØÙØØÙÙ ÙÙØ, ØÙ ÙÙ ØÙÙØÙØ ØÙØØÙÙ ÙÙØ ÙÙ "
 "ÙÙ ØÙÙØÙØØØ ØÙÙØØÙØØ"
 
-#: ../plugins/mark-all-read/mark-all-read.c:193
-#, fuzzy
+#: ../plugins/mark-all-read/mark-all-read.c:215
 msgid "In Current Folder and _Subfolders"
-msgstr "ØÙÙØÙØ ØÙØØÙÙ Ù ØÙÙØÙØØØ ØÙ_ÙØØÙØ"
+msgstr "ÙÙ ØÙÙØÙØ ØÙØØÙÙ Ù ØÙÙØÙØØØ ØÙ_ÙØØÙØ"
 
-#: ../plugins/mark-all-read/mark-all-read.c:207
+#: ../plugins/mark-all-read/mark-all-read.c:229
 #, fuzzy
 msgid "In Current _Folder Only"
-msgstr "ØÙ_ÙØÙØ ØÙØØÙÙ ÙÙØ"
+msgstr "ÙÙ ØÙ_ÙØÙØ ØÙØØÙÙ ÙÙØ"
 
-#: ../plugins/mark-all-read/mark-all-read.c:444
+#: ../plugins/mark-all-read/mark-all-read.c:575
 msgid "Mark Me_ssages as Read"
 msgstr "ÙØØ ØÙØÙØ Ù_ÙØÙØ ÙÙØØÙØ"
 
@@ -19062,9 +18681,8 @@ msgid "Mark All Read"
 msgstr "ØÙÙ ØÙÙÙ ÙÙÙØÙØ"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-#, fuzzy
 msgid "Mark all messages in a folder as read."
-msgstr "ØÙÙÙÙ ÙÙ ØÙØØØØÙ ÙÙ ÙØØ ØÙÙØÙØ ÙÙÙØÙØØ"
+msgstr "ØÙÙÙÙ ÙÙ ØÙØØØØÙ ÙÙ ÙØÙØ ÙÙÙØÙØØ."
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
@@ -19080,52 +18698,44 @@ msgstr "ØÙØÙ ÙØØ ØØØÙØ"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:241
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid "Show HTML if present"
 msgstr "ØØÙØ HTML ØÙ ÙØÙ ÙÙØÙØÙØ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:241
+#: ../plugins/prefer-plain/prefer-plain.c:252
 msgid "Let Evolution choose the best part to show."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:242
+#: ../plugins/prefer-plain/prefer-plain.c:255
 #, fuzzy
 msgid "Show plain text if present"
 msgstr "ØØÙØ HTML ØÙ ÙØÙ ÙÙØÙØÙØ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:242
+#: ../plugins/prefer-plain/prefer-plain.c:256
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:243
+#: ../plugins/prefer-plain/prefer-plain.c:260
 #, fuzzy
 msgid "Only ever show plain text"
 msgstr "ØØÙØ ÙØ ØØØÙ ÙÙØ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:243
+#: ../plugins/prefer-plain/prefer-plain.c:261
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:290
+#: ../plugins/prefer-plain/prefer-plain.c:313
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:310
+#: ../plugins/prefer-plain/prefer-plain.c:333
 msgid "HTML _Mode"
 msgstr "_ÙÙØ HTML"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-msgid "Evolution Profiler"
-msgstr "ÙØØØ ØÙÙÙÙÙÙØÙ"
-
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Profile data events in Evolution (for developers only)."
-msgstr ""
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 #, fuzzy
 msgid "Import Outlook messages from PST file"
@@ -19140,46 +18750,40 @@ msgstr "ÙØØÙØØ ØÙØÙÙÙ CSV Ù Tab"
 msgid "Outlook personal folders (.pst)"
 msgstr ""
 
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../plugins/pst-import/pst-importer.c:450
 msgid "_Mail"
 msgstr "_ØØÙØ"
 
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:469
 msgid "Destination folder:"
 msgstr "ØÙÙØÙØ ØÙÙØÙØ:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:331
-#, fuzzy
+#: ../plugins/pst-import/pst-importer.c:475
 msgid "_Address Book"
-msgstr "ØÙØØ ØÙØÙØÙÙÙ"
+msgstr "_ØÙØØ ØÙØÙØÙÙÙ"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:338
-#, fuzzy
+#: ../plugins/pst-import/pst-importer.c:476
 msgid "A_ppointments"
-msgstr "ÙÙØØÙØ"
+msgstr "Ù_ÙØØÙØ"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:344 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_ÙÙØÙ"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:350
+#: ../plugins/pst-import/pst-importer.c:478
 #, fuzzy
 msgid "_Journal entries"
 msgstr "ØÙØØÙ"
 
-#: ../plugins/pst-import/pst-importer.c:365
+#: ../plugins/pst-import/pst-importer.c:585
 #, fuzzy
 msgid "Importing Outlook data"
 msgstr "ÙØØÙ ØØØÙØØØ ØÙØÙØØ ØÙÙ"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:154
-#: ../plugins/publish-calendar/publish-calendar.c:156
+#: ../plugins/publish-calendar/publish-calendar.c:147
+#: ../plugins/publish-calendar/publish-calendar.c:155
+#: ../plugins/publish-calendar/publish-calendar.c:157
 msgid "Calendar Publishing"
 msgstr "ÙØØ ØÙØÙÙÙÙ"
 
@@ -19190,53 +18794,53 @@ msgstr "ØÙÙÙØÙØ"
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 #, fuzzy
 msgid "Publish calendars to the web."
-msgstr "ÙØÙØ ØÙØØ ØÙØÙÙÙÙØØ ØÙÙ ÙÙØ"
+msgstr "ÙÙØØ ØÙØÙÙÙÙØØ ØÙÙ ØÙÙÙØ."
 
-#: ../plugins/publish-calendar/publish-calendar.c:212
-#: ../plugins/publish-calendar/publish-calendar.c:453
-#, fuzzy, c-format
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:471
+#, c-format
 msgid "Could not open %s:"
-msgstr "ÙÙ ÙÙÙÙ ÙØØ ØÙÙØØØ"
+msgstr "ØØØÙØ ÙØØ %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
-#, fuzzy, c-format
+#: ../plugins/publish-calendar/publish-calendar.c:218
+#, c-format
 msgid "Could not open %s: Unknown error"
-msgstr "ØØØØ ØØÙÙÙ ØØØÙØ PGP: ØØØ ÙØÙÙÙ"
+msgstr "ØØØÙØ ÙØØ %s: ØØØ ÙØÙÙÙ"
 
-#: ../plugins/publish-calendar/publish-calendar.c:234
+#: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:280
+#: ../plugins/publish-calendar/publish-calendar.c:288
 #, c-format
 msgid "Mount of %s failed:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../plugins/publish-calendar/publish-calendar.c:619
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "_ØÙØÙÙ"
 
-#: ../plugins/publish-calendar/publish-calendar.c:743
+#: ../plugins/publish-calendar/publish-calendar.c:767
 #, fuzzy
 msgid "Are you sure you want to remove this location?"
 msgstr "ÙÙ ØÙØ ÙØØÙØ ØÙÙ ØØÙØ ØØØÙØ ÙØØ ØÙØÙÙØÙØ"
 
 #. To Translators: This is shown to a user when creation of a new thread,
-#. where the publishing should be done, fails. Basically, this shouldn't
-#. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1057
+#. * where the publishing should be done, fails. Basically, this shouldn't
+#. * ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1099
 #, fuzzy
 msgid "Could not create publish thread."
 msgstr "ÙÙ ØØØØØ ØÙØØØ ØØØÙØ."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1065
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_ÙØØ ÙØÙÙÙØØ ØÙØÙÙÙÙ"
 
@@ -19255,12 +18859,8 @@ msgid "FTP (with login)"
 msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:9
-#, fuzzy
 msgid "Manual (via Actions menu)"
-msgstr ""
-"ÙÙÙÙÙØ\n"
-"ØØØÙØÙÙØ\n"
-"ÙØÙÙÙØ (ØØØ ÙØØÙØ ØØØØØØØ)"
+msgstr "ÙØÙÙÙØ (ØØØ ÙØØÙØ ØØØØØØØ)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
@@ -19292,9 +18892,8 @@ msgid "Service _type:"
 msgstr "_ÙÙØ ØÙØØÙØ:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
-#, fuzzy
 msgid "Sources"
-msgstr "ØÙÙØØØ"
+msgstr "ØÙÙØØØØ"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 #, fuzzy
@@ -19341,169 +18940,110 @@ msgstr "Ø_ØÙ ØÙÙØØØØÙ:"
 msgid "iCal"
 msgstr "ÙØØØ"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:69
-#: ../plugins/publish-calendar/publish-format-ical.c:82
+#: ../plugins/publish-calendar/publish-format-fb.c:95
+#: ../plugins/publish-calendar/publish-format-ical.c:92
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:484
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
 #, fuzzy
 msgid "New Location"
 msgstr "ØÙÙÙÙØ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:486
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
 #, fuzzy
 msgid "Edit Location"
 msgstr "ØÙÙÙÙØ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "ÙÙ ÙØØ ØØØÙ-ØØÙØØÙ, ØÙØÙØ: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "ÙØÙ ØÙØØØ ØÙØÙØ: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "ØØØØØ ØØØ ØÙØØØÙØ: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr "ØÙØÙÙÙØ ØÙØØÙ Ù ØØØÙ-ØØÙØØÙ ÙØ ØØØØÙØ, ØÙØÙÙØÙ..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, fuzzy, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "ÙÙÙØÙØ ØÙØØØØ ØÙØÙÙÙØ ØÙØØÙ Ù ØØØÙ-ØØÙØØÙ, ØÙØÙÙØØ..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "ØÙØÙØØÙ Ù ØØØÙ-ØØÙØØÙ ÙØ ÙØÙ, ØÙØ ØÙØØØ: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
-#, fuzzy, c-format
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "ØØØÙ-ØØÙØØÙ ØÙØ ÙØÙÙØ."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "ÙØØ ØÙØØÙ ØØØÙ-ØØÙØØÙ ØÙØØ ÙÙØØØØ ÙÙÙÙ ØØØØ"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
-msgid "I_nclude remote tests"
-msgstr "Ø_ØÙÙÙ ØÙØØØØØØØØ ØÙØØÙØØ"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-#, fuzzy
-msgid "Filter junk messages using SpamAssassin."
-msgstr "ØØØÙØ ØØØØÙ ØÙØØÙØ ØÙÙÙÙÙ ØØØØØØØÙ Bogofilter."
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#, fuzzy
-msgid "SpamAssassin Junk Filter"
-msgstr "ÙÙØÙ ÙØØÙ ØÙØØÙØ ØÙÙØØØ ÙÙØØÙØ ØÙÙÙÙÙ"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-#, fuzzy
-msgid "SpamAssassin Options"
-msgstr "ØÙØØØØ ÙØØÙ ØÙØØÙØ ØÙÙØØØ"
-
-#.
-#. * Translator: the %F %T is the thirth argument for a strftime function.
-#. * It lets you define the formatting of the date in the csv-file.
-#. *
-#: ../plugins/save-calendar/csv-format.c:161
+#. Translators: the %F %T is the third argument for a
+#. * strftime function.  It lets you define the formatting
+#. * of the date in the csv-file.
+#: ../plugins/save-calendar/csv-format.c:168
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "UID"
 msgstr "ÙÙÙØ ØÙÙØØØØÙ (UID)"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Description List"
 msgstr "ÙØØÙØ ØÙÙØÙ"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Categories List"
 msgstr "ÙØØÙØ ØÙÙØØØ"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Comment List"
 msgstr "ÙØØÙØ ØÙØØÙÙÙØØ"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Contact List"
 msgstr "ÙØØÙØ ØÙÙØØØØÙÙÙ"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Start"
 msgstr "ØØØØ"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "End"
 msgstr "ØÙÙÙÙÙ"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "Due"
 msgstr "ÙÙØØØÙ "
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "percent Done"
 msgstr "ÙØØØ ÙÙÙÙØ"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "URL"
 msgstr "ØÙØÙÙØÙ"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Attendees List"
 msgstr "ÙØØÙØ ØÙØØÙØ"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:398
 msgid "Modified"
 msgstr "ÙØÙÙÙØ"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:573
 #, fuzzy
 msgid "A_dvanced options for the CSV format"
 msgstr "ØÙØØØØ ÙØÙØÙØ ÙØÙØÙÙ CSV"
 
-#: ../plugins/save-calendar/csv-format.c:537
+#: ../plugins/save-calendar/csv-format.c:581
 #, fuzzy
 msgid "Prepend a _header"
 msgstr "ØÙØÙ ØØÙÙØØ"
 
-#: ../plugins/save-calendar/csv-format.c:546
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Value delimiter:"
-msgstr "ÙØØÙ ØÙÙÙÙ:"
+msgstr "ÙØØÙ ØÙ_ÙÙÙ:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:601
 #, fuzzy
 msgid "_Record delimiter:"
 msgstr "ÙØØÙØ ØÙØØØÙÙØØ:"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:612
 #, fuzzy
 msgid "_Encapsulate values with:"
 msgstr "ØØÙÙÙ ØÙÙÙÙ ØÙ:"
 
-#: ../plugins/save-calendar/csv-format.c:582
-msgid "Comma separated value format (.csv)"
+#: ../plugins/save-calendar/csv-format.c:638
+#, fuzzy
+msgid "Comma separated values (.csv)"
 msgstr "ØÙØÙÙ ØÙÙÙÙ ØÙÙÙØÙÙØ ØÙØØÙØ (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:162
-msgid "iCalendar format (.ics)"
-msgstr "ÙÙØØ ØÙ-ÙÙÙØØ (.ics)"
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+#, fuzzy
+msgid "iCalendar (.ics)"
+msgstr "ÙÙÙÙØØ iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -19519,34 +19059,35 @@ msgstr "ØÙØ ÙØØØØ ØÙÙÙØÙ ØÙ ØÙØÙÙÙÙ ØÙÙÙØÙÙ ØÙÙ
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../plugins/save-calendar/rdf-format.c:156
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:369
-msgid "RDF format (.rdf)"
+#: ../plugins/save-calendar/rdf-format.c:389
+#, fuzzy
+msgid "RDF (.rdf)"
 msgstr "ØÙØÙÙ RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:127
 #, fuzzy
 msgid "_Format:"
 msgstr "ØÙØÙÙØØ"
 
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:189
 msgid "Select destination file"
 msgstr "ØÙØÙ ÙÙÙÙ ØÙÙØÙØ"
 
-#: ../plugins/save-calendar/save-calendar.c:334
+#: ../plugins/save-calendar/save-calendar.c:344
 #, fuzzy
 msgid "Save the selected calendar to disk"
 msgstr "ØØÙØ ØÙØØØØÙ ØÙÙÙØÙØÙ ÙÙÙÙ ÙØÙÙ"
 
-#: ../plugins/save-calendar/save-calendar.c:365
+#: ../plugins/save-calendar/save-calendar.c:375
 #, fuzzy
 msgid "Save the selected memo list to disk"
 msgstr "ØØÙØ ØÙØØØØÙ ØÙÙÙØÙØÙ ÙÙÙÙ ÙØÙÙ"
 
-#: ../plugins/save-calendar/save-calendar.c:396
+#: ../plugins/save-calendar/save-calendar.c:406
 #, fuzzy
 msgid "Save the selected task list to disk"
 msgstr "ØÙØ ÙØØØØ ØÙÙÙØÙ ØÙ ØÙØÙÙÙÙ ØÙÙÙØÙÙ ØÙÙ ØÙÙØØ."
@@ -19559,19 +19100,22 @@ msgstr ""
 "ÙØØÙØ ÙÙ ØØÙØØ ØÙÙÙÙØØ ØÙÙÙØØØÙØ/ØÙÙÙÙ ÙÙÙØÙ ØÙÙÙØÙØ ÙÙØØÙÙØ ÙÙ ÙØÙ ØÙØØØÙØ."
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "ÙÙØÙ ÙØÙØ ÙØØÙØ ØÙÙ ØÙÙØÙØØØ"
+msgid ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
+"an email you are replying to."
+msgstr ""
 
-#: ../plugins/templates/templates.c:635
+#: ../plugins/templates/templates.c:1094
 #, fuzzy
 msgid "No Title"
 msgstr "ÙØ ØÙÙØÙ"
 
-#: ../plugins/templates/templates.c:746
+#: ../plugins/templates/templates.c:1195
 msgid "Save as _Template"
 msgstr "ØØÙØ Ù_ÙØÙØ"
 
-#: ../plugins/templates/templates.c:748
+#: ../plugins/templates/templates.c:1197
 msgid "Save as Template"
 msgstr "ØØÙØ ÙÙØÙØ"
 
@@ -19593,33 +19137,31 @@ msgstr "vCards ØØÙØØ"
 msgid "Show vCards directly in mail messages."
 msgstr ""
 
-#: ../plugins/vcard-inline/vcard-inline.c:198
-#: ../plugins/vcard-inline/vcard-inline.c:283
+#: ../plugins/vcard-inline/vcard-inline.c:207
+#: ../plugins/vcard-inline/vcard-inline.c:292
 msgid "Show Full vCard"
 msgstr "ØØÙØ ØÙÙ vCard ØØÙÙØÙÙ"
 
-#: ../plugins/vcard-inline/vcard-inline.c:201
+#: ../plugins/vcard-inline/vcard-inline.c:210
 msgid "Show Compact vCard"
 msgstr "ØØÙØ vCard ÙØÙØØ"
 
-#: ../plugins/vcard-inline/vcard-inline.c:262
-#, fuzzy
+#: ../plugins/vcard-inline/vcard-inline.c:271
 msgid "There is one other contact."
-msgstr "ÙÙØÙ ÙØØØØÙ ÙØØØ ØØØ."
+msgstr "ÙÙØÙ ÙØØØØÙ ØØØ."
 
-#: ../plugins/vcard-inline/vcard-inline.c:271
-#, fuzzy, c-format
+#: ../plugins/vcard-inline/vcard-inline.c:280
+#, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
-msgstr[0] "ÙÙØÙ ÙØØØØÙØØÙØØ ØØØ."
-msgstr[1] "ÙÙØÙ ÙØØØØÙÙÙÙ ØØØÙÙÙ"
-msgstr[2] "ÙÙØÙ %d ÙØØØÙÙÙØ ØØØÙØ."
+msgstr[0] "ÙÙØ ÙÙØÙ ÙØØØØÙ ØØØ."
+msgstr[1] "ÙÙØÙ ÙØØØØÙ ØØØ."
+msgstr[2] "ÙÙØÙ ÙØØØØÙØÙ ØØØØÙ."
 msgstr[3] "ÙÙØÙ %d ÙØØØØÙÙÙÙ ØØØÙÙ."
-msgstr[4] ""
-msgstr[5] ""
+msgstr[4] "ÙÙØÙ %d ÙØØØØÙÙÙØ ØØØÙÙ."
+msgstr[5] "ÙÙØÙ %d ÙØØØØÙ ØØØÙÙ."
 
-#: ../plugins/vcard-inline/vcard-inline.c:292
-#, fuzzy
+#: ../plugins/vcard-inline/vcard-inline.c:301
 msgid "Save in Address Book"
 msgstr "ØØÙØ ÙÙ ØÙØØ ØÙØÙØÙÙÙ"
 
@@ -19636,12 +19178,11 @@ msgstr "ÙØØØØÙÙ WebDAV"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:256
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "URL:"
 msgstr "ØÙØÙÙØÙ:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:282
-#, fuzzy
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Ø_ØÙØ IfMatch (ÙØÙÙØ ØÙÙ ØØØØØÙ < 2.2.8)"
 
@@ -19807,7 +19348,7 @@ msgstr "ØÙØØÙØ ØÙØØÙØÙ ÙØØÙ"
 msgid "Skip development warning dialog"
 msgstr "ØØØÙÙ ÙØØØ ØÙØØ ØÙØØØÙØ ÙÙ ØØØØØØÙ ØØØØØ ØÙØØÙÙØ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:374
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "ØØØ ØÙÙ ØØØØÙ ØØÙØÙØØÙØ"
 
@@ -19924,7 +19465,7 @@ msgid "Use HTTP proxy"
 msgstr "ØØØØØÙ ÙØÙØ HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
+msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr "ØØÙ ØÙÙØØØØÙ ÙÙØØØÙØØÙ ØÙØ ØØØØØØÙ ÙØÙØ HTTP."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
@@ -19965,11 +19506,11 @@ msgstr "ØØÙÙØ ØØ ØÙÙØÙØØ"
 msgid "Window buttons are visible"
 msgstr "ØØØØØ ØÙÙØÙØØ ØØÙØØ"
 
-#: ../shell/e-shell-content.c:695 ../shell/e-shell-content.c:696
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "ØØÙØ"
 
-#: ../shell/e-shell-content.c:738
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "ØØÙØ ØÙØØØ"
 
@@ -19977,48 +19518,38 @@ msgstr "ØØÙØ ØÙØØØ"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:935
-#, fuzzy
+#: ../shell/e-shell-searchbar.c:938
 msgid "Sho_w:"
 msgstr "Ø_ØÙØ:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:968
-#, fuzzy
+#: ../shell/e-shell-searchbar.c:971
 msgid "Sear_ch:"
-msgstr "ØØØ_Ø :"
+msgstr "ØØØ_Ø:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1031
-#, fuzzy
+#: ../shell/e-shell-searchbar.c:1034
 msgid "i_n"
 msgstr " Ù_Ù"
 
-#: ../shell/e-shell-utils.c:255
-#, fuzzy
+#: ../shell/e-shell-utils.c:223
 msgid "vCard (.vcf)"
-msgstr "vCard (.vcf, .gcrd)"
-
-#: ../shell/e-shell-utils.c:257
-#, fuzzy
-msgid "iCalendar (.ics)"
-msgstr "ÙÙÙÙØØ iCalendar (.ics)"
+msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:278
-#, fuzzy
+#: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
-msgstr "ÙÙ ØÙÙÙÙØØ"
+msgstr "ÙÙ ØÙÙÙÙØØ (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:296
 msgid "Saving user interface state"
 msgstr ""
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "Djihed Afifi ØÙØØ ØÙÙÙÙ (djihed gmail com)\n"
@@ -20026,287 +19557,279 @@ msgstr ""
 "Ahmad Farghal ØØÙØ ÙØØÙ (ahmad farghal gmail com)\n"
 "Anas Husseini ØÙØ ØÙØØÙÙÙ (linux anas gmail com)"
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "ÙÙÙØ ØÙÙÙÙÙÙØÙÙ"
 
-#: ../shell/e-shell-window-actions.c:1215
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:902
+msgid "Categories Editor"
+msgstr "ÙØØÙØ ØÙÙØØØ"
+
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
-msgstr "ØØÙ ØØÙ ÙÙØ ÙØØÙØÙØ"
+msgstr "ÙÙÙÙ ØÙØÙÙ ÙÙØ ÙØØÙØÙØ."
 
-#: ../shell/e-shell-window-actions.c:1217
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
-msgstr "ÙÙ ÙÙÙÙ ØØØÙÙ ÙØÙ ØÙØÙØØ."
+msgstr "ÙÙ ÙÙÙÙ ØØØÙÙ ÙÙÙ ØÙØÙÙ."
 
-#: ../shell/e-shell-window-actions.c:1398
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "ØØÙØ ÙØÙÙÙØØ ØÙÙ ØÙÙÙÙÙÙØÙ"
 
-#: ../shell/e-shell-window-actions.c:1403
-#: ../shell/e-shell-window-actions.c:1417
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "Ø_ØÙÙ ØÙÙÙØÙØØ"
 
-#: ../shell/e-shell-window-actions.c:1424
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
-msgstr "ÙÙØØÙØ"
+msgstr "ØÙÙ_ØØÙÙØØ"
 
-#: ../shell/e-shell-window-actions.c:1426
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
-msgstr "ÙØØ ÙØÙÙØØØ ÙØØØØÙÙÙ ØØØÙÙ"
-
-#: ../shell/e-shell-window-actions.c:1452
-msgid "Evolution _FAQ"
-msgstr "ØØØÙØ ØÙÙÙÙÙÙØÙ ØÙØØØØØ"
-
-#: ../shell/e-shell-window-actions.c:1454
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "ØÙØØ ØÙØØ ØÙÙÙØ ØÙØØØØ ØØÙØØØÙØ ØÙØØØØØ"
+msgstr "ØÙØØ ØÙÙÙ ÙØØØØÙ ØÙÙÙÙÙÙØÙ"
 
-#: ../shell/e-shell-window-actions.c:1459
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "ØÙØ ÙÙÙØØ ØÙ_ØØ"
 
-#: ../shell/e-shell-window-actions.c:1461
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
-msgstr "ÙÙ ØÙØ ÙØØÙØ ØÙÙ ØØÙØ ÙØÙØÙ ÙÙ ÙÙÙØØ ØÙØØ ØÙÙØØÙØØ"
+msgstr "ØÙØ ÙÙÙ ÙÙÙØØ ØÙØØ"
 
-#: ../shell/e-shell-window-actions.c:1466
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "Ø_ØØÙØØ..."
 
-#: ../shell/e-shell-window-actions.c:1468
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "ØØØÙØØ ØÙØÙØØ ÙÙ ØØØÙØ ØØØÙ"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "ÙØÙ_ØØ ØØÙØØ"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1490
 #, fuzzy
 msgid "Create a new window displaying this view"
 msgstr "ØÙØØ ÙØÙØØ ØØÙØØ ØØØØ ÙØØ ØÙÙØÙØ"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1502
+msgid "Available Cate_gories"
+msgstr "ØÙÙØØØ ØÙÙ_ØÙÙÙØØ"
+
+#: ../shell/e-shell-window-actions.c:1504
+msgid "Manage available categories"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "ÙØØØ _ØØÙØ"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1518
 #, fuzzy
 msgid "Show Evolution's shortcut keys"
 msgstr "ØÙØ ØØØØØØØ ØÙÙÙÙÙÙØÙÙ"
 
-#: ../shell/e-shell-window-actions.c:1503
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "ØØØØ ÙÙ ØÙØØÙØÙØ"
 
-#: ../shell/e-shell-window-actions.c:1508
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "ØØØ ÙØ_ÙØÙ..."
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1539
 #, fuzzy
 msgid "Clear the current search parameters"
 msgstr "ØØØØ ØØØÙÙØ"
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "_ØØÙÙØ ØÙØØÙØ ØÙÙØÙÙØØ..."
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1546
 #, fuzzy
 msgid "Manage your saved searches"
 msgstr "ÙÙÙ ØØØØØØ ØØÙØÙ ØÙÙØØÙÙÙØ ÙØØØØÙÙÙ ÙØØÙÙÙ"
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "ØÙÙØ ÙÙØ ÙØØÙÙØ ÙÙØ ØÙØØØ"
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "Ø_ØØØ ØÙØÙ"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1560
 #, fuzzy
 msgid "Execute the current search parameters"
 msgstr "ØÙØØØ ØÙÙÙÙØ ØÙØØÙØ ØÙØØÙÙÙØ"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "Ø_ØÙØ ØÙØØØ..."
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1567
 #, fuzzy
 msgid "Save the current search parameters"
 msgstr "ØØÙØ ØÙÙÙÙ ØÙØØÙÙ"
 
-#: ../shell/e-shell-window-actions.c:1557
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "ØØØÙÙ ØÙØÙØ _ØÙÙØ"
 
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ØØØÙÙ ØÙØÙØ ØÙÙØ ØØØØØØØÙ ÙØÙ ØÙØÙÙ"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "Ø_ØÙÙ ØÙÙ ØØÙØØÙ"
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1588
 #, fuzzy
 msgid "Put Evolution into offline mode"
 msgstr "ØØØ ØÙÙ ØØØØÙ ØØÙØÙØØÙØ"
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "Ø_ØÙÙ ÙØØÙÙØ"
 
-#: ../shell/e-shell-window-actions.c:1573
+#: ../shell/e-shell-window-actions.c:1595
 #, fuzzy
 msgid "Put Evolution into online mode"
 msgstr "ØØØ ØÙÙ ØØØØÙ ØØÙØÙØØÙØ"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "Ø_ØØÙØ"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "_ØØÙØ"
 
-#: ../shell/e-shell-window-actions.c:1615
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "Ø_ØØØ"
 
-#: ../shell/e-shell-window-actions.c:1622
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "ÙØÙØ ØÙÙÙ_ØØÙÙ"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "_ÙØÙØØ"
 
-#: ../shell/e-shell-window-actions.c:1665
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "ØØÙØ ØÙ_ØØÙØ ØÙØØÙØÙ"
 
-#: ../shell/e-shell-window-actions.c:1667
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
-msgstr "ØØÙØ ØÙ_ØØÙØ ØÙØØÙØÙ"
+msgstr "ØØÙØ ØÙØØÙØ ØÙØØÙØÙ"
 
-#: ../shell/e-shell-window-actions.c:1673
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
-msgstr "ØØÙØ ØÙØÙØÙÙ ØÙÙØØØÙÙØ"
+msgstr "ØØÙØ ØÙØ_ØØØØ"
 
-#: ../shell/e-shell-window-actions.c:1675
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
-msgstr "ØØÙØ ÙÙØ \"ØÙÙØØÙÙØ\""
+msgstr "ØØÙØ ØØØØØ ØÙÙØØÙ"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "ØØÙØ ØØÙØ ØÙ_ØØÙØ"
 
-#: ../shell/e-shell-window-actions.c:1683
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
-msgstr "ØØÙØ ØØÙØ ØÙ_ØØÙØ"
+msgstr "ØØÙØ ØØÙØ ØÙØØÙØ"
 
-#: ../shell/e-shell-window-actions.c:1689
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "ØØÙØ ØØÙØ ØÙØ_ØÙØØ"
 
-#: ../shell/e-shell-window-actions.c:1691
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
-msgstr "ØØÙØ ØØÙØ ØÙØ_ØÙØØ"
+msgstr "ØØÙØ ØØÙØ ØÙØØÙØØ"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "ØÙ_ÙÙÙØØ ÙÙØ"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "ØØÙØ ØØØØØ ØÙÙØÙØØ ØØÙÙÙÙØØ ÙÙØ"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "_ÙØ ÙÙØ"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "ØØÙØ ØØØØØ ØÙÙØÙØØ ØÙØ ÙÙØ"
 
-#: ../shell/e-shell-window-actions.c:1727
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "ØÙÙÙÙØØ _Ù ÙØ"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
 msgstr "ØØÙØ ØØØØØ ØÙÙØÙØØ ØØÙÙÙÙØØ ÙÙØ"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "ØØÙÙØ ØØÙ_Ø ØÙØØÙØØ"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "ØØÙØ ØØØØØ ØÙÙØÙØØ ØÙÙØ ØØØØØ ØØØ ØÙÙÙØØ"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "ØØØÙÙ ØÙÙØØÙØ..."
 
-#: ../shell/e-shell-window-actions.c:1746
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "ØÙØØ ØÙ ØØÙØ ÙÙØÙØÙÙØ"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "ØØÙØ ØÙÙØÙØ ØÙÙØØÙØ..."
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "ØØÙØ ØÙÙØÙØ ØÙÙØØØ ØÙØØÙÙ"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "ØÙÙ_ØÙØ ØÙØØÙÙ"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "ÙØÙØ ÙØØÙØ"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "ØÙØØØ ØÙØØÙÙ ÙÙ ØØØ ÙØØØ"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1804
 #, fuzzy
 msgid "Change the page settings for your current printer"
 msgstr "ØØØ ØØØØØØØ ØÙØÙÙØØ ÙØØØØØÙ ØÙØØÙÙÙØ"
 
-#: ../shell/e-shell-window-actions.c:2167
+#: ../shell/e-shell-window-actions.c:2194
 #, c-format
 msgid "Switch to %s"
 msgstr "ØØØÙÙ ØÙÙ %s"
 
-#: ../shell/e-shell-window-actions.c:2382
+#: ../shell/e-shell-window-actions.c:2414
 msgid "Execute these search parameters"
 msgstr ""
 
@@ -20316,26 +19839,26 @@ msgstr ""
 msgid "%s - Evolution"
 msgstr "%s -ØÙÙÙÙÙÙØÙ"
 
-#: ../shell/e-shell-window.c:438
+#: ../shell/e-shell-window.c:442
 msgid "New"
 msgstr "ØØÙØ"
 
-#: ../shell/e-shell.c:314
+#: ../shell/e-shell.c:361
 #, fuzzy
 msgid "Preparing to go offline..."
 msgstr "ØØØÙ ØØØÙØ ØØØØ '%s' ÙÙØÙÙ ØÙÙ ØØØØÙ."
 
-#: ../shell/e-shell.c:367
+#: ../shell/e-shell.c:414
 #, fuzzy
 msgid "Preparing to go online..."
 msgstr "ØØØÙ ØØØÙØ ØØØØ '%s' ÙÙØÙÙ ØÙÙ ØØØØÙ."
 
-#: ../shell/e-shell.c:429
+#: ../shell/e-shell.c:476
 msgid "Preparing to quit..."
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:190
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20354,7 +19877,7 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"ÙØØØÙØ. ØÙØÙØ ØÙÙ ØÙØÙÙ ÙØØ ØØØØØ ØÙÙØØÙÙØ ÙØØ\n"
+"ÙØØØÙØ. ØÙØÙØ ØÙÙ ØÙØÙÙ ØØØØØ ØÙÙØØÙÙØ ÙØØ\n"
 "ÙÙ ØØÙØ ØÙÙÙÙÙÙØÙ.\n"
 "\n"
 "ÙØØ ØÙØØØØØ ÙÙ ØÙÙÙÙÙÙØÙ ÙÙØ ÙÙØÙÙÙØ ØØØ. ÙØØØ ØÙÙØØÙØ\n"
@@ -20364,13 +19887,13 @@ msgstr ""
 "ØÙØØØØØØ ÙØØØÙØ ØÙØØØØØ %s ØØÙÙØ ÙÙÙ.\n"
 ".\n"
 "ØÙ ÙØØØ ØÙÙÙØØ ØØØØÙ ØÙØÙØ ØÙØÙØÙØ ØÙØ bugzilla.gnome.org.\n"
-"ÙØ ÙØØÙ ÙØØ ØÙØØÙØÙØ ÙØ ØÙ ØÙØÙØØ ÙÙÙ ØÙØ ÙÙØÙ ÙÙØØØØØnØÙØÙÙ ÙØ ÙØØØÙØÙÙ "
-"ØÙØØÙÙ ÙÙ ØØØÙÙ.\n"
+"ÙØ ÙØØÙ ÙØØ ØÙØØÙØÙØ ÙØ ØÙ ØÙØÙØØ ÙÙÙ ØÙØ ÙÙØÙ ÙÙØØØØØ\n"
+"ØÙØÙÙ ÙØ ÙØØØÙØÙÙ ØÙØØÙÙ ÙÙ ØØØÙÙ.\n"
 "\n"
 "ÙØÙÙÙ ØÙ ØØØÙØØ ØÙØØØØ ØÙÙÙØ ØÙØØÙØ ÙÙÙØØØ ÙØØØÙØØÙ\n"
 "ØÙØØØ ØÙØØØ!\n"
 
-#: ../shell/main.c:214
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20378,67 +19901,67 @@ msgstr ""
 "ØÙØØ\n"
 "ÙØÙÙ ØÙÙÙÙÙÙØÙÙ\n"
 
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 msgid "Do not tell me again"
 msgstr "ÙØ ØØØØÙÙ ÙØØ ØØØÙ"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:368
+#: ../shell/main.c:308
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr ""
 
-#: ../shell/main.c:372
+#: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:376
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "ØØØ ØÙÙ ØØØØÙ ØØÙØÙØØÙØ"
 
-#: ../shell/main.c:378
+#: ../shell/main.c:318
 #, fuzzy
 msgid "Ignore network availability"
 msgstr "ÙØ ØØØ ÙØÙ ØÙÙÙØÙ ÙÙØÙØØ"
 
-#: ../shell/main.c:380
+#: ../shell/main.c:320
 #, fuzzy
 msgid "Start in \"express\" mode"
 msgstr "ØØØ ØÙÙ ØØØØÙ ØØÙØÙØØÙØ"
 
-#: ../shell/main.c:383
+#: ../shell/main.c:323
 #, fuzzy
 msgid "Forcibly shut down Evolution"
 msgstr "ØØÙÙ ÙÙ ÙÙÙÙØØ ØÙÙÙÙÙÙØÙ ØÙÙØ"
 
-#: ../shell/main.c:386
+#: ../shell/main.c:326
 msgid "Send the debugging output of all components to a file."
 msgstr "ØØØÙÙ ÙØÙÙÙØØ ØØØØØ ØÙØÙÙÙØ ÙØÙÙØ ØÙÙÙÙÙÙØØ ÙÙÙÙ."
 
-#: ../shell/main.c:388
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "ØØÙÙ ØØÙÙÙ ØÙ ÙÙØÙ."
 
-#: ../shell/main.c:390
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ØØÙÙ ÙÙØ ÙØØÙÙØ ØÙØØÙØ ÙØÙÙØØØØÙÙÙ ÙØÙÙÙÙØØ."
 
-#: ../shell/main.c:394
+#: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:396
+#: ../shell/main.c:336
 #, fuzzy
 msgid "Request a running Evolution process to quit"
 msgstr "ØØØÙ ØØØØØ ØØØÙÙ ØÙÙÙÙÙÙØÙ"
 
-#: ../shell/main.c:570 ../shell/main.c:578
+#: ../shell/main.c:512 ../shell/main.c:520
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ØÙÙÙ ØÙØØÙØ ÙÙØÙØ ØÙÙØÙÙÙØØ ØÙØØØÙ ØÙÙÙÙÙÙØÙ"
 
-#: ../shell/main.c:641
+#: ../shell/main.c:583
 #, fuzzy, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20447,7 +19970,7 @@ msgstr ""
 "%s: ÙØ ÙÙÙÙ ØØØØÙØÙ --online Ù --offline ØÙÙÙØÙ.\n"
 "  ØØØØÙÙ %s --help ÙÙØÙØ ÙÙ ØÙÙØÙÙÙØØ.\n"
 
-#: ../shell/main.c:647
+#: ../shell/main.c:589
 #, fuzzy, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20532,74 +20055,74 @@ msgstr "ØÙÙÙØØ"
 msgid "Create a new test source"
 msgstr "ØÙØØ ØÙØØ ØØØØØØ ØØÙØ"
 
-#: ../smclient/eggdesktopfile.c:165
+#: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:188
+#: ../smclient/eggdesktopfile.c:189
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:957
+#: ../smclient/eggdesktopfile.c:959
 #, fuzzy, c-format
 msgid "Starting %s"
 msgstr "ÙØØÙ ÙØØ %s"
 
-#: ../smclient/eggdesktopfile.c:1098
+#: ../smclient/eggdesktopfile.c:1102
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:1166
+#: ../smclient/eggdesktopfile.c:1170
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:1365
+#: ../smclient/eggdesktopfile.c:1370
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:1386
+#: ../smclient/eggdesktopfile.c:1391
 #, fuzzy, c-format
 msgid "Not a launchable item"
 msgstr "ØÙÙØØØ ØÙØ ÙØØÙ ÙÙØØØÙÙ"
 
-#: ../smclient/eggsmclient.c:224
+#: ../smclient/eggsmclient.c:226
 #, fuzzy
 msgid "Disable connection to session manager"
 msgstr "ØØØØÙ Ù_ØØØØ ØØÙØÙØØÙØ"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 #, fuzzy
 msgid "Specify file containing saved configuration"
 msgstr "ØØØØ ØØØØØØØ ØÙØØØÙØ ØÙÙÙÙÙ"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 msgid "FILE"
 msgstr ""
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr ""
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 #, fuzzy
 msgid "ID"
 msgstr "ÙÙÙØ ØÙÙØØØØÙ (UID)"
 
-#: ../smclient/eggsmclient.c:251
+#: ../smclient/eggsmclient.c:253
 msgid "Session management options:"
 msgstr ""
 
-#: ../smclient/eggsmclient.c:252
+#: ../smclient/eggsmclient.c:254
 #, fuzzy
 msgid "Show session management options"
 msgstr "Ø_ØÙØ ØÙØÙØ ØÙÙØØØÙØ"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:107
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20610,7 +20133,7 @@ msgstr ""
 "\n"
 "ØØØ ØØØØØØØ ØÙÙØÙÙ:"
 
-#: ../smime/gui/cert-trust-dialog.c:144
+#: ../smime/gui/cert-trust-dialog.c:146
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20619,7 +20142,7 @@ msgstr ""
 "ÙØÙÙ ØØÙ ÙÙ ØÙØØ ØØØØØ ØÙØÙØØØØ ØÙØÙ ØØØØØ ÙØÙ ØÙØÙØØØØ ØØÙ ÙØÙØ ØØÙ ÙÙ ØØØ "
 "ÙØÙ ØÙØÙØØØ ØÙØ ØØØ ØÙØ ØÙØÙØ ÙÙØ"
 
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20628,89 +20151,128 @@ msgstr ""
 "ÙØÙÙ ÙØ ØØÙ ÙÙ ØÙØØ ØØØØØ ØÙØÙØØØØ ØÙØÙ ØØØØØ ÙØÙ ØÙØÙØØØØ ØØÙ ÙØÙØ ÙØ ØØÙ "
 "ÙÙ ØØØ ÙØÙ ØÙØÙØØØ ØÙØ ØØØ ØÙØ ØÙØÙØ ÙÙØ"
 
-#: ../smime/gui/certificate-manager.c:148
-#: ../smime/gui/certificate-manager.c:460
-#: ../smime/gui/certificate-manager.c:697
-msgid "Select a certificate to import..."
-msgstr "ØÙØÙ ØÙØØØ ÙØØØÙØØØÙØ..."
-
-#: ../smime/gui/certificate-manager.c:157
-msgid "All PKCS12 files"
-msgstr "ÙÙ ÙÙÙØØ PKCS12"
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+msgid "Certificate Name"
+msgstr "ØØÙ ØÙØÙÙØØØ"
 
-#: ../smime/gui/certificate-manager.c:163
-#: ../smime/gui/certificate-manager.c:475
-#: ../smime/gui/certificate-manager.c:711
-msgid "All files"
-msgstr "ÙÙ ØÙÙÙÙØØ"
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#, fuzzy
+msgid "Issued To Organization"
+msgstr "ØÙ_ÙÙØÙÙØ:"
 
-#: ../smime/gui/certificate-manager.c:182
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
 #, fuzzy
-msgid "Failed to import user's certificate"
-msgstr "ØÙØØØ ÙØØÙØØØ"
+msgid "Issued To Organizational Unit"
+msgstr "ÙØØØ ØÙÙÙØÙÙØ (OU)"
 
-#: ../smime/gui/certificate-manager.c:352
-#: ../smime/gui/certificate-manager.c:574
-#: ../smime/gui/certificate-manager.c:808
-msgid "Certificate Name"
-msgstr "ØØÙ ØÙØÙÙØØØ"
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/lib/e-cert.c:569
+msgid "Serial Number"
+msgstr "ØÙØÙÙÙ ØÙØÙØÙØÙÙ"
 
-#: ../smime/gui/certificate-manager.c:361
-#: ../smime/gui/certificate-manager.c:592
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
 msgid "Purposes"
 msgstr "ØÙØØØØØ"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:566
-msgid "Serial Number"
-msgstr "ØÙØÙÙÙ ØÙØÙØÙØÙÙ"
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+#, fuzzy
+msgid "Issued By"
+msgstr "ØØØÙØ ÙÙ"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+#, fuzzy
+msgid "Issued By Organization"
+msgstr "ØÙ_ÙÙØÙÙØ:"
+
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+#, fuzzy
+msgid "Issued By Organizational Unit"
+msgstr "ÙØØØ ØÙÙÙØÙÙØ (OU)"
 
-#: ../smime/gui/certificate-manager.c:378
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+#, fuzzy
+msgid "Issued"
+msgstr "ØÙÙÙØØØ"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "ØÙØÙÙ ØÙØØÙØÙØ"
 
-#: ../smime/gui/certificate-manager.c:469
-msgid "All email certificate files"
-msgstr "ÙÙ ÙÙÙØØ ØÙØØØØ ØÙØØÙØ"
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+msgid "SHA1 Fingerprint"
+msgstr "ØØÙØ SHA1"
+
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+msgid "MD5 Fingerprint"
+msgstr "ØØÙØ MD5"
 
-#: ../smime/gui/certificate-manager.c:502
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
 #, fuzzy
-msgid "Failed to import contact's certificate"
-msgstr "ÙØÙ ØØÙ ØÙÙØÙØØÙ"
+msgid "Email Address"
+msgstr "_ØÙÙØÙ ØÙØØÙØ ØÙØÙÙØØÙÙÙ:"
+
+#: ../smime/gui/certificate-manager.c:575
+msgid "Select a certificate to import..."
+msgstr "ØÙØÙ ØÙØØØ ÙØØØÙØØØÙØ..."
+
+#: ../smime/gui/certificate-manager.c:588
+msgid "All files"
+msgstr "ÙÙ ØÙÙÙÙØØ"
+
+#: ../smime/gui/certificate-manager.c:623
+#, fuzzy
+msgid "Failed to import certificate"
+msgstr "ØÙØØØ ÙØØÙØØØ"
+
+#: ../smime/gui/certificate-manager.c:991
+msgid "All PKCS12 files"
+msgstr "ÙÙ ÙÙÙØØ PKCS12"
 
-#: ../smime/gui/certificate-manager.c:583
-msgid "E-Mail Address"
-msgstr "ØÙÙØÙ ØÙØØÙØ ØÙØÙÙØØÙÙÙ"
+#: ../smime/gui/certificate-manager.c:1009
+msgid "All email certificate files"
+msgstr "ÙÙ ÙÙÙØØ ØÙØØØØ ØÙØØÙØ"
 
-#: ../smime/gui/certificate-manager.c:706
+#: ../smime/gui/certificate-manager.c:1027
 msgid "All CA certificate files"
 msgstr "ÙÙ ÙÙÙØØ ØÙØØØØ CA"
 
-#: ../smime/gui/certificate-manager.c:737
-msgid "Failed to import certificate authority's certificate"
-msgstr ""
-
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-viewer.c:345
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ØØØØ ØÙØÙØØØØ: %s"
 
-#: ../smime/gui/component.c:46
+#: ../smime/gui/component.c:50
 #, fuzzy, c-format
 msgid "Enter the password for '%s'"
 msgstr "ØØØÙ ÙÙÙØ ØÙØØ ÙÙ`%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:69
+#: ../smime/gui/component.c:76
 msgid "Enter new password for certificate database"
 msgstr "ØØØÙ ÙÙÙØ ØÙØØ ØÙØØÙØØ ÙÙØØØØ ØÙØÙØØ ØÙØÙØØØØ"
 
-#: ../smime/gui/component.c:71
+#: ../smime/gui/component.c:78
 msgid "Enter new password"
 msgstr "ØØØÙ ÙÙÙØ ØÙØØ ØÙØØÙØØ"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20719,7 +20281,7 @@ msgstr ""
 "ØØØØ ÙÙ:\n"
 "  ØÙÙÙØÙØ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20728,7 +20290,7 @@ msgstr ""
 "ØØØØ ÙÙ ØØÙ:\n"
 "  ØÙÙÙØÙØ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:169
+#: ../smime/gui/e-cert-selector.c:172
 msgid "Select certificate"
 msgstr "ØÙØÙØØ ØÙØØØ"
 
@@ -20753,7 +20315,7 @@ 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:1097
 msgid "Certificate"
 msgstr "ØÙØØØ"
 
@@ -20815,11 +20377,6 @@ msgstr "ØØÙ ØÙØÙÙ"
 msgid "Fingerprints"
 msgstr "ØØÙØ MD5"
 
-#: ../smime/gui/smime-ui.ui.h:23
-#, fuzzy
-msgid "Issued By"
-msgstr "ØØØÙØ ÙÙ"
-
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "ØØØÙØ ÙÙ"
@@ -20829,10 +20386,6 @@ msgstr "ØØØÙØ ÙÙ"
 msgid "Issued To"
 msgstr "ØØØÙØ ÙÙ"
 
-#: ../smime/gui/smime-ui.ui.h:26
-msgid "MD5 Fingerprint"
-msgstr "ØØÙØ MD5"
-
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "ØÙÙÙØÙØ (O)"
@@ -20841,15 +20394,11 @@ msgstr "ØÙÙÙØÙØ (O)"
 msgid "Organizational Unit (OU)"
 msgstr "ÙØØØ ØÙÙÙØÙÙØ (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "SHA1 Fingerprint"
-msgstr "ØØÙØ SHA1"
-
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
 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:833
 msgid "SSL Server Certificate"
 msgstr "ØÙØØØ ØØØÙÙ SSL"
 
@@ -20905,7 +20454,7 @@ msgstr "ÙØØ ØØØÙØØÙ"
 msgid "_Edit CA Trust"
 msgstr "_ØØØ ÙØÙ ØÙØÙØ ÙÙ ØÙØØ ØØØØØ ØÙØÙØØØ"
 
-#: ../smime/lib/e-cert-db.c:906
+#: ../smime/lib/e-cert-db.c:912
 msgid "Certificate already exists"
 msgstr "ØÙØÙÙØØØ ÙÙØÙØØ ØØÙÙØ"
 
@@ -20914,194 +20463,196 @@ msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:414
+#: ../smime/lib/e-cert.c:417
 msgid "Sign"
 msgstr "ØÙÙÙØ"
 
-#: ../smime/lib/e-cert.c:415
+#: ../smime/lib/e-cert.c:418
 msgid "Encrypt"
 msgstr "ØØÙÙØ"
 
-#: ../smime/lib/e-cert.c:527
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "ØÙÙÙØØØ"
 
-#: ../smime/lib/e-cert.c:542
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "ØÙÙÙØØØ 1"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "ØÙÙÙØØØ 2"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "ØÙÙÙØØØ 3"
 
-#: ../smime/lib/e-cert.c:630
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 ØØØÙÙØ RSA"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 ØØØÙÙØ RSA"
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 ØØØÙÙØ RSA"
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:643
 #, fuzzy
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 ØØØÙÙØ RSA"
 
-#: ../smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:646
 #, fuzzy
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 ØØØÙÙØ RSA"
 
-#: ../smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:649
 #, fuzzy
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 ØØØÙÙØ RSA"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:676
 msgid "PKCS #1 RSA Encryption"
 msgstr "ØØÙÙØ PKCS #1 RSA"
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:679
 msgid "Certificate Key Usage"
 msgstr "ØØØØØØÙ ÙÙØØØ ØÙØÙÙØØØ"
 
-#: ../smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:682
 msgid "Netscape Certificate Type"
 msgstr "ÙÙØ ØÙØØØ ÙØÙØÙÙØ"
 
-#: ../smime/lib/e-cert.c:681
+#: ../smime/lib/e-cert.c:685
 msgid "Certificate Authority Key Identifier"
 msgstr "ÙÙÙÙØ ÙÙØØØ ØÙØØ ØÙØÙÙØØØ"
 
-#: ../smime/lib/e-cert.c:693
+#: ../smime/lib/e-cert.c:697
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ÙÙÙÙØ ØÙØØÙ (%s)"
 
-#: ../smime/lib/e-cert.c:744
+#: ../smime/lib/e-cert.c:749
 msgid "Algorithm Identifier"
 msgstr "ÙÙÙÙØ ØÙØÙØÙØØÙ"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:757
 msgid "Algorithm Parameters"
 msgstr "ÙØØÙØØ ØÙØÙØÙØØÙ"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Info"
 msgstr "ÙØÙÙÙØØ ÙÙØØØ ØÙÙÙØÙØ ØÙØØÙ"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:784
 msgid "Subject Public Key Algorithm"
 msgstr "ØÙØÙØØÙ ÙÙØØØ ØÙÙÙØÙØ ØÙØØÙ"
 
-#: ../smime/lib/e-cert.c:794
+#: ../smime/lib/e-cert.c:799
 msgid "Subject's Public Key"
 msgstr "ÙÙØØØ ØÙÙÙØÙØ ØÙØØÙ"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
 msgid "Error: Unable to process extension"
 msgstr "ØØØ: ÙÙ ÙÙÙÙ ÙØØÙØØ ØÙØÙØØØØ"
 
-#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
 msgid "Object Signer"
 msgstr "ÙÙÙÙØ ØÙØØÙ"
 
-#: ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:845
 msgid "SSL Certificate Authority"
 msgstr "ØÙØØ ØÙØØØ SSL"
 
-#: ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:849
 msgid "Email Certificate Authority"
 msgstr "ØÙØØ ØÙØØØ ØÙØØÙØ ØÙØÙÙØØÙÙÙ"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:878
 msgid "Signing"
 msgstr "ØÙØÙÙÙÙØ"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:882
 msgid "Non-repudiation"
 msgstr "ØØÙ ØÙØÙÙØØ"
 
-#: ../smime/lib/e-cert.c:880
+#: ../smime/lib/e-cert.c:886
 msgid "Key Encipherment"
 msgstr "ØØÙÙØ ØÙÙÙØØØ"
 
-#: ../smime/lib/e-cert.c:884
+#: ../smime/lib/e-cert.c:890
 msgid "Data Encipherment"
 msgstr "ØØÙÙØ ØÙØÙØÙØØ"
 
-#: ../smime/lib/e-cert.c:888
+#: ../smime/lib/e-cert.c:894
 msgid "Key Agreement"
 msgstr "ØØÙØÙ ØÙÙ ØÙÙÙØØØ"
 
-#: ../smime/lib/e-cert.c:892
+#: ../smime/lib/e-cert.c:898
 msgid "Certificate Signer"
 msgstr "ÙÙÙÙÙØ ØÙØÙÙØØØ"
 
-#: ../smime/lib/e-cert.c:896
+#: ../smime/lib/e-cert.c:902
 msgid "CRL Signer"
 msgstr "ÙÙÙÙØ CRL"
 
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:951
 msgid "Critical"
 msgstr "ØØÙØ"
 
-#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
 msgid "Not Critical"
 msgstr "ØÙØ ØØÙØ"
 
-#: ../smime/lib/e-cert.c:970
+#: ../smime/lib/e-cert.c:977
 msgid "Extensions"
 msgstr "ØÙØØØØØØ"
 
-#. Translators: This string is used in Certificate details for fields like Issuer
-#. or Subject, which shows the field name on the left and its respective value
-#. on the right, both as stored in the certificate itself. You probably do not
-#. need to change this string, unless changing the order of name and value.
-#. As a result example: "OU = VeriSign Trust Network"
-#.
-#: ../smime/lib/e-cert.c:1045
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../smime/lib/e-cert.c:1055
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
 msgid "Certificate Signature Algorithm"
 msgstr "ØÙØÙØØÙ ØÙÙÙØ ØÙØÙÙØØØ"
 
-#: ../smime/lib/e-cert.c:1109
+#: ../smime/lib/e-cert.c:1120
 msgid "Issuer"
 msgstr "ØÙÙÙØØØ"
 
-#: ../smime/lib/e-cert.c:1164
+#: ../smime/lib/e-cert.c:1175
 msgid "Issuer Unique ID"
 msgstr "ØÙÙÙÙÙØ ØÙÙØÙØØ ÙÙÙÙØØØ"
 
-#: ../smime/lib/e-cert.c:1183
+#: ../smime/lib/e-cert.c:1194
 msgid "Subject Unique ID"
 msgstr "ØÙÙÙÙÙØ ØÙÙØÙØØ ÙÙÙÙØÙØ"
 
-#: ../smime/lib/e-cert.c:1229
+#: ../smime/lib/e-cert.c:1240
 msgid "Certificate Signature Value"
 msgstr "ÙÙÙØ ØÙÙÙØ ØÙØÙÙØØØ"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:256
 msgid "PKCS12 File Password"
 msgstr "ÙÙÙØ ØØ ÙÙÙ PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:251
+#: ../smime/lib/e-pkcs12.c:257
 msgid "Enter password for PKCS12 file:"
 msgstr "ØØØØÙ ÙÙÙØ ØÙØÙØ ÙÙÙÙ PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:353
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "ØÙØØØ ÙØØÙØØØ"
 
@@ -21182,7 +20733,7 @@ msgstr "ØØÙØØÙØ"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
 msgid "UTC"
 msgstr "UTC"
 
@@ -21213,14 +20764,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "ÙÙØ ØÙØÙØÙØØ"
 
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-define-views-dialog.c:359
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "ØØØ ØÙÙØØÙØ ÙÙ%s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:354
-#: ../widgets/menus/gal-define-views-dialog.c:356
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
 msgid "Define Views"
 msgstr "ØØØ ØÙÙØØÙØ"
 
@@ -21229,11 +20780,11 @@ msgstr "ØØØ ØÙÙØØÙØ"
 msgid "Define Views for \"%s\""
 msgstr "ØØØ ØÙÙØØÙØ ÙÙ\"%s\""
 
-#: ../widgets/menus/gal-view-factory-etable.c:109
+#: ../widgets/menus/gal-view-factory-etable.c:111
 msgid "Table"
 msgstr "ØØÙÙ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:273
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "ØØÙØ ØÙÙØÙØ ØÙØØÙÙ"
 
@@ -21245,7 +20796,7 @@ msgstr "ØÙØØ ÙØ_ÙØ ØØÙØ"
 msgid "_Replace existing view"
 msgstr "ØØØØ_ØÙÙ ØÙÙØÙØ ØÙÙÙØÙØ"
 
-#: ../widgets/menus/gal-view-new-dialog.c:106
+#: ../widgets/menus/gal-view-new-dialog.c:108
 msgid "Define New View"
 msgstr "ØØØ ÙØÙØ ØØÙØ"
 
@@ -21261,43 +20812,48 @@ msgstr "ÙÙØ ØÙÙØÙØ"
 msgid "Type of view:"
 msgstr "ÙÙØ ØÙÙØÙØ:"
 
-#: ../widgets/misc/e-account-manager.c:349
+#: ../widgets/misc/e-account-manager.c:353
 msgid "De_fault"
 msgstr "ØÙØ_ÙØØØØ"
 
-#: ../widgets/misc/e-account-tree-view.c:270
+#: ../widgets/misc/e-account-tree-view.c:243
+#, fuzzy
+msgid "Account Name"
+msgstr "ØØÙ ØÙØØØØ"
+
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "ØÙØØØÙÙÙÙ"
 
-#: ../widgets/misc/e-attachment-dialog.c:304
+#: ../widgets/misc/e-attachment-dialog.c:308
 msgid "Attachment Properties"
 msgstr "ØØØØØ ØÙÙÙØÙÙ"
 
-#: ../widgets/misc/e-attachment-dialog.c:326
+#: ../widgets/misc/e-attachment-dialog.c:330
 #, fuzzy
 msgid "_Filename:"
 msgstr "ØØÙ ØÙ_ÙÙÙ:"
 
-#: ../widgets/misc/e-attachment-dialog.c:361
+#: ../widgets/misc/e-attachment-dialog.c:365
 #, fuzzy
 msgid "MIME Type:"
 msgstr "ÙÙØ MIME"
 
-#: ../widgets/misc/e-attachment-dialog.c:369
-#: ../widgets/misc/e-attachment-store.c:556
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
 msgid "_Suggest automatic display of attachment"
 msgstr "Ø_ÙØØØ ØØØ ØÙÙÙØØÙ ÙÙÙÙØÙÙ"
 
-#: ../widgets/misc/e-attachment-handler-image.c:96
+#: ../widgets/misc/e-attachment-handler-image.c:95
 #, fuzzy
 msgid "Could not set as background"
 msgstr "ØØØØ Ù_ØÙÙÙØ"
 
-#: ../widgets/misc/e-attachment-handler-image.c:148
+#: ../widgets/misc/e-attachment-handler-image.c:145
 msgid "Set as _Background"
 msgstr "ØØØØ Ù_ØÙÙÙØ"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:90
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
 #, fuzzy
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
@@ -21305,48 +20861,50 @@ msgstr[0] "ØØØØ ÙØØ ÙÙÙ ØÙØÙØ ØÙØÙÙ"
 msgstr[1] "ØØØØ ÙØØ ÙÙÙ ØÙØÙØ ØÙØÙÙ"
 msgstr[2] "ØØØØ ÙØØ ÙÙÙ ØÙØÙØ ØÙØÙÙ"
 msgstr[3] "ØØØØ ÙØØ ÙÙÙ ØÙØÙØ ØÙØÙÙ"
+msgstr[4] ""
+msgstr[5] ""
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:132
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
 #, fuzzy
 msgid "_Send To..."
 msgstr "ØØØÙ ØÙÙ:"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:134
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
 #, fuzzy
 msgid "Send the selected attachments somewhere"
 msgstr "ØØØØ ÙØÙÙØ ÙØÙÙØ ØÙÙÙØÙÙ ØÙÙØØÙØ..."
 
-#: ../widgets/misc/e-attachment-icon-view.c:158
-#: ../widgets/misc/e-attachment-tree-view.c:543
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
 #, fuzzy
 msgid "Loading"
 msgstr "ÙØØÙ ØÙØÙØÙÙÙ..."
 
-#: ../widgets/misc/e-attachment-icon-view.c:170
-#: ../widgets/misc/e-attachment-tree-view.c:555
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
 #, fuzzy
 msgid "Saving"
 msgstr "ØØÙÙÙ"
 
-#: ../widgets/misc/e-attachment-paned.c:93
+#: ../widgets/misc/e-attachment-paned.c:97
 msgid "Hide Attachment _Bar"
 msgstr "ØØÙÙ _ØØÙØ ØÙÙÙØÙÙØØ"
 
-#: ../widgets/misc/e-attachment-paned.c:95
-#: ../widgets/misc/e-attachment-paned.c:635
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
 msgid "Show Attachment _Bar"
 msgstr "ØØÙØ _ØØÙØ ØÙÙÙØÙÙØØ"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:547
 #, fuzzy
 msgid "Add Attachment"
 msgstr "ÙØÙÙ"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:550
 msgid "A_ttach"
 msgstr "Ø_ØÙÙÙ"
 
-#: ../widgets/misc/e-attachment-store.c:610
+#: ../widgets/misc/e-attachment-store.c:613
 #, fuzzy
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
@@ -21354,47 +20912,53 @@ msgstr[0] "ØØÙØ ØÙÙØÙÙØØ"
 msgstr[1] "ØØÙØ ØÙÙØÙÙØØ"
 msgstr[2] "ØØÙØ ØÙÙØÙÙØØ"
 msgstr[3] "ØØÙØ ØÙÙØÙÙØØ"
+msgstr[4] ""
+msgstr[5] ""
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:639
-#: ../widgets/misc/e-attachment.c:1806 ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
 #, fuzzy
 msgid "attachment.dat"
 msgstr "ÙÙØÙÙ"
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr ""
+
+#: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
 msgstr "ØØ_ÙØ ØÙÙÙ"
 
-#: ../widgets/misc/e-attachment-view.c:375
+#: ../widgets/misc/e-attachment-view.c:437
 #, fuzzy
 msgid "A_dd Attachment..."
 msgstr "Ø_ØÙ ÙÙØÙÙ..."
 
-#: ../widgets/misc/e-attachment-view.c:399
+#: ../widgets/misc/e-attachment-view.c:461
 msgid "_Hide"
 msgstr "Ø_ØÙÙ"
 
-#: ../widgets/misc/e-attachment-view.c:406
+#: ../widgets/misc/e-attachment-view.c:468
 #, fuzzy
 msgid "Hid_e All"
 msgstr "ØØ_ÙØ ØÙÙÙ"
 
-#: ../widgets/misc/e-attachment-view.c:413
+#: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
 msgstr "Ø_ØØØ ØÙÙ ØÙØÙÙØÙ"
 
-#: ../widgets/misc/e-attachment-view.c:420
+#: ../widgets/misc/e-attachment-view.c:482
 #, fuzzy
 msgid "Vie_w All Inline"
 msgstr "Ø_ØØØ ØÙÙ ØÙØÙÙØÙ"
 
-#: ../widgets/misc/e-attachment-view.c:738
+#: ../widgets/misc/e-attachment-view.c:803
 #, fuzzy, c-format
-msgid "Open with \"%s\""
+msgid "Open With \"%s\""
 msgstr "ØÙØØ ÙÙ %s..."
 
-#: ../widgets/misc/e-attachment-view.c:741
+#: ../widgets/misc/e-attachment-view.c:806
 #, fuzzy, c-format
 msgid "Open this attachment in %s"
 msgstr "ØØÙØ ØÙÙØÙÙ ÙÙ"
@@ -21403,81 +20967,86 @@ msgstr "ØØÙØ ØÙÙØÙÙ ÙÙ"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:994
+#: ../widgets/misc/e-attachment.c:998
 #, fuzzy
 msgid "Attached message"
 msgstr "ØØØÙØ ÙØØØØ ÙØÙÙØ"
 
-#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
 msgid "A load operation is already in progress"
 msgstr ""
 
-#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
 msgid "A save operation is already in progress"
 msgstr ""
 
-#: ../widgets/misc/e-attachment.c:1949
+#: ../widgets/misc/e-attachment.c:1953
 #, fuzzy, c-format
 msgid "Could not load '%s'"
 msgstr "ØØØÙØ ØØÙÙÙ ØÙØØ ØÙØÙØÙÙÙ"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1956
 #, fuzzy, c-format
 msgid "Could not load the attachment"
 msgstr "ØØØØ ÙØØ ÙÙÙ ØÙØÙØ ØÙØÙÙ"
 
-#: ../widgets/misc/e-attachment.c:2228
+#: ../widgets/misc/e-attachment.c:2232
 #, fuzzy, c-format
 msgid "Could not open '%s'"
 msgstr "ÙÙ ÙÙÙÙ ÙØØ ØÙÙØØØ"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2235
 #, fuzzy, c-format
 msgid "Could not open the attachment"
 msgstr "ØØØØ ÙØØ ÙÙÙ ØÙØÙØ ØÙØÙÙ"
 
-#: ../widgets/misc/e-attachment.c:2666
+#: ../widgets/misc/e-attachment.c:2670
 #, fuzzy
 msgid "Attachment contents not loaded"
 msgstr "ÙØÙÙØ ØÙÙØÙÙØØ"
 
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2746
 #, fuzzy, c-format
 msgid "Could not save '%s'"
 msgstr "ÙÙ ÙÙÙÙ ØÙÙÙØ '%s': %s\n"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2749
 #, fuzzy, c-format
 msgid "Could not save the attachment"
 msgstr "ØØØØ ÙØÙØÙØ ÙØÙØ ÙÙ ØÙÙØÙÙØØ"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:387
 #, fuzzy
 msgid "Ctrl-click to open a link"
 msgstr "ØÙÙØ ÙÙØØ %s"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1229
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:225
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "ØÙÙÙÙ ØÙØÙ"
 
-#: ../widgets/misc/e-charset-combo-box.c:92
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "ØØÙÙØ ØÙÙØØØÙ"
 
-#: ../widgets/misc/e-charset-combo-box.c:115
+#: ../widgets/misc/e-charset-combo-box.c:119
 msgid "Enter the character set to use"
 msgstr "ØØØÙ ÙØÙÙØØ ØÙÙØØØÙ ÙÙØØØØØØÙ"
 
-#: ../widgets/misc/e-charset-combo-box.c:335
+#: ../widgets/misc/e-charset-combo-box.c:339
 msgid "Other..."
 msgstr "ØØØÙ..."
 
+#: ../widgets/misc/e-contact-map-window.c:355
+#, fuzzy
+msgid "Contacts Map"
+msgstr "ØÙÙØØØØÙÙÙ: "
+
 #: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "ØÙØØØÙØ Ù ØÙÙÙØ"
@@ -21503,65 +21072,65 @@ msgid "_Today"
 msgstr "ØÙ_ÙÙÙ"
 
 #. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
+#. * is not permitted.
 #: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "ÙØ _ØÙØ"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1686 ../widgets/misc/e-dateedit.c:1918
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
 #, fuzzy
 msgctxt "date"
 msgid "None"
 msgstr "ÙØ ØÙØ"
 
-#: ../widgets/misc/e-dateedit.c:1813
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "ÙÙÙØ ØØØÙØ ØÙØ ØØÙØØ"
 
-#: ../widgets/misc/e-dateedit.c:1857
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "ÙÙÙØ ÙÙØ ØÙØ ØØÙØØ"
 
-#: ../widgets/misc/e-import-assistant.c:245
+#: ../widgets/misc/e-import-assistant.c:249
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr ""
 "ØØØØ ØÙÙÙÙÙ ØÙØÙ ØØÙØ ØØØÙØØØÙ ØÙÙ ØÙÙÙÙÙÙØÙØ ÙØÙØÙÙ ÙÙØ ØÙÙÙÙ ÙÙ ØÙÙØØÙØ."
 
-#: ../widgets/misc/e-import-assistant.c:262
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "ØØÙ ØÙ_ÙÙÙ:"
 
-#: ../widgets/misc/e-import-assistant.c:272
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "ØÙØÙØØ ÙÙÙ"
 
-#: ../widgets/misc/e-import-assistant.c:286
-#: ../widgets/misc/e-import-assistant.c:461
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "_ÙÙØ ØÙÙÙÙ:"
 
-#: ../widgets/misc/e-import-assistant.c:329
-#: ../widgets/misc/e-import-assistant.c:905
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "ØØØØ ØÙÙÙØØ ÙÙØØ ØÙØØØÙØØØ "
 
-#: ../widgets/misc/e-import-assistant.c:354
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "ØÙÙØ ÙØØØÙØØ ÙÙØ ØÙÙØØÙØØ:"
 
-#: ../widgets/misc/e-import-assistant.c:362
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "ØØØÙØØ ØÙØÙØØ ÙØØØØØØØ ÙÙ ØØØÙØ Ø_ÙØÙ"
 
-#: ../widgets/misc/e-import-assistant.c:370
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "ØØØÙØØØ ÙÙÙ _ÙØÙØ"
 
-#: ../widgets/misc/e-import-assistant.c:522
+#: ../widgets/misc/e-import-assistant.c:526
 #, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following applications: "
@@ -21574,40 +21143,40 @@ msgstr ""
 "ØÙÙØØÙÙØØ ØØØØ ØÙÙØ ØØ \"ØÙÙ\".\n"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:762
+#: ../widgets/misc/e-import-assistant.c:768
 #, fuzzy
 msgid "_Cancel Import"
 msgstr "Ø_ØØÙØØØ"
 
-#: ../widgets/misc/e-import-assistant.c:904
+#: ../widgets/misc/e-import-assistant.c:912
 #, fuzzy
 msgid "Preview data to be imported"
 msgstr "ØØÙÙÙ ØÙØØØÙØ ÙØÙ ØØØÙØ"
 
-#: ../widgets/misc/e-import-assistant.c:910
-#: ../widgets/misc/e-import-assistant.c:923
-#: ../widgets/misc/e-import-assistant.c:1270
-#: ../widgets/misc/e-import-assistant.c:1336
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:931
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1352
+#: ../widgets/misc/e-import-assistant.c:1361
 #, fuzzy
 msgid "Import Data"
 msgstr "ÙÙÙ"
 
-#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr ""
 
-#: ../widgets/misc/e-import-assistant.c:1260
-#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
 msgid "Evolution Import Assistant"
 msgstr "ÙØØØØ ØÙØØØÙØØØ ÙØÙÙÙÙÙØÙÙ"
 
-#: ../widgets/misc/e-import-assistant.c:1277
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1339
 msgid "Import Location"
 msgstr "ØØØÙØØØ ÙÙÙØ"
 
-#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1294
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
@@ -21618,29 +21187,29 @@ msgstr ""
 "ØÙØØØÙ ÙØØ ØÙÙØØØØ ØÙØÙ ØÙÙÙØ\n"
 "ØØØÙØØØ ÙÙÙØØ ØØØØÙØ ØÙÙ ØÙÙÙÙÙÙØÙ."
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Importer Type"
 msgstr "ÙÙØ ØÙÙØØÙØØ"
 
-#: ../widgets/misc/e-import-assistant.c:1310
+#: ../widgets/misc/e-import-assistant.c:1321
 #, fuzzy
 msgid "Select Information to Import"
 msgstr "ØÙØÙØØ ÙØÙØÙØ ÙÙØØØÙØØØ ØÙÙÙ"
 
-#: ../widgets/misc/e-import-assistant.c:1317
+#: ../widgets/misc/e-import-assistant.c:1330
 msgid "Select a File"
 msgstr "ØÙØÙÙ ÙÙÙÙÙØ"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1347
 #, fuzzy
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "ØÙÙØ \"ØØØÙØØØ\" ÙØØØ ØØØÙØØØ ØÙÙÙÙ ØÙÙ ØÙÙÙÙÙØÙÙ"
 
-#: ../widgets/misc/e-map.c:866
+#: ../widgets/misc/e-map.c:883
 msgid "World Map"
 msgstr "ØØÙØØ ØÙØØÙÙ"
 
-#: ../widgets/misc/e-map.c:869
+#: ../widgets/misc/e-map.c:886
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21648,80 +21217,80 @@ msgstr ""
 "ØØÙØØ ØÙØØÙÙØ ØØØÙØ ØÙÙ ØÙÙØÙØ ÙØØØÙØ ØÙÙÙØÙØ ØÙØÙÙÙØ. ÙØØØØÙÙØ ÙÙØØ "
 "ØÙÙÙØØÙØ ØÙÙÙÙ ØÙØÙØØ ØÙÙÙØÙØ ØÙØÙÙÙØ ÙÙ ÙØØØ ØÙØØÙÙØØ ØÙÙÙØØÙ ÙÙ ØÙØØÙÙ.."
 
-#: ../widgets/misc/e-online-button.c:23
+#: ../widgets/misc/e-online-button.c:27
 #, fuzzy
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "ØÙÙÙÙÙÙØÙ ÙØØÙ ØØÙÙØ.\n"
 "ØÙÙØ ÙØØ ØÙØØ ÙÙØÙÙ ØÙÙ ØØØØÙ."
 
-#: ../widgets/misc/e-online-button.c:26
+#: ../widgets/misc/e-online-button.c:30
 #, fuzzy
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "ØÙÙÙÙÙÙØÙ ØÙÙ ØØØØÙ ØØÙÙØ.\n"
 "ØÙÙØ ÙØØ ØÙØØ ÙÙØÙÙ ÙØ ØØØØÙ."
 
-#: ../widgets/misc/e-online-button.c:29
+#: ../widgets/misc/e-online-button.c:33
 #, fuzzy
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "ØÙÙÙÙÙÙØÙ ØÙÙ ØØØØÙ ØØÙÙØ.\n"
 "ØÙÙØ ÙØØ ØÙØØ ÙÙØÙÙ ÙØ ØØØØÙ."
 
-#: ../widgets/misc/e-preferences-window.c:275
+#: ../widgets/misc/e-preferences-window.c:279
 msgid "Evolution Preferences"
 msgstr "ØÙØÙÙØØ ØÙÙÙÙÙÙØÙÙ"
 
-#: ../widgets/misc/e-search-bar.c:75
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "ØÙÙØØØÙØØ: %d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:563
 #, fuzzy
 msgid "Close the find bar"
 msgstr "ØÙÙ ÙØÙ ØÙÙØÙØØ"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "Ø_ØØØ:"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:583
 #, fuzzy
 msgid "Clear the search"
 msgstr "ØØØØ ØØØÙÙØ"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "ØÙ_ØØØÙ"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:620
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "ØÙ_ØÙØÙÙ"
 
-#: ../widgets/misc/e-search-bar.c:626
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:639
+#: ../widgets/misc/e-search-bar.c:645
 #, fuzzy
 msgid "Mat_ch case"
 msgstr "_ØØØÙÙ ØØÙØ ØÙØØØÙ"
 
-#: ../widgets/misc/e-search-bar.c:667
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.c:543
+#: ../widgets/misc/e-send-options.c:552
 msgid "When de_leted:"
 msgstr "ØÙØ ØÙØ_ØÙ:"
 
@@ -21742,143 +21311,162 @@ msgid "Delivery Options"
 msgstr "ØÙØØØØ ØÙØØÙÙÙ"
 
 #: ../widgets/misc/e-send-options.ui.h:6
+#, fuzzy
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_ØØÙÙ:"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+#, fuzzy
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "Ø_ØØ:"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+#, fuzzy
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "ØÙØÙÙØÙ"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+#, fuzzy
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "_ØÙØÙ"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+#, fuzzy
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "ØÙØÙÙØÙ"
+
+#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.ui.h:7
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "ØÙØØØØ _ØØÙØ"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "Mail Receipt"
 msgstr "ØØØØØ ÙØÙÙ ØØÙØ"
 
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:17
 #, fuzzy
 msgid "Proprietary"
 msgstr "ØÙØÙÙÙÙÙØ"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "ØÙØØ Ù_ØÙÙØ"
 
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr "ØÙØÙÙ ØÙÙØÙÙ"
 
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:21
 msgid "Secret"
 msgstr "ØØÙÙ"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "ØØ_ÙØ ØÙØØÙØ"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
 #, fuzzy
 msgid "Standard"
 msgstr "ØÙØØ ØÙÙÙØ_ØÙ:"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
 msgstr "ØØÙÙØ ØÙØØÙØ"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "ØØÙÙ ÙÙØØÙØ"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr "ØÙØ ØÙÙ_ØÙÙ:"
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
 msgstr "ØÙØ ØÙØ_ÙØÙØÙ:"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
 msgstr "ØÙØ ØÙ_ØÙØ:"
 
-#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
-#: ../widgets/misc/e-send-options.ui.h:29
-#, fuzzy
-msgid "Wi_thin"
-msgstr "_ØÙØÙ"
-
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../widgets/misc/e-send-options.ui.h:31
-#, fuzzy
-msgid "_After"
-msgstr "Ø_ØØ:"
-
-#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "ÙÙ ØÙÙ_ØÙÙÙØØ"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "ØÙØÙ_ØÙÙÙ"
 
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "Ø_ØÙØ ØØÙÙÙ ØÙØØØØÙ"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "_ØÙ ØØÙÙÙÙ"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
 msgstr "_ØÙÙ ØØØÙØ ØÙØÙØØ ØÙØÙØØÙØ"
 
-#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
-#: ../widgets/misc/e-send-options.ui.h:39
-#, fuzzy
-msgid "_Until"
-msgstr "_ØØÙÙ:"
-
-#: ../widgets/misc/e-send-options.ui.h:40
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "_ØÙØ ØÙÙÙØØØØ"
 
-#: ../widgets/misc/e-send-options.ui.h:41
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "_ØÙØ ØÙÙØØ:"
 
-#: ../widgets/misc/e-signature-editor.c:134
-#: ../widgets/misc/e-signature-editor.c:560
-#: ../widgets/misc/e-signature-manager.c:348
-#: ../widgets/misc/e-signature-script-dialog.c:215
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+#, fuzzy
+msgctxt "send-options"
+msgid "None"
+msgstr "ÙØ ØÙØ"
+
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "ØÙØ ÙØÙÙÙ"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "Ø_ØÙØ Ù ØØÙÙ"
 
-#: ../widgets/misc/e-signature-editor.c:427
+#: ../widgets/misc/e-signature-editor.c:431
 msgid "Edit Signature"
 msgstr "ØØØ ØÙØÙÙÙØ"
 
-#: ../widgets/misc/e-signature-editor.c:442
+#: ../widgets/misc/e-signature-editor.c:446
 msgid "_Signature Name:"
 msgstr "ØØÙ ØÙØ_ÙÙÙØ:"
 
-#: ../widgets/misc/e-signature-manager.c:293
+#: ../widgets/misc/e-signature-manager.c:317
 #, fuzzy
 msgid "Add Signature Script"
 msgstr "ØØÙÙ ØØÙØÙØ ØÙÙÙØ ÙØÙ"
 
-#: ../widgets/misc/e-signature-manager.c:358
+#: ../widgets/misc/e-signature-manager.c:382
 #, fuzzy
 msgid "Edit Signature Script"
 msgstr "ØØØ ØÙØÙÙÙØ"
 
-#: ../widgets/misc/e-signature-manager.c:577
+#: ../widgets/misc/e-signature-manager.c:602
 msgid "Add _Script"
 msgstr "ØØÙÙ _ØØÙØÙØÙØ ÙØÙÙØ"
 
-#: ../widgets/misc/e-signature-script-dialog.c:264
+#: ../widgets/misc/e-signature-script-dialog.c:268
 #, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
@@ -21889,12 +21477,12 @@ msgstr ""
 "ÙØÙÙÙØ ÙÙ. ØÙØØÙ ØÙØÙ ØØØØÙ ØÙØÙ ØØØØØØÙÙ\n"
 "ÙØØØØØ ØÙØØØ ÙÙØ."
 
-#: ../widgets/misc/e-signature-script-dialog.c:309
+#: ../widgets/misc/e-signature-script-dialog.c:313
 #, fuzzy
 msgid "S_cript:"
 msgstr "_ØØÙØÙØ ÙØÙ:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:340
+#: ../widgets/misc/e-signature-script-dialog.c:344
 #, fuzzy
 msgid "Script file must be executable."
 msgstr "ÙØØ ØÙ ÙÙÙÙ ÙÙÙ ØÙØØÙØÙØ ØÙÙØÙ ÙØØÙÙØ ÙÙØÙÙÙØ."
@@ -21903,115 +21491,124 @@ msgstr "ÙØØ ØÙ ÙÙÙÙ ÙÙÙ ØÙØØÙØÙØ ØÙÙØÙ ÙØØÙÙØ Ù
 msgid "Click here to go to URL"
 msgstr "ØÙÙØ ÙÙØ ÙÙØÙØØ ÙÙØÙÙØÙ"
 
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "Ø_ÙØØ ÙÙÙØ ØÙÙØÙØ"
 
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "ØÙØØ ØÙØØØØ ØÙÙ ØÙØØÙØØ"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "Ø_ÙØØ ØÙÙØÙØ ÙÙ ØÙÙØØÙÙØ"
 
-#: ../widgets/misc/e-web-view.c:387
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
 msgstr "ØÙØØ ØÙÙØÙØ ÙÙ ØÙÙØØÙÙØ"
 
-#: ../widgets/misc/e-web-view.c:395
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
 msgstr "ØÙØØ ØÙÙØÙ ØÙ_ØØÙØ ØÙØÙÙØØÙÙÙ"
 
-#: ../widgets/misc/e-web-view.c:424 ../widgets/misc/e-web-view.c:1080
+#: ../widgets/misc/e-web-view.c:447
+#, fuzzy
+msgid "_Copy Image"
+msgstr "_ÙØ ØÙØØ"
+
+#: ../widgets/misc/e-web-view.c:449
+msgid "Copy the image to the clipboard"
+msgstr "ØÙØØ ØÙØÙØØ ØÙÙ ØÙØØÙØØ"
+
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
 msgid "Select all text and images"
 msgstr "ØÙØÙØØ ÙÙ ØÙÙØ ÙØÙØÙÙØ"
 
-#: ../widgets/misc/e-web-view.c:860 ../widgets/misc/e-web-view.c:862
-#: ../widgets/misc/e-web-view.c:864
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to call %s"
 msgstr "ØÙÙØ ÙÙØØØØÙ ØÙ %s"
 
-#: ../widgets/misc/e-web-view.c:866
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
 msgstr "ØÙÙØ ÙØØÙØØ/ØØÙØØ ØÙØÙØÙÙÙ"
 
-#: ../widgets/misc/e-web-view.c:868
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
 msgstr "ØÙÙØ ÙÙØØ %s"
 
-#: ../widgets/misc/ea-calendar-item.c:299
-#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:311
+#: ../widgets/misc/ea-calendar-item.c:318
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "ØÙØÙÙÙÙ: ÙÙ %s ØÙÙ %s"
 
-#: ../widgets/misc/ea-calendar-item.c:347
+#: ../widgets/misc/ea-calendar-item.c:354
 msgid "evolution calendar item"
 msgstr "ØÙØØ ØÙÙÙÙ ØÙÙÙÙÙÙØÙÙ"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "ÙØØÙØ ÙÙØØÙØ"
 
-#: ../widgets/table/e-cell-date-edit.c:300
+#: ../widgets/table/e-cell-date-edit.c:299
 msgid "Now"
 msgstr "ØÙØÙ"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:317
+#: ../widgets/table/e-cell-date-edit.c:316
 #, fuzzy
 msgctxt "table-date"
 msgid "None"
 msgstr "ÙØ ØÙØ"
 
-#: ../widgets/table/e-cell-date-edit.c:325
+#: ../widgets/table/e-cell-date-edit.c:324
 msgid "OK"
 msgstr "ÙÙØÙÙ"
 
-#: ../widgets/table/e-cell-date-edit.c:869
+#: ../widgets/table/e-cell-date-edit.c:868
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "ÙØØ ØÙ ÙÙÙÙ ØÙÙÙØ ØØÙÙØØ: %s"
 
-#: ../widgets/table/e-cell-percent.c:76
+#: ../widgets/table/e-cell-percent.c:80
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ÙØØ ØÙ ØÙÙÙ ØÙÙÙÙØ ØÙÙØÙÙÙØ ØÙÙ 0 Ù 100Ø ÙØÙÙØ"
 
-#: ../widgets/table/e-table-click-to-add.c:592
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
+#: ../widgets/table/e-table-click-to-add.c:607
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 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:393 ../widgets/table/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(ØØØØØÙ)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(ØÙØØÙÙ)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:400
 msgid "Not sorted"
 msgstr "ØÙØ ÙØØÙØØ"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:441
 msgid "No grouping"
 msgstr "ØØÙÙ ØØÙÙØ"
 
-#: ../widgets/table/e-table-config.c:654
+#: ../widgets/table/e-table-config.c:666
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "ØØÙØ ØÙØÙÙÙ"
 
-#: ../widgets/table/e-table-config.c:674
+#: ../widgets/table/e-table-config.c:686
 msgid "Available Fields"
 msgstr "ØÙØÙÙÙ ØÙÙØÙÙØØ"
 
@@ -22020,7 +21617,7 @@ msgid "A_vailable Fields:"
 msgstr "ØÙØÙÙÙ ØÙÙØÙ_ÙØØ:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Ascending"
 msgstr "ØØØØØÙ"
 
@@ -22033,7 +21630,7 @@ msgid "Clear _All"
 msgstr "ØÙØØ ØÙÙÙ"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Descending"
 msgstr "ØÙØØÙÙ"
 
@@ -22081,6 +21678,10 @@ msgstr "ØÙØÙÙÙ ØÙ_ØØÙØØ..."
 msgid "_Group By..."
 msgstr "_ØÙÙØ ØØØ..."
 
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "Ø_ØÙ"
+
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "Ø_ØÙØ ØÙØÙÙ ÙÙ ØÙÙØÙØ"
@@ -22093,11 +21694,11 @@ msgstr "Ø_ØÙØ ÙØÙ ØÙØÙÙÙ ØØØØÙØ:"
 msgid "_Sort..."
 msgstr "_ØØÙØ..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:117
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
 msgid "Add a Column"
 msgstr "ØØÙÙ ØÙÙØÙØ"
 
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22106,162 +21707,687 @@ msgstr ""
 "ØÙÙ ØÙÙÙÙØ ØÙØÙ ØØÙØ ØÙ ÙØÙØ ÙÙÙ"
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which has set a title.
-#. The first %s is replaced with a column title.
-#. The second %s is replaced with an actual  group value.
-#. Finally the %d is replaced with count of items in this group.
-#. Example: "Family name: Smith (13 items)"
+#. * has turned on grouping on a column, which has set a title.
+#. * The first %s is replaced with a column title.
+#. * The second %s is replaced with an actual  group value.
+#. * Finally the %d is replaced with count of items in this group.
+#. * Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
-#, fuzzy, c-format
+#: ../widgets/table/e-table-group-container.c:361
+#, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
-msgstr[0] "%s : %s (ØÙØØ ÙØØØ)"
-msgstr[1] "%s : %s (ØÙØØÙÙ)"
-msgstr[2] "%s : %s (%d ØÙØØØ)"
-msgstr[3] "%s : %s (%d ØÙØØÙØ)"
+msgstr[0] "%s : %s (ÙØ ØÙØØ)"
+msgstr[1] "%s : %s (ØÙØØ ÙØØØ)"
+msgstr[2] "%s : %s (ØÙØØØÙ)"
+msgstr[3] "%s : %s (%d ØÙØØØ)"
+msgstr[4] "%s : %s (%d ØÙØØÙØ)"
+msgstr[5] "%s : %s (%d ØÙØØ)"
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which doesn't have set a title.
-#. The %s is replaced with an actual group value.
-#. The %d is replaced with count of items in this group.
-#. Example: "Smith (13 items)"
+#. * has turned on grouping on a column, which doesn't have set a title.
+#. * The %s is replaced with an actual group value.
+#. * The %d is replaced with count of items in this group.
+#. * Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
-#, fuzzy, c-format
+#: ../widgets/table/e-table-group-container.c:373
+#, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
-msgstr[0] "%s (ØÙØØ ÙØØØ)"
-msgstr[1] "%s (ØÙØØÙÙ)"
-msgstr[2] "%s (%d ØÙØØØ)"
-msgstr[3] "%s (%d ØÙØØÙØ)"
-
-#: ../widgets/table/e-table-header-item.c:1504
+msgstr[0] "%s (ÙØ ØÙØØ)"
+msgstr[1] "%s (ØÙØØ ÙØØØ)"
+msgstr[2] "%s (ØÙØØØÙ)"
+msgstr[3] "%s (%d ØÙØØØ)"
+msgstr[4] "%s (%d ØÙØØÙØ)"
+msgstr[5] "%s (%d ØÙØØ)"
+
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "Customize Current View"
 msgstr "ØØÙØ ØÙÙØÙØ ØÙØØÙÙ"
 
-#: ../widgets/table/e-table-header-item.c:1525
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Sort _Ascending"
 msgstr "ØØÙØ Ø_ØØØØÙÙØ"
 
-#: ../widgets/table/e-table-header-item.c:1528
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Sort _Descending"
 msgstr "ØØÙØ Ø_ÙØØÙÙÙØ"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "_Unsort"
 msgstr "_ØØØÙØ"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "Group By This _Field"
 msgstr "ØÙÙÙØ ØØØ ÙØØ ØÙ_ØÙÙ"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Group By _Box"
 msgstr "ØÙÙÙØ ØØØ ØÙ_ØÙÙØÙÙ"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Remove This _Column"
 msgstr "ØØÙ ÙØØ ØÙØÙÙ_Ø"
 
-#: ../widgets/table/e-table-header-item.c:1544
+#: ../widgets/table/e-table-header-item.c:1598
 msgid "Add a C_olumn..."
 msgstr "ØØÙÙ ØÙ_ÙØ..."
 
-#: ../widgets/table/e-table-header-item.c:1548
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "A_lignment"
 msgstr "ÙØØ_ØØØ"
 
-#: ../widgets/table/e-table-header-item.c:1551
+#: ../widgets/table/e-table-header-item.c:1605
 msgid "B_est Fit"
 msgstr "Ø_ÙØÙ ÙÙØØÙØ"
 
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../widgets/table/e-table-header-item.c:1608
 msgid "Format Column_s..."
 msgstr "ÙØÙÙ ØÙØ_ØÙØØ..."
 
-#: ../widgets/table/e-table-header-item.c:1558
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Custo_mize Current View..."
 msgstr "Ø_ØÙØ ØÙÙØÙØ ØÙØØÙÙ..."
 
-#: ../widgets/table/e-table-header-item.c:1617
+#: ../widgets/table/e-table-header-item.c:1674
 msgid "_Sort By"
 msgstr "ØØÙØ ØØØ"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1635
+#: ../widgets/table/e-table-header-item.c:1692
 msgid "_Custom"
 msgstr "ÙÙØØÙÙØ"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "ÙÙ ØØØÙØØ ØØØØÙØ ÙÙØØÙÙØ"
 
 #. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
 msgid "toggle the cell"
 msgstr "ØØÙÙ ØÙØÙÙÙØ"
 
 #. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
 msgid "expands the row in the ETree containing this cell"
 msgstr "ÙØØØ ØÙØÙ ØÙØÙ ÙØØÙÙ ÙØÙ ØÙØÙÙØ ÙÙ ETree"
 
 #. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ÙÙÙÙØ ØÙØÙ ØÙØÙ ÙØØÙÙ ÙØÙ ØÙØÙÙØ ÙÙ ETree"
 
-#: ../widgets/table/gal-a11y-e-cell.c:119
+#: ../widgets/table/gal-a11y-e-cell.c:123
 msgid "Table Cell"
 msgstr "ØÙÙØ ØØÙÙ"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
 msgid "click"
 msgstr "ØÙÙØ"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "ØØÙØ"
 
-#: ../widgets/text/e-text.c:2283
+#: ../widgets/text/e-text.c:2327
 msgid "Select All"
 msgstr "ØÙØÙ ØÙÙÙ"
 
-#: ../widgets/text/e-text.c:2295
+#: ../widgets/text/e-text.c:2339
 msgid "Input Methods"
 msgstr "ØØÙ ØÙØØØØÙ"
 
-#~| msgid "day(s)"
-#~ msgctxt "recurrpage"
-#~ msgid "day(s)"
-#~ msgstr "ØÙÙØÙ"
+#~ msgid "Invalid object"
+#~ msgstr "ØÙØØ ØÙØ ØØÙØ"
+
+#~ msgid "Edit Alarm"
+#~ msgstr "ØØÙØ ØÙÙÙØÙÙ"
+
+#~ msgid "Add Alarm"
+#~ msgstr "ØØÙÙ ÙÙØÙÙ"
+
+#~ msgid "Alarm"
+#~ msgstr "ÙÙØÙÙ"
+
+#~ msgid "Alarms"
+#~ msgstr "ØÙÙÙØÙÙØØ"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "ØÙÙØ ÙÙØ ÙØÙÙ ØÙÙØÙØØ ØÙØØÙÙØ"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "ØÙÙØ ÙÙØ ÙØØØ ØÙÙØØØØØ ØÙÙØÙÙØØ"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "ØÙÙØ ÙÙØ ÙØÙØ ØÙÙØÙØØ ØÙØØÙÙØ"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "ØÙÙØ ÙÙØ ÙØØÙØÙ ÙÙÙ"
+
+#~ msgid "_Alarms"
+#~ msgstr "ØÙ_ÙÙØÙÙØØ"
+
+#~ msgid "The organizer selected no longer has an account."
+#~ msgstr "ØÙÙÙØÙÙ ØÙÙÙØÙÙ ÙÙ ÙØØ ÙÙØÙÙ ØØØØÙØ."
+
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "ÙØ ØÙØ"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "ÙÙØÙÙ ÙØØÙØ:"
+
+#~ msgid "_Alarm"
+#~ msgstr "_ÙÙØÙÙ"
+
+#~ msgid "_Group:"
+#~ msgstr "Ù_ØÙÙØØ:"
+
+#~ msgid "It has alarms."
+#~ msgstr "ÙÙ ÙÙØÙÙØØ."
+
+#, fuzzy
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "ÙÙ ÙÙØÙÙØØ."
+
+#, fuzzy
+#~ msgid "Make Anjal the default email client"
+#~ msgstr "ØÙÙ ÙÙØØÙØ ØÙÙØÙØØØ ØÙØ_ÙØØØØÙØ"
+
+#, fuzzy
+#~ msgid "Anjal email client"
+#~ msgstr "ØÙÙÙ ØÙØØÙØ ØÙØÙØØØØÙ"
+
+#, fuzzy
+#~ msgid "Opening folder '%s'"
+#~ msgstr "ÙØØÙ ÙØØ ØÙÙØÙÙØ %s"
+
+#, fuzzy
+#~ msgid "Please select a folder from the current account."
+#~ msgstr "ØØØØ ØØØØ ØÙØØ ÙÙØØ ØÙÙØØØØÙ"
+
+#~ msgid "Scanning folders in \"%s\""
+#~ msgstr "ÙØØ ØÙØØØØÙ ÙÙ \"%s\""
+
+#, fuzzy
+#~ msgid "Creating folder '%s'"
+#~ msgstr "ØÙØØØ ØÙÙØÙÙØ '%s'"
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "ÙÙØÙ ØÙØØÙØ ØÙÙ_ÙÙÙ ØÙØÙØØØØÙ:"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "ØØØ_ØØÙ ØÙØØØØÙ ØÙØÙÙ:"
+
+#, fuzzy
+#~ msgid "Scanning folders in '%s'"
+#~ msgstr "ÙØØ ØÙØØØØÙ ÙÙ \"%s\""
+
+#, fuzzy
+#~ msgid "Retrieving quota information for folder '%s'"
+#~ msgstr "ØÙØ ÙØÙÙÙØØ ØÙØØØ ÙÙÙØÙØ %s"
 
 #, fuzzy
-#~| msgid "for"
-#~ msgctxt "recurrpage"
-#~ msgid "for"
-#~ msgstr "ÙÙ"
+#~ msgid "Opening store '%s'"
+#~ msgstr "ÙØØÙ ÙØØ ØÙÙØØÙ %s"
 
-#~ msgctxt "recurrpage"
-#~ msgid "until"
-#~ msgstr "ØØÙÙ"
+#~ msgid "Local Folders"
+#~ msgstr "ÙØÙÙØØØ ÙØÙÙÙÙØ"
 
 #, fuzzy
-#~| msgid "days"
-#~ msgctxt "ESendOptionsAfter"
-#~ msgid "days"
-#~ msgstr "ØÙØÙÙØÙ"
+#~ msgid "Error saving messages to: %s:\n"
+#~ msgstr ""
+#~ "ØØØ ØØØ ØØÙØØ ØÙØ ØÙØØØØÙ ØÙÙ: %s:\n"
+#~ " %s"
+
+#~ msgid "Checking Service"
+#~ msgstr "ÙØØÙ ÙØØ ØÙØØÙØ"
+
+#~ msgid "Updating Search Folders for '%s'"
+#~ msgstr "ÙØØÙ ØØØÙØ ÙØÙØØØ ØÙØØØ ÙÙ'%s'"
+
+#~ msgid "Delete messages in Search Folder \"{0}\"?"
+#~ msgstr "ØØÙ ØÙØØØØÙ ÙÙ ÙØÙØ ØÙØØØ \"{0}\"Ø"
+
+#~ msgid "Alarm programs"
+#~ msgstr "ØØØÙØ ØÙÙÙØÙÙ"
 
 #, fuzzy
-#~| msgid "days"
-#~ msgctxt "ESendOptionsWithin"
-#~ msgid "days"
-#~ msgstr "ØÙØÙÙØÙ"
+#~ msgid "Save as iCalendar..."
+#~ msgstr "_ÙØÙØ ÙÙiCalendar..."
 
 #, fuzzy
-#~| msgid "None"
-#~ msgctxt "send-options"
+#~ msgctxt "mail-junk-hook"
 #~ msgid "None"
 #~ msgstr "ÙØ ØÙØ"
+
+#~ msgid "Header Value Contains:"
+#~ msgstr "ØÙØØÙÙØØ ØØØÙÙ ØÙÙ:"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "ØÙÙÙØÙ %s ÙØØØ ÙØÙÙÙÙ ØÙØÙØØÙ ÙØØØ."
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr "ØÙÙÙØÙ %s ØÙØ ÙØØØ. ØØÙÙ ØØØØÙ ØÙ ÙØÙØ ØÙØØÙØ ÙØØØØ."
+
+#, fuzzy
+#~ msgid "No junk plugin available"
+#~ msgstr "ÙØ ÙÙØØ ÙÙØÙ ØØÙØ ÙÙÙÙ ÙØØØ."
+
+#~ msgid "Error occurred while spawning %s: %s."
+#~ msgstr "ØØØ ØØØ ØØÙØØ ØÙØÙØÙØØ %s: %s."
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "ØØÙØÙÙÙØ ØÙØØÙ ÙÙØØØ Bogo ÙØ ØØØØÙØ, ØÙÙÙ...."
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr "ØÙØ ÙÙØØØØ ØÙØØØØ ØÙØÙÙÙØ ØÙØØÙ ÙÙØØØ Bogo, ØÙØÙÙØØ..."
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr "ÙØÙ ØÙØÙØÙØ ØÙÙ ÙØØØ Bogo, ØÙØ ØÙØØØ: %d."
+
+#, fuzzy
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "ÙÙØÙ ÙØØØ Bogo ÙÙØØØØ"
+
+#, fuzzy
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "ØØØÙØ ØØØØÙ ØÙØØÙØ ØÙÙÙÙÙ ØØØØØØØÙ Bogofilter."
+
+#~ msgid "Use _SSL"
+#~ msgstr "ØØØØØÙ _SSL"
+
+#~ msgid "_Secure connection"
+#~ msgstr "ØØ_ØØÙ ØÙÙ"
+
+#, fuzzy
+#~ msgid "Show a map of all the contacts"
+#~ msgstr "ØØÙØ ÙØØÙÙØ ØÙØØØÙØ ØØØ ÙØØÙØ ØÙØØØØÙ"
+
+#, fuzzy
+#~ msgid "Map for contacts"
+#~ msgstr "ÙØ ÙØØØØÙÙÙ"
+
+#~ msgid "Checklist"
+#~ msgstr "ÙØØÙØ ØØØ"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "ØØØÙ ÙÙÙØ ØÙØÙØ ÙÙ %s (ØÙÙØØØØÙ %s)"
+
+#~ msgid "Failed to authenticate.\n"
+#~ msgstr "ÙØÙ ØÙØÙÙØÙÙ.\n"
+
+#~ msgid "New _Shared Folder..."
+#~ msgstr "ÙØÙØ Ù_ØØØÙ ØØÙØ..."
+
+#~ msgid "_Proxy Login..."
+#~ msgstr "ÙÙÙØ ØØÙÙ_ÙØÙØ..."
+
+#~ msgid "Junk Mail Settings..."
+#~ msgstr "ØØØØØØØ ØØÙØ ØÙÙÙØÙØ..."
+
+#~ msgid "Track Message Status..."
+#~ msgstr "ØØÙØ ØØÙØ ØÙØØØÙØ..."
+
+#~ msgid "Retract Mail"
+#~ msgstr "ØØØ ØØÙØ"
+
+#~ msgid "Accept"
+#~ msgstr "ØÙØÙÙ"
+
+#~ msgid "Accept Tentatively"
+#~ msgstr "ØÙØÙ ØØÙØØ ØÙØ ÙÙØØÙØ"
+
+#~ msgid "Decline"
+#~ msgstr "ØØÙØ"
+
+#, fuzzy
+#~ msgid "Rese_nd Meeting..."
+#~ msgstr "_ÙÙÙØ ØØØÙØØ..."
+
+#~ msgid "Create folder"
+#~ msgstr "ØÙØØ ÙØÙÙØ"
+
+#, fuzzy
+#~ msgid ""
+#~ "The user '%s' has shared a folder with you\n"
+#~ "\n"
+#~ "Message from '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Click 'Apply' to install the shared folder\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ØÙÙØØØØÙ '%s' ÙØ ØØØÙÙ ÙÙ ÙØÙØ\n"
+#~ "\n"
+#~ "ØØØÙØ ÙÙ '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "ØÙÙØ 'ØÙØÙ' ÙØØÙÙØ ØÙÙØÙØ ØÙÙØØØÙ\n"
+#~ "\n"
+
+#~ msgid "Install the shared folder"
+#~ msgstr "ØÙÙÙØ ØÙÙØÙØ ØÙÙØØØÙ"
+
+#~ msgid "Shared Folder Installation"
+#~ msgstr "ØØÙÙØ ÙØÙØ ÙØØØÙ"
+
+#~ msgid "Junk Settings"
+#~ msgstr "ØØØØØØ ØÙÙÙØÙØ"
+
+#~ msgid "Junk Mail Settings"
+#~ msgstr "ØØØØØØØ ØØÙØ ØÙÙÙØÙØ"
+
+#~ msgid "Email:"
+#~ msgstr "ØÙØØÙØ ØÙØÙÙØØÙÙÙ:"
+
+#, fuzzy
+#~ msgid "Junk List:"
+#~ msgstr "ÙØØÙØ ØÙ_ÙÙØÙØØ"
+
+#~ msgid "_Enable"
+#~ msgstr "_ØÙØÙÙ"
+
+#~ msgid "_Junk List"
+#~ msgstr "ÙØØÙØ ØÙ_ÙÙØÙØØ"
+
+#~ msgid "Message Retract"
+#~ msgstr "ØØØ ØÙØØØÙØ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Retracting a message may remove it from the recipient's mailbox. Are you "
+#~ "sure you want to do this?"
+#~ msgstr "ØØØ ØØØÙØ ÙØ ÙØØÙÙØ ÙÙ ØÙØÙÙ ØØÙØ ØÙÙØØÙÙ. ØÙØØÙØ ÙÙ ØØØØÙ ØÙØØØ"
+
+#~ msgid "Message retracted successfully"
+#~ msgstr "ØÙ ØØØ ØÙØØØÙØ ØÙØØØ"
+
+#~ msgid "Insert Send options"
+#~ msgstr "ØØØØ ØÙØØØØ ØÙØØØØÙ"
+
+#~ msgid "The participants will receive the following notification.\n"
+#~ msgstr "ØÙØØÙØÙ ØÙÙØØØÙÙÙ ØÙØÙØÙÙ ØÙØØÙ.\n"
+
+#, fuzzy
+#~ msgid "Add Send Options to GroupWise messages"
+#~ msgstr "ØØÙÙ ØÙØØØØ ØÙØØØØÙ ÙØØØØÙ ØØÙØÙØÙØ"
+
+#, fuzzy
+#~ msgid "Fine-tune your GroupWise accounts."
+#~ msgstr "ÙÙØÙ ÙÙØØÙØ ØØØØØØ ØØÙØÙØÙØ."
+
+#, fuzzy
+#~ msgid "GroupWise Features"
+#~ msgstr "ÙÙØØØ ØØÙØÙØÙØ"
+
+#~ msgid "Message retract failed"
+#~ msgstr "ÙØÙ ØØØ ØÙØØØÙØ"
+
+#~ msgid "The server did not allow the selected message to be retracted."
+#~ msgstr "ÙÙ ÙØÙØ ØÙØØØÙ ØØØØ ØÙØØØÙØ ØÙÙØØØØ."
+
+#~ msgid ""
+#~ "Account &quot;{0}&quot; already exists. Please check your folder tree."
+#~ msgstr "ØÙØØØØ &quot;{0}&quot; ÙÙØÙØ ÙØØÙØ. ØØÙÙ ÙÙ ØØØØ ÙØÙØØØÙ."
+
+#~ msgid "Account Already Exists"
+#~ msgstr "ØÙØØØØ ÙÙØÙØ ÙØØÙØ"
+
+#~ msgid "Invalid user"
+#~ msgstr "ÙØØØØÙ ØÙØ ØØÙØ"
+
+#~ msgid ""
+#~ "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+#~ "address and try again."
+#~ msgstr ""
+#~ "ØÙÙÙÙØ ÙÙÙØÙØ Ù &quot;{0}&quot; ÙØÙ ÙØØÙØ. ØØÙÙ ÙÙ ØÙÙØÙ ØØÙØÙ Ù ØØÙÙ "
+#~ "ÙØØØØ."
+
+#~ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+#~ msgstr "ÙØ ÙÙÙÙ ØØØØØ ØÙÙÙØØ ØÙÙ ØÙÙØÙØ ÙÙÙØØØØÙ &quot;{0}&quot;"
+
+#~ msgid "Specify User"
+#~ msgstr "ØØØ ÙØØØØÙØ"
+
+#~ msgid "You have already given proxy permissions to this user."
+#~ msgstr "ØØÙ ØÙ ØØØÙØ ØØÙÙ ØÙÙØÙØ ÙÙØØ ØÙÙØØØØÙ."
+
+#~ msgid "You have to specify a valid user name to give proxy rights."
+#~ msgstr "ØÙÙÙ ØØØÙØ ØØÙ ÙØØØØÙ ØØÙØ ÙØØØØØÙ ØÙØÙÙÙ ÙÙÙØÙØ."
+
+#, fuzzy
+#~ msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+#~ msgstr "ÙØ ÙÙÙÙÙ ÙØØØÙØ ØÙÙØÙØ ÙØ ØÙÙØØØØÙ ØÙÙØØØ &quot;{0}&quot;"
+
+#, fuzzy
+#~ msgid "You have to specify a user name which you want to add to the list"
+#~ msgstr "ØÙÙÙ ØØØÙØ ØØÙ ØÙÙØØØØÙ ØÙØÙ ØØØØ ØØØØÙØÙ ÙÙÙØØÙØ"
+
+#, fuzzy
+#~ msgid "Do you want to resend the meeting?"
+#~ msgstr "ØÙØØÙØ ØÙÙ ØØØØ ÙÙ ØØÙ ÙØØ ØÙØØØÙØØØ"
+
+#, fuzzy
+#~ msgid "Do you want to resend the recurring meeting?"
+#~ msgstr "ØÙØØÙØ ØÙÙ ØØØØ ÙÙ ØØÙ ÙØØ ØÙØØØÙØØØ"
+
+#, fuzzy
+#~ msgid "Do you want to retract the original item?"
+#~ msgstr "ØØØØØ ÙÙ ØØØØØØØ ØÙØØØØÙ ØÙØ ØÙÙÙØÙÙØØ"
+
+#, fuzzy
+#~ msgid "The original will be removed from the recipient's mailbox."
+#~ msgstr "_ØØÙ ÙØØ ØÙØÙØØ ÙÙ ÙÙ ØÙØØÙÙ ØØÙØ ØÙÙØØÙÙÙÙØ"
+
+#~ msgid "This is a recurring meeting"
+#~ msgstr "ÙØØ ÙÙØØ ÙØÙØØ"
+
+#~ msgid "Would you like to accept it?"
+#~ msgstr "ØØØØØ ØÙØÙÙÙØ"
+
+#~ msgid "Would you like to decline it?"
+#~ msgstr "ØØØØØ ØØÙØÙØ"
+
+#~ msgid "C_ustomize notification message"
+#~ msgstr "Ø_ØÙØ ØØØÙØ ØÙØØØØØ"
+
+#~ msgid "Con_tacts..."
+#~ msgstr "ØÙÙØØØØÙÙÙ..."
+
+#, fuzzy
+#~ msgid "Users:"
+#~ msgstr "ÙØØØØÙÙÙ"
+
+#~ msgid "_Not Shared"
+#~ msgstr "_ØÙØ ÙØØØÙ"
+
+#~ msgid "_Shared With..."
+#~ msgstr "_ÙØØØÙ ÙØ ..."
+
+#~ msgid "Access Rights"
+#~ msgstr "ØÙÙÙ ØÙÙÙØØ"
+
+#~ msgid "Add/Edit"
+#~ msgstr "ØØÙÙ/ØØØ"
+
+#~ msgid "Con_tacts"
+#~ msgstr "ØÙÙ_ØØØÙÙÙÙ"
+
+#~ msgid "Modify _folders/options/rules/"
+#~ msgstr "ØØØÙÙ ØÙÙ_ØÙØØØ/ØÙØÙØØØØ/ØÙÙÙØØØ/"
+
+#~ msgid "Read items marked _private"
+#~ msgstr "ØÙØØ ØÙØÙØØØ ØØØ ØÙØÙØ \"ØØØ\""
+
+#~ msgid "Subscribe to my _alarms"
+#~ msgstr "ØØØØÙ ÙÙ _ÙÙØÙØØÙ"
+
+#~ msgid "Subscribe to my _notifications"
+#~ msgstr "ØØØØÙ ÙÙ Ø_ØØØØØØÙ"
+
+#~ msgid "_Write"
+#~ msgstr "_ÙØØØØ"
+
+#~ msgid "permission to read|_Read"
+#~ msgstr "ØÙØÙØØ ØØÙÙØØØØ|_ØÙØØ"
+
+#~ msgid "Proxy"
+#~ msgstr "ØØØÙÙ ÙÙÙÙ"
+
+#~ msgid "Proxy Login"
+#~ msgstr "ØÙÙÙÙØ ØØØ ÙÙÙÙ"
+
+#~ msgid "%sEnter password for %s (user %s)"
+#~ msgstr "%s ØØØÙ ÙÙÙØ ØÙØÙØ ÙÙ %s (ØÙÙØØØØÙ %s)"
+
+#~ msgid "The Proxy tab will be available only when the account is online."
+#~ msgstr "ÙØ ÙØÙÙØ ØØÙÙØ ØÙÙÙÙÙ ØÙØ ØÙØÙØ ÙÙÙÙ ØÙØØØØ ÙØØÙÙØ."
+
+#~ msgid "The Proxy tab will be available only when the account is enabled."
+#~ msgstr "ÙØ ÙØÙÙØ ØØÙÙØ ØÙÙÙÙÙ ØÙØ ØÙØÙØ ÙÙÙÙ ØÙØØØØ ÙÙØÙÙØ."
+
+#, fuzzy
+#~ msgctxt "GW"
+#~ msgid "Proxy"
+#~ msgstr "ØØØÙÙ ÙÙÙÙ"
+
+#~ msgid "Add User"
+#~ msgstr "ØØÙÙ ÙØØØØÙ"
+
+#, fuzzy
+#~ msgid "Advanced send options"
+#~ msgstr "ØØØØ ØÙØØØØ ØØØØÙ ÙØÙØÙØ"
+
+#~ msgid "Users"
+#~ msgstr "ÙØØØØÙÙÙ"
+
+#~ msgid "Enter the users and set permissions"
+#~ msgstr "ØØØÙ ØÙÙØØØØÙÙÙ ÙØÙÙ ØÙØØØØÙØ"
+
+#~ msgid "Sharing"
+#~ msgstr "ÙØØØÙØ"
+
+#~ msgid "Custom Notification"
+#~ msgstr "ØØØØØ ÙØØØ"
+
+#~ msgid "Add   "
+#~ msgstr "Ø_ØÙ"
+
+#~ msgid "Modify"
+#~ msgstr "ØÙÙÙØ"
+
+#~ msgid "Message Status"
+#~ msgstr "ØØÙØ ØÙØØØÙØ"
+
+#~ msgid "Subject:"
+#~ msgstr "ØÙÙÙØÙØ:"
+
+#~ msgid "From:"
+#~ msgstr "ÙÙ:"
+
+#~ msgid "Creation date:"
+#~ msgstr "ØØØÙØ ØÙØÙØØØ:"
+
+#~ msgid "Recipient: "
+#~ msgstr "ØÙÙØØÙÙÙ: "
+
+#~ msgid "Delivered: "
+#~ msgstr "ØÙÙÙÙÙÙØ: "
+
+#~ msgid "Opened: "
+#~ msgstr "ÙÙÙØØØ: "
+
+#~ msgid "Accepted: "
+#~ msgstr "ÙÙÙØÙØ: "
+
+#~ msgid "Deleted: "
+#~ msgstr "ØÙØÙØ: "
+
+#~ msgid "Declined: "
+#~ msgstr "ØÙÙØØ: "
+
+#~ msgid "Completed: "
+#~ msgstr "ØÙÙÙÙØ: "
+
+#~ msgid "Undelivered: "
+#~ msgstr "ÙÙ ØÙÙØÙÙÙ: "
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "ÙÙÙÙÙÙÙ ØØØØÙ D-Bus."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "ØÙÙÙØ ØØØÙØ D-BUS ØÙØ ÙØÙÙ ØØØØÙ ØØÙØ ØØÙØØ."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "ØØØÙ ØÙØØØÙØ ØÙØØÙ ÙØ ØÙØÙÙÙÙØ."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr "ÙØ ØØØ ÙØÙ ØÙÙØÙØ ØØØØØ ÙÙÙ ØÙØÙÙÙÙØ ØÙØ ÙØÙÙ ØØØØÙ ØØÙØØ."
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "ØØÙØ ØÙØÙÙÙÙØ ÙÙ Ù_ØØØØ ØÙØØÙÙØ"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "ØØØÙ ØÙ_ØØØÙØ ØÙØØÙ ÙØ ØÙØÙÙÙÙØ"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "ØÙÙÙØ _ØØØÙØ D-BUS"
+
+#~ msgid "Evolution Profiler"
+#~ msgstr "ÙØØØ ØÙÙÙÙÙÙØÙ"
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "ÙÙ ÙØØ ØØØÙ-ØØÙØØÙ, ØÙØÙØ: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "ÙØÙ ØÙØØØ ØÙØÙØ: %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "ØØØØØ ØØØ ØÙØØØÙØ: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "ØÙØÙÙÙØ ØÙØØÙ Ù ØØØÙ-ØØÙØØÙ ÙØ ØØØØÙØ, ØÙØÙÙØÙ..."
+
+#, fuzzy
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr "ÙÙÙØÙØ ØÙØØØØ ØÙØÙÙÙØ ØÙØØÙ Ù ØØØÙ-ØØÙØØÙ, ØÙØÙÙØØ..."
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr "ØÙØÙØØÙ Ù ØØØÙ-ØØÙØØÙ ÙØ ÙØÙ, ØÙØ ØÙØØØ: %d"
+
+#, fuzzy
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr "ØØØÙ-ØØÙØØÙ ØÙØ ÙØÙÙØ."
+
+#, fuzzy
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "ÙÙØÙ ÙØØÙ ØÙØØÙØ ØÙÙØØØ ÙÙØØÙØ ØÙÙÙÙÙ"
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "ÙÙØØ ØÙ-ÙÙÙØØ (.ics)"
+
+#~ msgid "Drafts based template plugin"
+#~ msgstr "ÙÙØÙ ÙØÙØ ÙØØÙØ ØÙÙ ØÙÙØÙØØØ"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "ØØØÙØ ØÙÙÙÙÙÙØÙ ØÙØØØØØ"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "ØÙØØ ØÙØØ ØÙÙÙØ ØÙØØØØ ØØÙØØØÙØ ØÙØØØØØ"
+
+#, fuzzy
+#~ msgid "Failed to import contact's certificate"
+#~ msgstr "ÙØÙ ØØÙ ØÙÙØÙØØÙ"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "ØÙÙØÙ ØÙØØÙØ ØÙØÙÙØØÙÙÙ"



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